diff --git a/README.md b/README.md
index dd5884d..d9c8953 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 
 
-![Statusmap sample panel](https://raw.githubusercontent.com/flant/grafana-statusmap/master/src/img/grafana-statusmap-panel.png)
+![Statusmap sample panel](https://raw.githubusercontent.com/flant/grafana-statusmap/master/src/img/flant-statusmap-panel.png)
 
 
 ## Features
diff --git a/src/img/color-mapping.png b/src/img/color-mapping.png
new file mode 100644
index 0000000..d516267
Binary files /dev/null and b/src/img/color-mapping.png differ
diff --git a/src/img/flant-statusmap-panel.png b/src/img/flant-statusmap-panel.png
new file mode 100644
index 0000000..8404b38
Binary files /dev/null and b/src/img/flant-statusmap-panel.png differ
diff --git a/src/img/grafana-statusmap-panel.png b/src/img/grafana-statusmap-panel.png
deleted file mode 100644
index 705b7d5..0000000
Binary files a/src/img/grafana-statusmap-panel.png and /dev/null differ
diff --git a/src/img/logo.svg b/src/img/logo.svg
index 54e5f5d..2bedb4c 100644
--- a/src/img/logo.svg
+++ b/src/img/logo.svg
@@ -1,88 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="100px" height="100px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve">
-<g>
-	<path d="M-0.2-0.2v100.4h100.4V-0.2H-0.2z M13.7,1.4H24v10H13.7V1.4z M13.7,13.9H24v10H13.7V13.9z M13.7,26.3H24v10H13.7V26.3z
-		 M13.7,38.8H24v10H13.7V38.8z M11.7,98.5H1.3v-10h10.4V98.5z M11.7,86.1H1.3v-10h10.4V86.1z M11.7,73.6H1.3v-10h10.4V73.6z
-		 M11.7,61.2H1.3v-10h10.4V61.2z M11.7,48.8H1.3v-10h10.4V48.8z M11.7,36.3H1.3v-10h10.4V36.3z M11.7,23.9H1.3v-10h10.4V23.9z
-		 M11.7,11.4H1.3v-10h10.4V11.4z M24,98.5H13.7v-10H24V98.5z M24,86.1H13.7v-10H24V86.1z M24,73.6H13.7v-10H24V73.6z M24.1,61.2
-		H13.8v-10h10.4V61.2z M36.5,98.5H26.1v-10h10.4V98.5z M36.5,86.1H26.1v-10h10.4V86.1z M36.5,73.6H26.1v-10h10.4V73.6z M36.5,61.2
-		H26.1v-10h10.4V61.2z M36.5,48.8H26.1v-10h10.4V48.8z M36.5,36.3H26.1v-10h10.4V36.3z M36.5,23.9H26.1v-10h10.4V23.9z M36.5,11.4
-		H26.1v-10h10.4V11.4z M48.9,98.5H38.5v-10h10.4V98.5z M48.9,86.1H38.5v-10h10.4V86.1z M48.9,73.6H38.5v-10h10.4V73.6z M48.9,61.2
-		H38.5v-10h10.4V61.2z M48.9,48.8H38.5v-10h10.4V48.8z M48.9,36.3H38.5v-10h10.4V36.3z M48.9,23.9H38.5v-10h10.4V23.9z M48.9,11.4
-		H38.5v-10h10.4V11.4z M50.9,26.3h10.4v10H50.9V26.3z M51,63.6h10.4v10H51V63.6z M61.3,98.5H51v-10h10.4V98.5z M61.3,86.1H51v-10
-		h10.4V86.1z M61.3,61.2H51v-10h10.4V61.2z M61.3,48.8H51v-10h10.4V48.8z M61.3,23.9H51v-10h10.4V23.9z M61.3,11.4H51v-10h10.4V11.4
-		z M73.8,98.5H63.4v-10h10.4V98.5z M73.8,86.1H63.4v-10h10.4V86.1z M73.8,73.6H63.4v-10h10.4V73.6z M73.8,61.2H63.4v-10h10.4V61.2z
-		 M73.8,48.8H63.4v-10h10.4V48.8z M73.8,36.3H63.4v-10h10.4V36.3z M73.8,23.9H63.4v-10h10.4V23.9z M73.8,11.4H63.4v-10h10.4V11.4z
-		 M86.2,98.5H75.8v-10h10.4V98.5z M86.2,86.1H75.8v-10h10.4V86.1z M86.2,73.6H75.8v-10h10.4V73.6z M86.2,61.2H75.8v-10h10.4V61.2z
-		 M86.2,48.8H75.8v-10h10.4V48.8z M86.2,36.3H75.8v-10h10.4V36.3z M86.2,23.9H75.8v-10h10.4V23.9z M86.2,11.4H75.8v-10h10.4V11.4z
-		 M98.6,98.5H88.3v-10h10.4V98.5z M98.6,86.1H88.3v-10h10.4V86.1z M98.6,73.6H88.3v-10h10.4V73.6z M98.6,61.2H88.3v-10h10.4V61.2z
-		 M98.6,48.8H88.3v-10h10.4V48.8z M98.6,36.3H88.3v-10h10.4V36.3z M98.6,23.9H88.3v-10h10.4V23.9z M98.6,11.4H88.3v-10h10.4V11.4z"
-		/>
-	<rect x="26.1" y="1.4" fill="#0062A7" width="10.4" height="10"/>
-	<rect x="26.1" y="13.9" fill="#1A83BD" width="10.4" height="10"/>
-	<rect x="26.1" y="26.3" fill="#B2DBB9" width="10.4" height="10"/>
-	<rect x="26.1" y="38.8" fill="#B2DBB9" width="10.4" height="10"/>
-	<rect x="26.1" y="88.5" fill="#0062A7" width="10.4" height="10"/>
-	<rect x="26.1" y="51.2" fill="#E3F1DC" width="10.4" height="10"/>
-	<rect x="13.8" y="51.2" fill="#E3F1DC" width="10.4" height="10"/>
-	<rect x="26.1" y="63.6" fill="#60C0CB" width="10.4" height="10"/>
-	<rect x="26.1" y="76.1" fill="#1A83BD" width="10.4" height="10"/>
-	<rect x="1.3" y="1.4" fill="#1A83BD" width="10.4" height="10"/>
-	<rect x="1.3" y="13.9" fill="#39A4CB" width="10.4" height="10"/>
-	<rect x="1.3" y="26.3" fill="#39A4CB" width="10.4" height="10"/>
-	<rect x="1.3" y="38.8" fill="#60C0CB" width="10.4" height="10"/>
-	<rect x="1.3" y="88.5" fill="#0062A7" width="10.4" height="10"/>
-	<rect x="1.3" y="51.2" fill="#8CD0BC" width="10.4" height="10"/>
-	<rect x="1.3" y="63.6" fill="#0062A7" width="10.4" height="10"/>
-	<rect x="1.3" y="76.1" fill="#1A83BD" width="10.4" height="10"/>
-	<rect x="13.7" y="1.4" fill="#1A83BD" width="10.4" height="10"/>
-	<rect x="13.7" y="13.9" fill="#1A83BD" width="10.4" height="10"/>
-	<rect x="13.7" y="26.3" fill="#39A4CB" width="10.4" height="10"/>
-	<rect x="13.7" y="38.8" fill="#60C0CB" width="10.4" height="10"/>
-	<rect x="13.7" y="88.5" fill="#1A83BD" width="10.4" height="10"/>
-	<rect x="13.7" y="63.6" fill="#60C0CB" width="10.4" height="10"/>
-	<rect x="13.7" y="76.1" fill="#60C0CB" width="10.4" height="10"/>
-	<rect x="38.5" y="1.4" fill="#1A83BD" width="10.4" height="10"/>
-	<rect x="38.5" y="13.9" fill="#60C0CB" width="10.4" height="10"/>
-	<rect x="38.5" y="26.3" fill="#8CD0BC" width="10.4" height="10"/>
-	<rect x="38.5" y="38.8" fill="#8CD0BC" width="10.4" height="10"/>
-	<rect x="38.5" y="88.5" fill="#0062A7" width="10.4" height="10"/>
-	<rect x="38.5" y="51.2" fill="#B2DBB9" width="10.4" height="10"/>
-	<rect x="38.5" y="63.6" fill="#8CD0BC" width="10.4" height="10"/>
-	<rect x="38.5" y="76.1" fill="#0062A7" width="10.4" height="10"/>
-	<rect x="51" y="1.4" fill="#0062A7" width="10.4" height="10"/>
-	<rect x="51" y="13.9" fill="#39A4CB" width="10.4" height="10"/>
-	<rect x="51" y="38.8" fill="#8CD0BC" width="10.4" height="10"/>
-	<rect x="51" y="88.5" fill="#1A83BD" width="10.4" height="10"/>
-	<rect x="51" y="51.2" fill="#E3F1DC" width="10.4" height="10"/>
-	<rect x="51" y="76.1" fill="#8CD0BC" width="10.4" height="10"/>
-	<rect x="63.4" y="1.4" fill="#0062A7" width="10.4" height="10"/>
-	<rect x="63.4" y="13.9" fill="#39A4CB" width="10.4" height="10"/>
-	<rect x="63.4" y="26.3" fill="#60C0CB" width="10.4" height="10"/>
-	<rect x="50.9" y="26.3" fill="#60C0CB" width="10.4" height="10"/>
-	<rect x="63.4" y="38.8" fill="#B2DBB9" width="10.4" height="10"/>
-	<rect x="63.4" y="88.5" fill="#0062A7" width="10.4" height="10"/>
-	<rect x="63.4" y="51.2" fill="#E3F1DC" width="10.4" height="10"/>
-	<rect x="63.4" y="63.6" fill="#39A4CB" width="10.4" height="10"/>
-	<rect x="63.4" y="76.1" fill="#39A4CB" width="10.4" height="10"/>
-	<rect x="75.8" y="1.4" fill="#1A83BD" width="10.4" height="10"/>
-	<rect x="75.8" y="13.9" fill="#39A4CB" width="10.4" height="10"/>
-	<rect x="75.8" y="26.3" fill="#60C0CB" width="10.4" height="10"/>
-	<rect x="75.8" y="38.8" fill="#8CD0BC" width="10.4" height="10"/>
-	<rect x="75.8" y="88.5" fill="#0062A7" width="10.4" height="10"/>
-	<rect x="75.8" y="51.2" fill="#E3F1DC" width="10.4" height="10"/>
-	<rect x="51" y="63.6" fill="#8CD0BC" width="10.4" height="10"/>
-	<rect x="75.8" y="63.6" fill="#60C0CB" width="10.4" height="10"/>
-	<rect x="75.8" y="76.1" fill="#1A83BD" width="10.4" height="10"/>
-	<rect x="88.3" y="13.9" fill="#39A4CB" width="10.4" height="10"/>
-	<rect x="88.3" y="26.3" fill="#39A4CB" width="10.4" height="10"/>
-	<rect x="88.3" y="38.8" fill="#1A83BD" width="10.4" height="10"/>
-	<rect x="88.3" y="88.5" fill="#1A83BD" width="10.4" height="10"/>
-	<rect x="88.3" y="51.2" fill="#8CD0BC" width="10.4" height="10"/>
-	<rect x="88.3" y="63.6" fill="#1A83BD" width="10.4" height="10"/>
-	<rect x="88.3" y="76.1" fill="#0062A7" width="10.4" height="10"/>
-	<rect x="88.3" y="1.4" fill="#0062A7" width="10.4" height="10"/>
-</g>
-</svg>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 100 100" xml:space="preserve" height="100px" viewBox="0 0 100 100" width="100px" version="1.1" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"><rect height="100" width="100" y="-5.44e-15" x="0"/><g fill="#008000"><rect height="22.5" width="10.4" y="1.4" x="38.4"/><rect height="22.5" width="10.4" y="26.3" x="38.4"/><rect height="22.4" width="10.4" y="76.1" x="38.4"/><rect height="22.3" width="10.4" y="51.2" x="38.4"/><rect height="22.5" width="10.4" y="1.4" x="50.9"/><rect height="22.5" width="10.4" y="76" x="50.9"/></g><rect height="22.3" width="10.4" y="51.2" x="50.9" fill="#ff0"/><rect height="22.5" width="10.4" y="1.4" x="63.3" fill="#f00"/><g fill="#008000"><rect height="22.5" width="10.4" y="26.3" x="63.3"/><rect height="22.5" width="10.4" y="26.3" x="50.8"/><rect height="22.5" width="10.4" y="76" x="63.3"/><rect height="22.3" width="10.4" y="51.2" x="63.3"/></g><rect height="22.5" width="10.4" y="1.4" x="75.7" fill="#f00"/><g fill="#008000"><rect height="22.5" width="10.4" y="26.3" x="75.7"/><rect height="22.5" width="10.4" y="76" x="75.7"/><rect height="22.4" width="10.4" y="51.2" x="75.7"/><rect height="22.5" width="10.4" y="26.3" x="88.2"/><rect height="22.5" width="10.4" y="76" x="88.2"/><rect height="22.3" width="10.4" y="51.2" x="88.2"/><rect height="22.5" width="10.4" y="1.4" x="88.2"/></g><g fill-rule="evenodd" fill="#999"><path d="m32.3 35.8h3.56v3.55h-1.8v-1.78h-1.77z"/><path d="m26.9 37.6h1.77v-1.77h1.8v5.33h-1.8v-1.78h-1.77z"/><path d="m23.3 37.6h1.8v3.56h-1.8z"/><path d="m18 41.1h3.56v-5.33h-1.8v1.77h-1.77z"/><path d="m24.4 60h3.56v3.55h-1.8v-1.78h-1.77z"/><path d="m13.7 61.8h1.77v-1.77h1.8v5.33h-1.8v-1.78h-1.77z"/><path d="m33.5 61.8h1.8v3.56h-1.8z"/><path d="m19.1 65.4h3.56v-5.33h-1.8v1.77h-1.77z"/><path d="m29.8 60h1.77v5.33h-1.77z"/><path d="m3.09 63.6h1.77v1.78h1.8v-5.33h-1.8v1.77h-1.77z"/><path d="m8.25 60h1.77v3.55h-1.77z"/><path d="m10 65.4h1.8v-1.78h-1.8v1.78z"/><path d="m32.3 86h3.56v3.55h-1.8v-1.78h-1.77z"/><path d="m26.2 87.8h1.77v-1.77h1.8v5.33h-1.8v-1.78h-1.77z"/><path d="m22.3 87.8h1.8v3.56h-1.8z"/><path d="m12.6 86h1.77v5.33h-1.77z"/><path d="m16.7 89.6h1.77v1.78h1.8v-5.33h-1.8v1.77h-1.77z"/><path d="m7.65 86h1.77v3.55h-1.77z"/><path d="m9.42 91.4h1.8v-1.78h-1.8v1.78z"/><path d="m2.2 9.8h3.56v3.55h-1.8v-1.78h-1.77z"/><path d="m26.9 11.6h1.77v-1.77h1.8v5.33h-1.8v-1.78h-1.77z"/><path d="m22.6 11.6h1.8v3.56h-1.8z"/><path d="m12.8 15.1h3.56v-5.33h-1.8v1.77h-1.77z"/><path d="m18.3 9.8h1.77v5.33h-1.77z"/><path d="m7.26 13.3h1.77v1.78h1.8v-5.33h-1.8v1.77h-1.77z"/><path d="m32.3 9.8h1.77v3.55h-1.77z"/><path d="m34.1 15.1h1.8v-1.78h-1.8v1.78z"/></g></svg>
diff --git a/src/img/queries-example.png b/src/img/queries-example.png
new file mode 100644
index 0000000..1115ee2
Binary files /dev/null and b/src/img/queries-example.png differ
diff --git a/src/options_editor.js b/src/options_editor.js
index e020298..c3d6128 100644
--- a/src/options_editor.js
+++ b/src/options_editor.js
@@ -21,7 +21,7 @@ export function statusHeatmapOptionsEditor() {
   return {
     restrict: 'E',
     scope: true,
-    templateUrl: 'public/plugins/status-heatmap-panel/options_editor.html',
+    templateUrl: 'public/plugins/status-heatmap-panel/partials/options_editor.html',
     controller: StatusHeatmapOptionsEditorCtrl,
   };
 }
diff --git a/src/options_editor.html b/src/partials/options_editor.html
similarity index 100%
rename from src/options_editor.html
rename to src/partials/options_editor.html
diff --git a/src/plugin.json b/src/plugin.json
index 91a8b88..715acc8 100644
--- a/src/plugin.json
+++ b/src/plugin.json
@@ -1,21 +1,31 @@
 {
   "type": "panel",
-  "name": "Status Heatmap",
-  "id": "status-heatmap-panel",
+  "name": "Statusmap",
+  "id": "flant-statusmap-panel",
 
   "info": {
-    "description": "Status Heatmap panel plugin for grafana",
+    "description": "Statusmap panel for grafana",
     "author": {
       "name": "Flant JSC",
       "url": "http://flant.com"
     },
     "keywords": ["status", "heatmap", "panel"],
-    "version": "0.0.1",
-    "updated": "2017-11-01",
     "logos": {
       "small": "img/logo.svg",
       "large": "img/logo.svg"
-    }
+    },
+    "links": [
+      {"name": "Github", "url": "https://github.com/flant/grafana-statusmap"},
+      {"name": "MIT Licence", "url": "https://github.com/flant/grafana-statusmap/blob/master/LICENSE"}
+
+    ],
+    "screenshots": [
+      {"name": "Panel", "path": "img/flant-statusmap-panel.png"},
+      {"name": "Color mapping", "path": "img/color-mapping.png"},
+      {"name": "Queries example", "path": "img/queries-example.png"}
+    ],
+    "version": "0.0.1",
+    "updated": "2018-09-17"
   },
 
   "dependencies": {