Pivot implementation and redesign (#69)

- Pivot support implementation - Rename queries into inquiries - Rename editor into workspace - Change result set format - New JSON format for inquiries - Redesign panels
2025-12-06 10:08:52 +08:00 · 2021-08-04 22:20:51 +02:00
parent 8d0bc6affe
commit 5017b55944
105 changed files with 4659 additions and 2021 deletions
--- a/README.md
+++ b/README.md
@@ -7,10 +7,10 @@
 Sqliteviz is a single-page offline-first PWA for fully client-side visualisation of SQLite databases or CSV files.

 With sqliteviz you can:
- run SQL queries against a SQLite database and create [Plotly][11] charts based on the result sets
+- run SQL queries against a SQLite database and create [Plotly][11] charts and pivot tables based on the result sets
 - import a CSV file into a SQLite database and visualize imported data
- manage queries and chart settings and run them against different databases
- import/export queries and chart settings to/from a JSON file
+- manage inquiries and run them against different databases
+- import/export inquiries to/from a JSON file
 - export a modified SQLite database
 - use it offline from your OS application menu like any other desktop app

@@ -26,7 +26,7 @@ For user documentation, check out sqliteviz [Wiki][7].
 It's a kind of middleground between [Plotly Falcon][1] and [Redash][2].

 ## Components
-It is built on top of [react-chart-editor][3], [sql.js][4] and [Vue-Codemirror][8] in [Vue.js][5]. CSV parsing is performed with [Papa Parse][9].
+It is built on top of [react-chart-editor][3], [PivotTable.js][12], [sql.js][4] and [Vue-Codemirror][8] in [Vue.js][5]. CSV parsing is performed with [Papa Parse][9].

 [1]: https://github.com/plotly/falcon
 [2]: https://github.com/getredash/redash
@@ -39,3 +39,4 @@ It is built on top of [react-chart-editor][3], [sql.js][4] and [Vue-Codemirror][
 [9]: https://www.papaparse.com/
 [10]: https://github.com/lana-k/sqliteviz/wiki/Predefined-queries
 [11]: https://github.com/plotly/plotly.js
+[12]: https://github.com/nicolaskruchten/pivottable
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,18 +1,21 @@
 {
  "name": "sqliteviz",
-  "version": "0.14.0",
+  "version": "0.15.0",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "sqliteviz",
-      "version": "0.14.0",
+      "version": "0.15.0",
      "license": "Apache-2.0",
      "dependencies": {
        "codemirror": "^5.57.0",
        "core-js": "^3.6.5",
+        "html2canvas": "^1.1.4",
+        "jquery": "^3.6.0",
        "nanoid": "^3.1.12",
        "papaparse": "^5.3.1",
+        "pivottable": "^2.23.0",
        "plotly.js": "^1.58.4",
        "promise-worker": "^2.0.1",
        "react": "^16.13.1",
@@ -23,7 +26,9 @@
        "vue": "^2.6.11",
        "vue-codemirror": "^4.0.6",
        "vue-js-modal": "^2.0.0-rc.6",
+        "vue-multiselect": "^2.1.6",
        "vue-router": "^3.2.0",
+        "vue2-teleport": "^1.0.1",
        "vuejs-paginate": "^2.1.0",
        "vuera": "^0.2.7",
        "vuex": "^3.4.0"
@@ -6329,6 +6334,22 @@
      "resolved": "https://registry.npmjs.org/css-global-keywords/-/css-global-keywords-1.0.1.tgz",
      "integrity": "sha1-cqmupyeW0Bmx0qMlLeTlqqN+Smk="
    },
+    "node_modules/css-line-break": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-1.1.1.tgz",
+      "integrity": "sha512-1feNVaM4Fyzdj4mKPIQNL2n70MmuYzAXZ1aytlROFX1JsOo070OsugwGjj7nl6jnDJWHDM8zRZswkmeYVWZJQA==",
+      "dependencies": {
+        "base64-arraybuffer": "^0.2.0"
+      }
+    },
+    "node_modules/css-line-break/node_modules/base64-arraybuffer": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.2.0.tgz",
+      "integrity": "sha512-7emyCsu1/xiBXgQZrscw/8KPRT44I4Yq9Pe6EGs3aPRTsWuggML1/1DTuZUuIaJPIm1FTDUVXl4x/yW8s0kQDQ==",
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
    "node_modules/css-loader": {
      "version": "3.6.0",
      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.6.0.tgz",
@@ -11192,6 +11213,17 @@
        "object.getownpropertydescriptors": "^2.0.3"
      }
    },
+    "node_modules/html2canvas": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.1.4.tgz",
+      "integrity": "sha512-uHgQDwrXsRmFdnlOVFvHin9R7mdjjZvoBoXxicPR+NnucngkaLa5zIDW9fzMkiip0jSffyTyWedE8iVogYOeWg==",
+      "dependencies": {
+        "css-line-break": "1.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
    "node_modules/htmlparser2": {
      "version": "3.10.1",
      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
@@ -12695,6 +12727,11 @@
        "node": ">=8"
      }
    },
+    "node_modules/jquery": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
+      "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
+    },
    "node_modules/js-base64": {
      "version": "2.6.4",
      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz",
@@ -15909,6 +15946,14 @@
        "node": ">=0.10.0"
      }
    },
+    "node_modules/pivottable": {
+      "version": "2.23.0",
+      "resolved": "https://registry.npmjs.org/pivottable/-/pivottable-2.23.0.tgz",
+      "integrity": "sha512-6WRaiiI0mU5JxzNMWbtf3vfrBvBhBPIUbwu2Q7Nv7fVCxIvlmFqXSldMwmHAsiEFwdZdUrpQHqIu+N3jZUezyg==",
+      "dependencies": {
+        "jquery": ">=1.9.0"
+      }
+    },
    "node_modules/pkg-dir": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
@@ -21924,6 +21969,15 @@
      "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=",
      "dev": true
    },
+    "node_modules/vue-multiselect": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/vue-multiselect/-/vue-multiselect-2.1.6.tgz",
+      "integrity": "sha512-s7jmZPlm9FeueJg1RwJtnE9KNPtME/7C8uRWSfp9/yEN4M8XcS/d+bddoyVwVnvFyRh9msFo0HWeW0vTL8Qv+w==",
+      "engines": {
+        "node": ">= 4.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
    "node_modules/vue-router": {
      "version": "3.3.4",
      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.3.4.tgz",
@@ -21961,6 +22015,11 @@
      "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
      "dev": true
    },
+    "node_modules/vue2-teleport": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/vue2-teleport/-/vue2-teleport-1.0.1.tgz",
+      "integrity": "sha512-hbY/Q0x8qXGFxo6h4KU4YYesUcN+uUjliqqC0PoNSgpcbS2QRb3qXi+7XMTgLYs0a8i7o1H6Mu43UV4Vbgkhgw=="
+    },
    "node_modules/vuejs-paginate": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/vuejs-paginate/-/vuejs-paginate-2.1.0.tgz",
@@ -22071,6 +22130,7 @@
      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
      "dev": true,
+      "hasInstallScript": true,
      "optional": true,
      "os": [
        "darwin"
@@ -22410,6 +22470,7 @@
      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
      "dev": true,
+      "hasInstallScript": true,
      "optional": true,
      "os": [
        "darwin"
@@ -28728,6 +28789,21 @@
      "resolved": "https://registry.npmjs.org/css-global-keywords/-/css-global-keywords-1.0.1.tgz",
      "integrity": "sha1-cqmupyeW0Bmx0qMlLeTlqqN+Smk="
    },
+    "css-line-break": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-1.1.1.tgz",
+      "integrity": "sha512-1feNVaM4Fyzdj4mKPIQNL2n70MmuYzAXZ1aytlROFX1JsOo070OsugwGjj7nl6jnDJWHDM8zRZswkmeYVWZJQA==",
+      "requires": {
+        "base64-arraybuffer": "^0.2.0"
+      },
+      "dependencies": {
+        "base64-arraybuffer": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.2.0.tgz",
+          "integrity": "sha512-7emyCsu1/xiBXgQZrscw/8KPRT44I4Yq9Pe6EGs3aPRTsWuggML1/1DTuZUuIaJPIm1FTDUVXl4x/yW8s0kQDQ=="
+        }
+      }
+    },
    "css-loader": {
      "version": "3.6.0",
      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.6.0.tgz",
@@ -33017,6 +33093,14 @@
        }
      }
    },
+    "html2canvas": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.1.4.tgz",
+      "integrity": "sha512-uHgQDwrXsRmFdnlOVFvHin9R7mdjjZvoBoXxicPR+NnucngkaLa5zIDW9fzMkiip0jSffyTyWedE8iVogYOeWg==",
+      "requires": {
+        "css-line-break": "1.1.1"
+      }
+    },
    "htmlparser2": {
      "version": "3.10.1",
      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
@@ -34218,6 +34302,11 @@
        }
      }
    },
+    "jquery": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
+      "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
+    },
    "js-base64": {
      "version": "2.6.4",
      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz",
@@ -36942,6 +37031,14 @@
        "pinkie": "^2.0.0"
      }
    },
+    "pivottable": {
+      "version": "2.23.0",
+      "resolved": "https://registry.npmjs.org/pivottable/-/pivottable-2.23.0.tgz",
+      "integrity": "sha512-6WRaiiI0mU5JxzNMWbtf3vfrBvBhBPIUbwu2Q7Nv7fVCxIvlmFqXSldMwmHAsiEFwdZdUrpQHqIu+N3jZUezyg==",
+      "requires": {
+        "jquery": ">=1.9.0"
+      }
+    },
    "pkg-dir": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
@@ -42205,6 +42302,11 @@
        }
      }
    },
+    "vue-multiselect": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/vue-multiselect/-/vue-multiselect-2.1.6.tgz",
+      "integrity": "sha512-s7jmZPlm9FeueJg1RwJtnE9KNPtME/7C8uRWSfp9/yEN4M8XcS/d+bddoyVwVnvFyRh9msFo0HWeW0vTL8Qv+w=="
+    },
    "vue-router": {
      "version": "3.3.4",
      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.3.4.tgz",
@@ -42244,6 +42346,11 @@
      "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
      "dev": true
    },
+    "vue2-teleport": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/vue2-teleport/-/vue2-teleport-1.0.1.tgz",
+      "integrity": "sha512-hbY/Q0x8qXGFxo6h4KU4YYesUcN+uUjliqqC0PoNSgpcbS2QRb3qXi+7XMTgLYs0a8i7o1H6Mu43UV4Vbgkhgw=="
+    },
    "vuejs-paginate": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/vuejs-paginate/-/vuejs-paginate-2.1.0.tgz",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "sqliteviz",
-  "version": "0.14.2",
+  "version": "0.15.0",
  "license": "Apache-2.0",
  "private": true,
  "scripts": {
@@ -12,8 +12,11 @@
  "dependencies": {
    "codemirror": "^5.57.0",
    "core-js": "^3.6.5",
+    "html2canvas": "^1.1.4",
+    "jquery": "^3.6.0",
    "nanoid": "^3.1.12",
    "papaparse": "^5.3.1",
+    "pivottable": "^2.23.0",
    "plotly.js": "^1.58.4",
    "promise-worker": "^2.0.1",
    "react": "^16.13.1",
@@ -24,7 +27,9 @@
    "vue": "^2.6.11",
    "vue-codemirror": "^4.0.6",
    "vue-js-modal": "^2.0.0-rc.6",
+    "vue-multiselect": "^2.1.6",
    "vue-router": "^3.2.0",
+    "vue2-teleport": "^1.0.1",
    "vuejs-paginate": "^2.1.0",
    "vuera": "^0.2.7",
    "vuex": "^3.4.0"
--- a/public/inquiries.json
+++ b/public/inquiries.json
--- a/src/assets/images/arrow-hover.svg
+++ b/src/assets/images/arrow-hover.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.51581 7.54801C4.95181 7.10201 5.55881 7.06701 6.09181 7.54801L9.99981 11.295L13.9078 7.54801C14.4408 7.06701 15.0488 7.10201 15.4818 7.54801C15.9178 7.99301 15.8898 8.74501 15.4818 9.16301C15.0758 9.58101 10.7868 13.665 10.7868 13.665C10.5698 13.888 10.2848 14 9.99981 14C9.71481 14 9.42981 13.888 9.21081 13.665C9.21081 13.665 4.92381 9.58101 4.51581 9.16301C4.10781 8.74501 4.07981 7.99301 4.51581 7.54801V7.54801Z" fill="#119DFF"/>
+</svg>
--- a/src/assets/images/arrow.svg
+++ b/src/assets/images/arrow.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.51581 7.54801C4.95181 7.10201 5.55881 7.06701 6.09181 7.54801L9.99981 11.295L13.9078 7.54801C14.4408 7.06701 15.0488 7.10201 15.4818 7.54801C15.9178 7.99301 15.8898 8.74501 15.4818 9.16301C15.0758 9.58101 10.7868 13.665 10.7868 13.665C10.5698 13.888 10.2848 14 9.99981 14C9.71481 14 9.42981 13.888 9.21081 13.665C9.21081 13.665 4.92381 9.58101 4.51581 9.16301C4.10781 8.74501 4.07981 7.99301 4.51581 7.54801V7.54801Z" fill="#C8D4E3"/>
+</svg>
--- a/src/assets/images/delete-tag-hover.svg
+++ b/src/assets/images/delete-tag-hover.svg
@@ -0,0 +1,3 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.0436 10.3943C9.7153 10.7226 9.1833 10.7226 8.8557 10.3943L7 8.27329L5.1443 10.3936C4.816 10.7219 4.284 10.7219 3.9564 10.3936C3.6281 10.0653 3.6281 9.53329 3.9564 9.20569L5.887 7.00069L3.9557 4.79429C3.6274 4.46599 3.6274 3.93469 3.9557 3.60639C4.284 3.27809 4.8153 3.27809 5.1436 3.60639L7 5.72809L8.8557 3.60639C9.184 3.27809 9.7153 3.27809 10.0436 3.60639C10.3719 3.93469 10.3719 4.46669 10.0436 4.79429L8.113 7.00069L10.0436 9.20569C10.3719 9.53399 10.3719 10.066 10.0436 10.3943V10.3943Z" fill="#DE350B"/>
+</svg>
--- a/src/assets/images/delete-tag.svg
+++ b/src/assets/images/delete-tag.svg
@@ -0,0 +1,3 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.0436 10.3945C9.7153 10.7228 9.1833 10.7228 8.8557 10.3945L7 8.27348L5.1443 10.3938C4.816 10.7221 4.284 10.7221 3.9564 10.3938C3.6281 10.0655 3.6281 9.53348 3.9564 9.20588L5.887 7.00088L3.9557 4.79448C3.6274 4.46618 3.6274 3.93488 3.9557 3.60658C4.284 3.27828 4.8153 3.27828 5.1436 3.60658L7 5.72828L8.8557 3.60658C9.184 3.27828 9.7153 3.27828 10.0436 3.60658C10.3719 3.93488 10.3719 4.46688 10.0436 4.79448L8.113 7.00088L10.0436 9.20588C10.3719 9.53418 10.3719 10.0662 10.0436 10.3945V10.3945Z" fill="#506784"/>
+</svg>
--- a/src/assets/images/sort.svg
+++ b/src/assets/images/sort.svg
@@ -0,0 +1,11 @@
+<svg width="6" height="12" viewBox="0 0 6 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path d="M2.99932 -3.63032e-05C2.75092 -3.63032e-05 2.54932 0.201563 2.54932 0.449964L2.54932 11.55C2.54932 11.7984 2.75092 12 2.99932 12C3.24772 12 3.44932 11.7984 3.44932 11.55L3.44932 0.449964C3.44932 0.201563 3.24772 -3.63032e-05 2.99932 -3.63032e-05Z" fill="#506784"/>
+<path d="M2.99915 1.80492e-05C2.8839 1.80492e-05 2.76865 0.0438534 2.68109 0.132073L0.581055 2.232C0.405273 2.40789 0.405273 2.69287 0.581055 2.86865C0.756946 3.04443 1.04193 3.04443 1.21771 2.86865L2.99969 1.08667L4.78168 2.86865C4.95746 3.04443 5.24255 3.04443 5.41833 2.86865C5.59412 2.69287 5.59412 2.40789 5.41833 2.232L3.3183 0.132073C3.22953 0.0438534 3.11428 1.80492e-05 2.99915 1.80492e-05V1.80492e-05Z" fill="#506784"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="6" height="12" fill="white" transform="matrix(1 0 0 -1 0 12)"/>
+</clipPath>
+</defs>
+</svg>
--- a/src/assets/styles/multiselect.css
+++ b/src/assets/styles/multiselect.css
@@ -0,0 +1,136 @@
+.sqliteviz-select,
+.sqliteviz-select .multiselect__tags {
+  min-height: 36px;
+  color: var(--color-text-base);
+}
+
+.sqliteviz-select .multiselect__select {
+  height: 34px;
+  min-height: 34px;
+  padding: 6px;
+  width: 32px;
+  height: 32px;
+  margin-top: 1px;
+}
+
+.sqliteviz-select .multiselect__tags {
+  border-radius: var(--border-radius-medium-2);
+  border: 1px solid var(--color-border);
+  padding: 4px 32px 0 6px;
+}
+
+.sqliteviz-select,
+.sqliteviz-select .multiselect__input,
+.sqliteviz-select .multiselect__single,
+.sqliteviz-select .multiselect__placeholder {
+  font-size: 12px;
+}
+
+.sqliteviz-select .multiselect__single,
+.sqliteviz-select .multiselect__placeholder,
+.sqliteviz-select .multiselect__input {
+  padding: 0;
+  margin-bottom: 0;
+  line-height: 28px;
+}
+
+.sqliteviz-select .multiselect__input {
+  width: 0 !important;
+  color: var(--color-text-base);
+}
+
+.sqliteviz-select.multiselect--active .multiselect__input {
+  width: auto !important;
+}
+
+.sqliteviz-select .multiselect__placeholder,
+.sqliteviz-select .multiselect__input::placeholder {
+  color: var(--color-text-light-2);
+}
+
+.sqliteviz-select .multiselect__option.multiselect__option--highlight {
+  background-color: var(--color-bg-light);
+  color: var(--color-text-active);
+}
+
+.sqliteviz-select .multiselect__tag {
+  background-color: var(--color-bg-light-4);
+  border: 1px solid var(--color-border);
+  border-radius: var(--border-radius-small);
+  color: var(--color-text-active);
+  font-size: 11.05px;
+  margin: 2px;
+}
+.sqliteviz-select .multiselect__tag-icon:after {
+  content: url('~@/assets/images/delete-tag.svg');
+  height: 14px;
+  width: 14px;
+}
+
+.sqliteviz-select .multiselect__tag-icon:focus:after,
+.sqliteviz-select .multiselect__tag-icon:hover:after {
+  content: url('~@/assets/images/delete-tag-hover.svg');
+}
+
+.sqliteviz-select .multiselect__tag-icon:focus,
+.sqliteviz-select .multiselect__tag-icon:hover {
+  background-color: var(--color-bg-danger);
+  border-radius: var(--border-radius-small);
+}
+
+.sqliteviz-select .multiselect__option {
+  min-height: 29px;
+  padding: 8px 12px;
+  line-height: 13px;
+}
+
+.sqliteviz-select .multiselect__option:after {
+  line-height: 29px;
+}
+
+.sqliteviz-select .multiselect__content-wrapper {
+  border-radius: var(--border-radius-medium-2);
+  border: 1px solid var(--color-border);
+  box-shadow: var(--shadow-1);
+  top: calc(100% - 1px);
+  max-height: 292px !important;
+}
+
+.sqliteviz-select.multiselect--above .multiselect__content-wrapper {
+  top: unset;
+  bottom: calc(100% - 1px);
+}
+
+.sqliteviz-select .multiselect__select:before {
+  content: url('~@/assets/images/arrow.svg');
+  border: none;
+  top: 0;
+}
+
+.sqliteviz-select.multiselect--active .multiselect__select {
+  transform: none;
+}
+
+.sqliteviz-select:hover .multiselect__tags {
+  border-color: var(--color-border-dark);
+}
+
+.sqliteviz-select .multiselect__select:hover:before {
+  content: url('~@/assets/images/arrow-hover.svg');
+}
+
+.sqliteviz-select.multiselect--active .multiselect__tags {
+  border-radius: var(--border-radius-medium-2);
+}
+
+.sqliteviz-select .multiselect__option  .no-results {
+  color: var(--color-text-light-2);
+}
+
+.sqliteviz-select.multiselect--disabled {
+  opacity: unset;
+}
+
+.sqliteviz-select.multiselect--disabled .multiselect__select {
+  background: unset;
+}
--- a/src/assets/styles/tables.css
+++ b/src/assets/styles/tables.css
@@ -6,6 +6,12 @@
  border: 1px solid var(--color-border-light);
  box-sizing: border-box;
 }
+
+.straight .rounded-bg {
+  border-radius: 0;
+  border-width: 0 0 1px 0;
+}
+
 .header-container {
  overflow: hidden;
  position: absolute;
@@ -18,6 +24,19 @@
  border-radius: 5px 5px 0 0;
 }

+.straight .header-container {
+  border-radius: 0;
+}
+
+.straight {
+  height: 100%;
+}
+
+.straight .rounded-bg {
+  /* 27 - height of table footer */
+  height: calc(100% - 27px);
+}
+
@supports (-moz-appearance:none) {
  .header-container {
    top: 0;
@@ -32,22 +51,25 @@
 }
 .table-container {
  width: 100%;
+  max-height: 100%;
  overflow: auto;
 }
-table {
+table.sqliteviz-table {
  min-width: 100%;
  margin-top: -35px;
  border-collapse: collapse;
 }
-thead th, .fixed-header {
+.sqliteviz-table thead th, .fixed-header {
  font-size: 14px;
  font-weight: 600;
  box-sizing: border-box;
  background-color: var(--color-bg-dark);
  color: var(--color-text-light);
  border-right: 1px solid var(--color-border-light);
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
-tbody td {
+.sqliteviz-table tbody td {
  font-size: 13px;
  background-color:white;
  color: var(--color-text-base);
@@ -55,18 +77,20 @@ tbody td {
  border-bottom: 1px solid var(--color-border-light);
  border-right: 1px solid var(--color-border-light);
 }
-td, th, .fixed-header {
+.sqliteviz-table td,
+.sqliteviz-table th,
+.fixed-header {
  padding: 8px 24px;
  white-space: nowrap;
 }

-tbody tr td:last-child,
-thead tr th:last-child,
+.sqliteviz-table tbody tr td:last-child,
+.sqliteviz-table thead tr th:last-child,
 .header-container div .fixed-header:last-child {
  border-right: none;
 }

-td > div.cell-data {
+.sqliteviz-table td > div.cell-data {
  width: -webkit-max-content;
  width: -moz-max-content;
  width: max-content;
--- a/src/assets/styles/variables.css
+++ b/src/assets/styles/variables.css
@@ -11,6 +11,8 @@
  --color-blue-dark: #0D76BF;
  --color-blue-dark-2: #2A3F5F;
  --color-red: #EF553B;
+  --color-red-2: #DE350B;
+  --color-red-light: #FFBDAD;
  --color-yellow: #FBEFCB;


@@ -18,13 +20,16 @@
  --color-bg-light: var(--color-gray-light);
  --color-bg-light-2: var(--color-gray-light-2);
  --color-bg-light-3: var(--color-gray-light-5);
+  --color-bg-light-4: var(--color-gray-light-4);
  --color-bg-dark: var(--color-gray-dark);
  --color-bg-warning: var(--color-yellow);
-  --color-danger: var(--color-red);
+  --color-bg-danger: var(--color-red-light);
+  --color-danger: var(--color-red-2);
  --color-accent: var(--color-blue-medium);
  --color-accent-shade: var(--color-blue-dark);
  --color-border-light: var(--color-gray-light-2);
  --color-border: var(--color-gray-light-3);
+  --color-border-dark: var(--color-gray-medium);
  --color-text-light: var(--color-white);
  --color-text-light-2: var(--color-gray-medium);
  --color-text-base: var(--color-gray-dark);
--- a/src/components/CsvImport/csv.js
+++ b/src/components/CsvImport/csv.js
@@ -10,29 +10,26 @@ export default {
  getResult (source) {
    const result = {}
    if (source.meta.fields) {
-      result.columns = source.meta.fields.map(col => col.trim())
-      result.values = source.data.map(row => {
-        const resultRow = []
-        source.meta.fields.forEach(col => {
+      source.meta.fields.forEach(col => {
+        result[col.trim()] = source.data.map(row => {
          let value = row[col]
          if (value instanceof Date) {
            value = value.toISOString()
          }
-          resultRow.push(value)
+          return value
        })
-
-        return resultRow
      })
    } else {
-      result.values = source.data.map(row => row.map(value =>
-        value instanceof Date ? value.toISOString() : value
-      ))
-      result.columns = []
-      for (let i = 1; i <= source.data[0].length; i++) {
-        result.columns.push(`col${i}`)
+      for (let i = 0; i <= source.data[0].length - 1; i++) {
+        result[`col${i + 1}`] = source.data.map(row => {
+          let value = row[i]
+          if (value instanceof Date) {
+            value = value.toISOString()
+          }
+          return value
+        })
      }
    }
-
    return result
  },

@@ -55,7 +52,8 @@ export default {
          const res = {
            data: this.getResult(results),
            delimiter: results.meta.delimiter,
-            hasErrors: false
+            hasErrors: false,
+            rowCount: results.data.length
          }
          res.messages = results.errors.map(msg => {
            msg.type = msg.code === 'UndetectableDelimiter' ? 'info' : 'error'
--- a/src/components/CsvImport/index.vue
+++ b/src/components/CsvImport/index.vue
@@ -55,9 +55,10 @@
        :disabled="disableDialog"
      />
      <sql-table
-        v-if="previewData && (previewData.values.length > 0 || previewData.columns.length > 0)"
+        v-if="previewData
+          && (previewData.rowCount > 0 || Object.keys(previewData).length > 0)
+        "
        :data-set="previewData"
-        height="160"
        class="preview-table"
        :preview="true"
      />
@@ -255,7 +256,7 @@ export default {
        let end = new Date()

        if (!parseResult.hasErrors) {
-          const rowCount = parseResult.data.values.length
+          const rowCount = parseResult.rowCount
          let period = time.getPeriod(start, end)
          parseCsvMsg.type = 'success'

--- a/src/components/DbUploader.vue
+++ b/src/components/DbUploader.vue
@@ -1,6 +1,6 @@
 <template>
  <div class="db-uploader-container" :style="{ width }">
-    <change-db-icon v-if="type === 'small'" @click.native="browse"/>
+    <change-db-icon v-if="type === 'small'" @click="browse"/>
    <div v-if="type === 'illustrated'" class="drop-area-container">
      <div
        class="drop-area"
@@ -110,8 +110,8 @@ export default {

    async finish () {
      this.$store.commit('setDb', this.newDb)
-      if (this.$route.path !== '/editor') {
-        this.$router.push('/editor')
+      if (this.$route.path !== '/workspace') {
+        this.$router.push('/workspace')
      }
    },

--- a/src/components/IconButton.vue
+++ b/src/components/IconButton.vue
@@ -0,0 +1,110 @@
+<template>
+  <div
+    :class="['icon-btn', { active }, { disabled }]"
+    @click="onClick"
+    @mouseenter="showTooltip($event, tooltipPosition)"
+    @mouseleave="hideTooltip"
+  >
+    <div class="icon"><slot /></div>
+    <div v-show="loading" class="icon-in-progress">
+      <loading-indicator />
+    </div>
+    <span v-if="tooltip" class="icon-tooltip" :style="tooltipStyle" ref="tooltip">
+      {{ tooltip }}
+    </span>
+  </div>
+</template>
+
+<script>
+import tooltipMixin from '@/tooltipMixin'
+import LoadingIndicator from '@/components/LoadingIndicator'
+
+export default {
+  name: 'SideBarButton',
+  props: ['active', 'disabled', 'tooltip', 'tooltipPosition', 'loading'],
+  components: { LoadingIndicator },
+  mixins: [tooltipMixin],
+  methods: {
+    onClick () {
+      this.hideTooltip()
+      this.$emit('click')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.icon-btn {
+  box-sizing: border-box;
+  width: 26px;
+  height: 26px;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: relative;
+}
+.icon-btn:hover {
+  border: 1px solid var(--color-border);
+  border-radius: var(--border-radius-medium-2);
+}
+
+.icon-btn:hover .icon >>> path,
+.icon-btn.active .icon >>> path,
+.icon-btn:hover .icon >>> circle,
+.icon-btn.active .icon >>> circle {
+  fill: var(--color-accent);
+}
+
+.disabled.icon-btn  .icon >>> path,
+.disabled.icon-btn  .icon >>> circle {
+  fill: var(--color-border);
+}
+
+.disabled.icon-btn {
+  cursor: default;
+  pointer-events: none;
+}
+
+.disabled.icon-btn:hover .icon >>> path {
+  fill: var(--color-border);
+}
+
+.icon-in-progress {
+  position: absolute;
+  width: 26px;
+  height: 26px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: var(--color-bg-light);
+  will-change: opacity;
+  /*
+    We need to show loader in 1 sec after starting query execution. We can't do that with
+    setTimeout because the main thread can be busy by getting a result set from the web worker.
+    But we can use CSS animation for opacity. Opacity triggers changes only in the Composite Layer
+    stage in rendering waterfall. Hence it can be processed only with Compositor Thread while
+    the Main Thread processes a result set.
+    https://www.viget.com/articles/animation-performance-101-browser-under-the-hood/
+  */
+  animation: show-loader 1s linear 0s 1;
+}
+
+@keyframes show-loader {
+  0% {
+    opacity: 0;
+  }
+  99% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
+}
+
+.icon {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+</style>
--- a/src/components/SqlTable/Pager.vue
+++ b/src/components/SqlTable/Pager.vue
@@ -49,6 +49,7 @@ export default {
 .paginator-continer {
  display: flex;
  align-items: center;
+  line-height: 10px;
 }
 >>> .paginator-page-link {
  padding: 2px 3px;
--- a/src/components/SqlTable/index.vue
+++ b/src/components/SqlTable/index.vue
@@ -17,20 +17,21 @@
        class="table-container"
        ref="table-container"
        @scroll="onScrollTable"
-        :style="{maxHeight: `${height}px`}"
      >
-      <table ref="table">
+      <table ref="table" class="sqliteviz-table">
        <thead>
          <tr>
-            <th v-for="(th,index) in dataSet.columns" :key="index" ref="th">
+            <th v-for="(th, index) in columns" :key="index" ref="th">
              <div class="cell-data" :style="cellStyle">{{ th }}</div>
            </th>
          </tr>
        </thead>
        <tbody>
-          <tr v-for="(row,index) in currentPageData" :key="index">
-            <td v-for="(value, valIndex) in row" :key="valIndex">
-              <div class="cell-data" :style="cellStyle">{{ value }}</div>
+          <tr v-for="rowIndex in currentPageData.count" :key="rowIndex">
+            <td v-for="(col, colIndex) in columns" :key="colIndex">
+              <div class="cell-data" :style="cellStyle">
+                {{ dataSet[col][rowIndex - 1 + currentPageData.start] }}
+              </div>
            </td>
          </tr>
        </tbody>
@@ -39,7 +40,7 @@
    </div>
    <div class="table-footer">
      <div class="table-footer-count">
-        {{ dataSet.values.length}} {{dataSet.values.length === 1 ? 'row' : 'rows'}} retrieved
+        {{ rowCount }} {{rowCount === 1 ? 'row' : 'rows'}} retrieved
        <span v-if="preview">for preview</span>
        <span v-if="time">in {{ time }}</span>
      </div>
@@ -54,7 +55,15 @@ import Pager from './Pager'
 export default {
  name: 'SqlTable',
  components: { Pager },
-  props: ['dataSet', 'time', 'height', 'preview'],
+  props: {
+    dataSet: Object,
+    time: String,
+    pageSize: {
+      type: Number,
+      default: 20
+    },
+    preview: Boolean
+  },
  data () {
    return {
      header: null,
@@ -64,20 +73,30 @@ export default {
    }
  },
  computed: {
+    columns () {
+      return Object.keys(this.dataSet)
+    },
+    rowCount () {
+      return this.dataSet[this.columns[0]].length
+    },
    cellStyle () {
-      const eq = this.tableWidth / this.dataSet.columns.length
-
+      const eq = this.tableWidth / this.columns.length
      return { maxWidth: `${Math.max(eq, 100)}px` }
    },
-    pageSize () {
-      return Math.max(Math.floor(this.height / 40), 20)
-    },
    pageCount () {
-      return Math.ceil(this.dataSet.values.length / this.pageSize)
+      return Math.ceil(this.rowCount / this.pageSize)
    },
    currentPageData () {
      const start = (this.currentPage - 1) * this.pageSize
-      return this.dataSet.values.slice(start, start + this.pageSize)
+      let end = start + this.pageSize
+      if (end > this.rowCount - 1) {
+        end = this.rowCount - 1
+      }
+      return {
+        start,
+        end,
+        count: end - start + 1
+      }
    }
  },
  methods: {
--- a/src/components/svg/addTable.vue
+++ b/src/components/svg/addTable.vue
@@ -6,9 +6,9 @@
      height="18"
      viewBox="0 0 18 18"
      fill="none"
-      @click.stop="$emit('click')"
-      @mouseover="showTooltip"
-      @mouseout="hideTooltip"
+      @click.stop="onClick"
+      @mouseenter="showTooltip"
+      @mouseleave="hideTooltip"
    >
      <g clip-path="url(#clip0)">
        <path
@@ -32,7 +32,7 @@
        </clipPath>
      </defs>
    </svg>
-    <span class="icon-tooltip" :style="tooltipStyle">
+    <span class="icon-tooltip" :style="tooltipStyle" ref="tooltip">
      Add new table from CSV
    </span>
  </span>
@@ -44,7 +44,13 @@ import tooltipMixin from '@/tooltipMixin'
 export default {
  name: 'AddTableIcon',
  mixins: [tooltipMixin],
-  props: ['tooltip']
+  props: ['tooltip'],
+  methods: {
+    onClick () {
+      this.hideTooltip()
+      this.$emit('click')
+    }
+  }
 }
 </script>

--- a/src/components/svg/changeDb.vue
+++ b/src/components/svg/changeDb.vue
@@ -6,16 +6,16 @@
    height="18"
    viewBox="0 0 18 18"
    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-    @mouseover="showTooltip"
-    @mouseout="hideTooltip"
+    @click.stop="onClick"
+    @mouseenter="showTooltip"
+    @mouseleave="hideTooltip"
  >
    <path
      d="M3 10.5V12.75C3 14.25 5.2875 15.54 8.25 15.75V13.5825L8.3475 13.5C5.34 13.32 3 12.045 3 10.5ZM9 9.75C5.685 9.75 3 8.4075 3 6.75V9C3 10.6575 5.685 12 9 12C9.2925 12 9.5775 12 9.87 12L12.75 9.09C11.55 9.54 10.2825 9.75 9 9.75ZM9 2.25C5.685 2.25 3 3.5925 3 5.25C3 6.9075 5.685 8.25 9 8.25C12.315 8.25 15 6.9075 15 5.25C15 3.5925 12.315 2.25 9 2.25ZM15.75 8.3475C15.6375 8.3475 15.5325 8.3925 15.4575 8.475L14.7075 9.225L16.245 10.725L16.995 9.975C17.1525 9.825 17.16 9.57 16.995 9.3975L16.065 8.475C15.99 8.3925 15.885 8.3475 15.78 8.3475H15.75ZM14.28 9.66L9.75 14.205V15.75H11.295L15.84 11.1975L14.28 9.66Z"
      fill="#A2B1C6"
    />
  </svg>
-  <span class="icon-tooltip" :style="tooltipStyle">
+  <span class="icon-tooltip" :style="tooltipStyle" ref="tooltip">
    Load another database or CSV
  </span>
 </div>
@@ -26,7 +26,13 @@ import tooltipMixin from '@/tooltipMixin'

 export default {
  name: 'changeDbIcon',
-  mixins: [tooltipMixin]
+  mixins: [tooltipMixin],
+  methods: {
+    onClick () {
+      this.hideTooltip()
+      this.$emit('click')
+    }
+  }
 }
 </script>

--- a/src/components/svg/chart.vue
+++ b/src/components/svg/chart.vue
@@ -0,0 +1,22 @@
+<template>
+  <svg
+    width="18"
+    height="18"
+    viewBox="0 0 18 18"
+    fill="none"
+  >
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M8.41943 16V10H10.4194V16H8.41943Z" fill="#A2B1C6"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M2.41943 16L2.41943 10H4.41943V16H2.41943Z" fill="#A2B1C6"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M11.4194 16V7H13.4194V16H11.4194Z" fill="#A2B1C6"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M14.4194 16V8H16.4194V16H14.4194Z" fill="#A2B1C6"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M7.41943 12V16H5.41943V12H7.41943Z" fill="#A2B1C6"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M12.4332 1.80676L16.6265 6.00001L15.9194 6.70712L12.4055 3.19326L5.93169 9.1691L1.71436 5.55424L2.36515 4.79499L5.90707 7.83092L12.4332 1.80676Z" fill="#A2B1C6"/>
+  </svg>
+</template>
+
+<script>
+
+export default {
+  name: 'ChartIcon'
+}
+</script>
--- a/src/components/svg/dataView.vue
+++ b/src/components/svg/dataView.vue
@@ -0,0 +1,19 @@
+<template>
+  <svg
+    width="18"
+    height="18"
+    viewBox="0 0 18 18"
+    fill="none"
+  >
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M13.5552 6.91522C13.7584 6.91357 13.9535 6.99442 14.096 7.13926L17.2582 10.3541C17.5486 10.6494 17.5447 11.1242 17.2494 11.4147C16.9541 11.7051 16.4793 11.7012 16.1888 11.4059L13.57 8.74357L9.29577 13.2318C9.01977 13.5216 8.56484 13.5436 8.2621 13.2819L5.35435 10.7677L2.03285 13.7321C1.72382 14.0079 1.24971 13.981 0.973901 13.6719C0.69809 13.3629 0.725022 12.8888 1.03406 12.613L4.8471 9.20986C5.12827 8.95892 5.55198 8.95559 5.83705 9.20208L8.70249 11.6797L13.0182 7.14796C13.1583 7.00084 13.3521 6.91686 13.5552 6.91522Z" fill="#A2B1C6"/>
+    <circle cx="5.50049" cy="6.00339" r="1.5" fill="#A2B1C6"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M16.036 1.21788L1.96546 1.213C1.14046 1.213 0.465462 1.888 0.465462 2.713L0.464111 15.2821C0.464111 16.1071 1.13911 16.7821 1.96411 16.7821L16.0347 16.787C16.8674 16.787 17.5347 16.1121 17.5347 15.287L17.536 2.71788C17.536 1.88787 16.866 1.21788 16.036 1.21788ZM16.0374 2.71788L1.96424 2.713L1.96289 15.2773L16.036 15.2821L16.0374 2.71788Z" fill="#A2B1C6"/>
+</svg>
+</template>
+
+<script>
+
+export default {
+  name: 'DataViewIcon'
+}
+</script>
--- a/src/components/svg/export.vue
+++ b/src/components/svg/export.vue
@@ -6,17 +6,16 @@
      height="18"
      viewBox="0 0 18 18"
      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-      @click.stop="$emit('click')"
-      @mouseover="showTooltip"
-      @mouseout="hideTooltip"
+      @click.stop="onClick"
+      @mouseenter="showTooltip($event, tooltipPosition)"
+      @mouseleave="hideTooltip"
    >
      <path
        d="M10.5 1.5H4.5C3.675 1.5 3 2.175 3 3V15C3 15.825 3.675 16.5 4.5 16.5H13.5C14.325 16.5 15 15.825 15 15V6L10.5 1.5ZM13.5 15H4.5V3H9.75V6.75H13.5V15ZM12 8.25V13.575L10.425 12L8.325 14.1L6.225 12L8.325 9.9L6.675 8.25H12Z"
        fill="#A2B1C6"
      />
    </svg>
-    <span class="icon-tooltip" :style="tooltipStyle">
+    <span class="icon-tooltip" :style="tooltipStyle" ref="tooltip">
      {{ tooltip }}
    </span>
  </span>
@@ -28,7 +27,13 @@ import tooltipMixin from '@/tooltipMixin'
 export default {
  name: 'ExportIcon',
  mixins: [tooltipMixin],
-  props: ['tooltip']
+  props: ['tooltip', 'tooltipPosition'],
+  methods: {
+    onClick () {
+      this.hideTooltip()
+      this.$emit('click')
+    }
+  }
 }
 </script>

--- a/src/components/svg/hint.vue
+++ b/src/components/svg/hint.vue
@@ -6,14 +6,14 @@
      height="20"
      viewBox="0 0 20 20"
      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-      @mouseover="showTooltip"
-      @mouseout="hideTooltip"
+      @click.stop="onClick"
+      @mouseenter="showTooltip"
+      @mouseleave="hideTooltip"
    >
      <path d="M8.75 14.1666H10.4167V12.5H8.75V14.1666ZM9.58333 16.25C5.90833 16.25 2.91667 13.2583 2.91667 9.58333C2.91667 5.90833 5.90833 2.91667 9.58333 2.91667C13.2583 2.91667 16.25 5.90833 16.25 9.58333C16.25 13.2583 13.2583 16.25 9.58333 16.25ZM9.58333 1.25C8.48898 1.25 7.40535 1.46555 6.3943 1.88434C5.38326 2.30313 4.4646 2.91696 3.69078 3.69078C2.12797 5.25358 1.25 7.3732 1.25 9.58333C1.25 11.7935 2.12797 13.9131 3.69078 15.4759C4.4646 16.2497 5.38326 16.8635 6.3943 17.2823C7.40535 17.7011 8.48898 17.9167 9.58333 17.9167C11.7935 17.9167 13.9131 17.0387 15.4759 15.4759C17.0387 13.9131 17.9167 11.7935 17.9167 9.58333C17.9167 8.48898 17.7011 7.40535 17.2823 6.3943C16.8635 5.38326 16.2497 4.4646 15.4759 3.69078C14.7021 2.91696 13.7834 2.30313 12.7724 1.88434C11.7613 1.46555 10.6777 1.25 9.58333 1.25Z" fill="#A2B1C6"/>
      <path d="M9.91601 4.51787C8.98167 4.42606 8.05144 4.69097 7.36309 5.24472C6.68735 5.78828 6.2998 6.56661 6.2998 7.38012H7.92488C7.92488 6.97463 8.11059 6.60187 8.44779 6.33061C8.79784 6.049 9.25647 5.92005 9.73896 5.96755C10.4832 6.04076 11.0828 6.57277 11.1647 7.23265C11.2306 7.764 10.9661 8.28194 10.4744 8.58426C9.38676 9.25303 8.73742 10.343 8.73742 11.5H10.3625C10.3625 10.8243 10.7477 10.184 11.3929 9.78733C12.3808 9.17985 12.9122 8.13913 12.7798 7.07124C12.6144 5.73863 11.41 4.66476 9.91601 4.51787Z" fill="#A2B1C6"/>
    </svg>
-    <span class="icon-tooltip" :style="{...tooltipStyle, maxWidth: maxWidth }">
+    <span class="icon-tooltip" :style="{...tooltipStyle, maxWidth: maxWidth }" ref="tooltip">
      {{ hint }}
    </span>
  </div>
@@ -25,7 +25,13 @@ import tooltipMixin from '@/tooltipMixin'
 export default {
  name: 'HintIcon',
  props: ['hint', 'maxWidth'],
-  mixins: [tooltipMixin]
+  mixins: [tooltipMixin],
+  methods: {
+    onClick () {
+      this.hideTooltip()
+      this.$emit('click')
+    }
+  }
 }
 </script>

--- a/src/components/svg/pivot.vue
+++ b/src/components/svg/pivot.vue
@@ -0,0 +1,20 @@
+<template>
+  <svg
+    width="18"
+    height="18"
+    viewBox="0 0 18 18"
+    fill="none"
+  >
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M15.7661 5.13901L18.3407 9.43008H16.5161V12.8467C16.5161 13.7957 16.2783 14.6451 15.6714 15.2521C15.0645 15.859 14.215 16.0967 13.2661 16.0967H9.84942V17.9214L5.55835 15.3467L9.84942 12.7721V14.5967H13.2661C13.9838 14.5967 14.3844 14.4178 14.6108 14.1914C14.8372 13.965 15.0161 13.5645 15.0161 12.8467V9.43008H13.1914L15.7661 5.13901Z" fill="#A2B1C6"/>
+    <path d="M6.41943 0H18.4194V4H6.41943V0Z" fill="#A2B1C6"/>
+    <path d="M0.419434 6H4.41943V18H0.419434V6Z" fill="#A2B1C6"/>
+    <path d="M0.419434 0H4.41943V4H0.419434V0Z" fill="#A2B1C6"/>
+  </svg>
+</template>
+
+<script>
+
+export default {
+  name: 'PivotIcon'
+}
+</script>
--- a/src/components/svg/png.svg
+++ b/src/components/svg/png.svg
@@ -0,0 +1,5 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9 5.51953C6.57686 5.51953 4.60547 7.49092 4.60547 9.91406C4.60547 12.3372 6.57686 14.3086 9 14.3086C11.4231 14.3086 13.3945 12.3372 13.3945 9.91406C13.3945 7.49092 11.4231 5.51953 9 5.51953ZM9 12.9023C7.35226 12.9023 6.01172 11.5618 6.01172 9.91406C6.01172 8.26632 7.35226 6.92578 9 6.92578C10.6477 6.92578 11.9883 8.26632 11.9883 9.91406C11.9883 11.5618 10.6477 12.9023 9 12.9023Z" fill="#A2B1C6"/>
+<path d="M15.8906 3.41016H13.304C13.2221 3.41016 13.1483 3.36547 13.1104 3.29319L12.3948 1.78945C12.3928 1.78534 12.3908 1.78126 12.3887 1.77718C12.1117 1.22312 11.5548 0.878906 10.9353 0.878906H7.11478C6.49529 0.878906 5.93835 1.22312 5.66135 1.77722C5.65928 1.7813 5.65731 1.78538 5.65534 1.78949L4.9397 3.2933C4.90173 3.36547 4.82797 3.41016 4.74609 3.41016H2.10938C0.946266 3.41016 0 4.35642 0 5.51953V15.0117C0 16.1748 0.946266 17.1211 2.10938 17.1211H15.8906C17.0537 17.1211 18 16.1748 18 15.0117V5.51953C18 4.35642 17.0537 3.41016 15.8906 3.41016ZM16.5938 15.0117C16.5938 15.3994 16.2783 15.7148 15.8906 15.7148H2.10938C1.72167 15.7148 1.40625 15.3994 1.40625 15.0117V5.51953C1.40625 5.13183 1.72167 4.81641 2.10938 4.81641H4.74609C5.36555 4.81641 5.92249 4.47223 6.19952 3.91816C6.2016 3.91409 6.20357 3.90997 6.20557 3.90586L6.92121 2.40205C6.95914 2.32984 7.0329 2.28516 7.11478 2.28516H10.9353C11.0172 2.28516 11.091 2.32984 11.1289 2.40202L11.8445 3.90582C11.8465 3.90994 11.8485 3.91405 11.8506 3.91813C12.1276 4.47219 12.6846 4.81637 13.304 4.81637H15.8906C16.2783 4.81637 16.5938 5.13179 16.5938 5.5195V15.0117Z" fill="#A2B1C6"/>
+<path d="M15.1875 6.22266H13.7812V7.62891H15.1875V6.22266Z" fill="#A2B1C6"/>
+</svg>
--- a/src/components/svg/png.vue
+++ b/src/components/svg/png.vue
@@ -0,0 +1,18 @@
+<template>
+  <svg
+    width="18"
+    height="18"
+    viewBox="0 0 18 18"
+    fill="none"
+  >
+    <path d="M9 5.51953C6.57686 5.51953 4.60547 7.49092 4.60547 9.91406C4.60547 12.3372 6.57686 14.3086 9 14.3086C11.4231 14.3086 13.3945 12.3372 13.3945 9.91406C13.3945 7.49092 11.4231 5.51953 9 5.51953ZM9 12.9023C7.35226 12.9023 6.01172 11.5618 6.01172 9.91406C6.01172 8.26632 7.35226 6.92578 9 6.92578C10.6477 6.92578 11.9883 8.26632 11.9883 9.91406C11.9883 11.5618 10.6477 12.9023 9 12.9023Z" fill="#A2B1C6"/>
+    <path d="M15.8906 3.41016H13.304C13.2221 3.41016 13.1483 3.36547 13.1104 3.29319L12.3948 1.78945C12.3928 1.78534 12.3908 1.78126 12.3887 1.77718C12.1117 1.22312 11.5548 0.878906 10.9353 0.878906H7.11478C6.49529 0.878906 5.93835 1.22312 5.66135 1.77722C5.65928 1.7813 5.65731 1.78538 5.65534 1.78949L4.9397 3.2933C4.90173 3.36547 4.82797 3.41016 4.74609 3.41016H2.10938C0.946266 3.41016 0 4.35642 0 5.51953V15.0117C0 16.1748 0.946266 17.1211 2.10938 17.1211H15.8906C17.0537 17.1211 18 16.1748 18 15.0117V5.51953C18 4.35642 17.0537 3.41016 15.8906 3.41016ZM16.5938 15.0117C16.5938 15.3994 16.2783 15.7148 15.8906 15.7148H2.10938C1.72167 15.7148 1.40625 15.3994 1.40625 15.0117V5.51953C1.40625 5.13183 1.72167 4.81641 2.10938 4.81641H4.74609C5.36555 4.81641 5.92249 4.47223 6.19952 3.91816C6.2016 3.91409 6.20357 3.90997 6.20557 3.90586L6.92121 2.40205C6.95914 2.32984 7.0329 2.28516 7.11478 2.28516H10.9353C11.0172 2.28516 11.091 2.32984 11.1289 2.40202L11.8445 3.90582C11.8465 3.90994 11.8485 3.91405 11.8506 3.91813C12.1276 4.47219 12.6846 4.81637 13.304 4.81637H15.8906C16.2783 4.81637 16.5938 5.13179 16.5938 5.5195V15.0117Z" fill="#A2B1C6"/>
+    <path d="M15.1875 6.22266H13.7812V7.62891H15.1875V6.22266Z" fill="#A2B1C6"/>
+  </svg>
+</template>
+
+<script>
+export default {
+  name: 'PngIcon'
+}
+</script>
--- a/src/components/svg/run.vue
+++ b/src/components/svg/run.vue
@@ -0,0 +1,17 @@
+<template>
+  <svg
+    width="12"
+    height="13"
+    viewBox="0 0 12 13"
+    fill="none"
+  >
+    <path d="M11.1624 6.94358L0.770043 12.9436L0.770043 0.943573L11.1624 6.94358Z" fill="#A2B1C6"/>
+  </svg>
+</template>
+
+<script>
+
+export default {
+  name: 'RunIcon'
+}
+</script>
--- a/src/components/svg/sort.vue
+++ b/src/components/svg/sort.vue
@@ -0,0 +1,45 @@
+<template>
+  <svg
+    :class="['sort-icon', { horizontal }, { asc }]"
+    width="6"
+    height="12"
+    viewBox="0 0 6 12"
+    fill="none"
+  >
+    <path d="M2.99932 -3.63032e-05C2.75092 -3.63032e-05 2.54932 0.201563 2.54932 0.449964L2.54932 11.55C2.54932 11.7984 2.75092 12 2.99932 12C3.24772 12 3.44932 11.7984 3.44932 11.55L3.44932 0.449964C3.44932 0.201563 3.24772 -3.63032e-05 2.99932 -3.63032e-05Z" fill="#506784"/>
+    <path d="M2.99915 1.80492e-05C2.8839 1.80492e-05 2.76865 0.0438534 2.68109 0.132073L0.581055 2.232C0.405273 2.40789 0.405273 2.69287 0.581055 2.86865C0.756946 3.04443 1.04193 3.04443 1.21771 2.86865L2.99969 1.08667L4.78168 2.86865C4.95746 3.04443 5.24255 3.04443 5.41833 2.86865C5.59412 2.69287 5.59412 2.40789 5.41833 2.232L3.3183 0.132073C3.22953 0.0438534 3.11428 1.80492e-05 2.99915 1.80492e-05V1.80492e-05Z" fill="#506784"/>
+  </svg>
+</template>
+
+<script>
+
+export default {
+  name: 'SortIcon',
+  props: {
+    horizontal: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    asc: {
+      type: Boolean,
+      required: false,
+      default: true
+    }
+  }
+}
+</script>
+
+<style scoped>
+svg.asc {
+  transform: rotate(180deg);
+}
+
+svg.horizontal {
+  transform: rotate(-90deg);
+}
+
+svg.horizontal.asc {
+  transform: rotate(90deg);
+}
+</style>
--- a/src/components/svg/sqlEditor.vue
+++ b/src/components/svg/sqlEditor.vue
@@ -0,0 +1,25 @@
+<template>
+  <svg
+    width="18"
+    height="19"
+    viewBox="0 0 18 19"
+    fill="none"
+  >
+    <g clip-path="url(#clip0)">
+      <path d="M4.5 1.51343H10.5L15 6.01343V8.45284H13.5V6.76343H9.75V3.01343H4.5V8.45284H3V3.01343C3 2.18843 3.675 1.51343 4.5 1.51343Z" fill="#A2B1C6"/>
+      <path d="M4.28369 14.8127C4.28369 14.5872 4.20312 14.4114 4.04199 14.2854C3.88379 14.1594 3.604 14.0291 3.20264 13.8943C2.80127 13.7595 2.47314 13.6292 2.21826 13.5032C1.38916 13.0959 0.974609 12.5364 0.974609 11.8245C0.974609 11.47 1.07715 11.158 1.28223 10.8884C1.49023 10.616 1.7832 10.405 2.16113 10.2556C2.53906 10.1033 2.96387 10.0271 3.43555 10.0271C3.89551 10.0271 4.30713 10.1091 4.67041 10.2732C5.03662 10.4373 5.3208 10.6716 5.52295 10.9763C5.7251 11.2781 5.82617 11.6238 5.82617 12.0134H4.28809C4.28809 11.7527 4.20752 11.5505 4.04639 11.407C3.88818 11.2634 3.67285 11.1917 3.40039 11.1917C3.125 11.1917 2.90674 11.2532 2.74561 11.3762C2.5874 11.4963 2.5083 11.6501 2.5083 11.8376C2.5083 12.0017 2.59619 12.1511 2.77197 12.2859C2.94775 12.4177 3.25684 12.5554 3.69922 12.699C4.1416 12.8396 4.50488 12.9919 4.78906 13.156C5.48047 13.5544 5.82617 14.1038 5.82617 14.804C5.82617 15.3635 5.61523 15.803 5.19336 16.1223C4.77148 16.4417 4.19287 16.6013 3.45752 16.6013C2.93896 16.6013 2.46875 16.509 2.04688 16.3245C1.62793 16.137 1.31152 15.8821 1.09766 15.5598C0.886719 15.2346 0.78125 14.8611 0.78125 14.4392H2.32812C2.32812 14.782 2.41602 15.0354 2.5918 15.1995C2.77051 15.3606 3.05908 15.4412 3.45752 15.4412C3.7124 15.4412 3.91309 15.387 4.05957 15.2786C4.20898 15.1672 4.28369 15.012 4.28369 14.8127ZM12.0444 13.446C12.0444 14.0378 11.9463 14.5549 11.75 14.9973C11.5537 15.4368 11.2827 15.7898 10.937 16.0564L11.9697 16.8738L11.0161 17.6824L9.64062 16.575C9.51172 16.5925 9.38281 16.6013 9.25391 16.6013C8.70898 16.6013 8.22559 16.4753 7.80371 16.2234C7.38184 15.9714 7.05225 15.6111 6.81494 15.1423C6.58057 14.6736 6.45898 14.1345 6.4502 13.5251V13.1868C6.4502 12.5569 6.56445 12.0032 6.79297 11.5256C7.02441 11.0481 7.35254 10.679 7.77734 10.4182C8.20508 10.1575 8.69434 10.0271 9.24512 10.0271C9.78711 10.0271 10.2705 10.156 10.6953 10.4138C11.1201 10.6716 11.4497 11.0393 11.6841 11.5168C11.9214 11.9915 12.0415 12.5364 12.0444 13.1516V13.446ZM10.4756 13.178C10.4756 12.5422 10.3687 12.0603 10.1548 11.7322C9.94385 11.4011 9.64062 11.2356 9.24512 11.2356C8.83789 11.2356 8.53174 11.3982 8.32666 11.7234C8.12158 12.0486 8.01758 12.5247 8.01465 13.1516V13.446C8.01465 14.0759 8.11865 14.5593 8.32666 14.8962C8.53467 15.2302 8.84375 15.3972 9.25391 15.3972C9.64648 15.3972 9.94678 15.2317 10.1548 14.9006C10.3657 14.5696 10.4727 14.0935 10.4756 13.4724V13.178ZM14.3735 15.3269H17.0586V16.5134H12.8311V10.115H14.3735V15.3269Z" fill="#A2B1C6"/>
+    </g>
+    <defs>
+      <clipPath id="clip0">
+        <rect width="18" height="18" fill="white" transform="translate(0 0.0134277)"/>
+      </clipPath>
+    </defs>
+  </svg>
+</template>
+
+<script>
+
+export default {
+  name: 'SqlEditorIcon'
+}
+</script>
--- a/src/components/svg/table.vue
+++ b/src/components/svg/table.vue
@@ -0,0 +1,21 @@
+<template>
+  <svg
+    width="18"
+    height="18"
+    viewBox="0 0 18 18"
+    fill="none"
+  >
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M14.5 2.16512L3.5 2.16999C2.675 2.16999 2 2.84499 2 3.66999V14.3349C2 15.1599 2.675 15.8349 3.5 15.8349L14.5 15.83C15.3327 15.83 16 15.1551 16 14.33V3.66512C16 2.83511 15.33 2.16512 14.5 2.16512ZM14.5014 3.66512L3.49878 3.66999V14.33L14.5014 14.3251V3.66512Z" fill="#A2B1C6"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M6.27319 14.7069L6.27319 3.32135L7.77319 3.32135L7.77319 14.7069L6.27319 14.7069Z" fill="#A2B1C6"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M10.2639 14.6932L10.2639 3.30772L11.7639 3.30772L11.7639 14.6932L10.2639 14.6932Z" fill="#A2B1C6"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M15.5108 7.48325H2.4895V5.98325H15.5108V7.48325Z" fill="#A2B1C6"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M15.5108 11.6056H2.4895V10.1056H15.5108V11.6056Z" fill="#A2B1C6"/>
+  </svg>
+</template>
+
+<script>
+
+export default {
+  name: 'TableIcon'
+}
+</script>
--- a/src/lib/database/_sql.js
+++ b/src/lib/database/_sql.js
@@ -4,6 +4,17 @@ import dbUtils from './_statements'
 let SQL = null
 const sqlModuleReady = initSqlJs().then(sqlModule => { SQL = sqlModule })

+function _getDataSourcesFromSqlResult (sqlResult) {
+  if (!sqlResult) {
+    return {}
+  }
+  const dataSorces = {}
+  sqlResult.columns.forEach((column, index) => {
+    dataSorces[column] = sqlResult.values.map(row => row[index])
+  })
+  return dataSorces
+}
+
 export default class Sql {
  constructor () {
    this.db = null
@@ -36,16 +47,19 @@ export default class Sql {
    if (!sql) {
      throw new Error('exec: Missing query string')
    }
-    return this.db.exec(sql, params)
+    const sqlResults = this.db.exec(sql, params)
+    return sqlResults.map(result => _getDataSourcesFromSqlResult(result))
  }

-  import (tabName, columns, values, progressCounterId, progressCallback, chunkSize = 1500) {
+  import (tabName, data, progressCounterId, progressCallback, chunkSize = 1500) {
    if (this.db === null) {
      this.createDb()
    }
-    this.db.exec(dbUtils.getCreateStatement(tabName, columns, values))
-    const chunks = dbUtils.generateChunks(values, chunkSize)
-    const chunksAmount = Math.ceil(values.length / chunkSize)
+    const columns = Object.keys(data)
+    const rowCount = data[columns[0]].length
+    this.db.exec(dbUtils.getCreateStatement(tabName, data))
+    const chunks = dbUtils.generateChunks(data, chunkSize)
+    const chunksAmount = Math.ceil(rowCount / chunkSize)
    let count = 0
    const insertStr = dbUtils.getInsertStmt(tabName, columns)
    const insertStmt = this.db.prepare(insertStr)
--- a/src/lib/database/_statements.js
+++ b/src/lib/database/_statements.js
@@ -1,13 +1,17 @@
 import sqliteParser from 'sqlite-parser'

 export default {
-  * generateChunks (arr, size) {
-    const count = Math.ceil(arr.length / size)
+  * generateChunks (data, size) {
+    const matrix = Object.keys(data).map(col => data[col])
+    const [row] = matrix
+    const transposedMatrix = row.map((value, column) => matrix.map(row => row[column]))
+
+    const count = Math.ceil(transposedMatrix.length / size)

    for (let i = 0; i <= count - 1; i++) {
      const start = size * i
      const end = start + size
-      yield arr.slice(start, end)
+      yield transposedMatrix.slice(start, end)
    }
  },

@@ -17,11 +21,11 @@ export default {
    return `INSERT INTO "${tabName}" (${colList}) VALUES (${params});`
  },

-  getCreateStatement (tabName, columns, values) {
+  getCreateStatement (tabName, data) {
    let result = `CREATE table "${tabName}"(`
-    columns.forEach((col, index) => {
-    // Get the first row of values to determine types
-      const value = values[0][index]
+    for (const col in data) {
+      // Get the first row of values to determine types
+      const value = data[col][0]
      let type = ''
      switch (typeof value) {
        case 'number': {
@@ -39,7 +43,8 @@ export default {
        default: type = 'TEXT'
      }
      result += `"${col}" ${type}, `
-    })
+    }
+
    result = result.replace(/,\s$/, ');')
    return result
  },
--- a/src/lib/database/_worker.js
+++ b/src/lib/database/_worker.js
@@ -15,8 +15,7 @@ function processMsg (sql) {
    case 'import':
      return sql.import(
        data.tabName,
-        data.columns,
-        data.values,
+        data.data,
        data.progressCounterId,
        postMessage
      )
--- a/src/lib/database/index.js
+++ b/src/lib/database/index.js
@@ -55,8 +55,7 @@ class Database {
  async addTableFromCsv (tabName, data, progressCounterId) {
    const result = await this.pw.postMessage({
      action: 'import',
-      columns: data.columns,
-      values: data.values,
+      data,
      progressCounterId,
      tabName
    })
@@ -89,11 +88,11 @@ class Database {
    const result = await this.execute(getSchemaSql)
    // Parse DDL statements to get column names and types
    const parsedSchema = []
-    if (result && result.values) {
-      result.values.forEach(item => {
+    if (result && result.name) {
+      result.name.forEach((table, index) => {
        parsedSchema.push({
-          name: item[0],
-          columns: stms.getColumns(item[1])
+          name: table,
+          columns: stms.getColumns(result.sql[index])
        })
      })
    }
--- a/src/lib/storedInquiries/_migrations.js
+++ b/src/lib/storedInquiries/_migrations.js
@@ -0,0 +1,12 @@
+export default {
+  _migrate (installedVersion, inquiries) {
+    if (installedVersion === 1) {
+      inquiries.forEach(inquire => {
+        inquire.viewType = 'chart'
+        inquire.viewOptions = inquire.chart
+        delete inquire.chart
+      })
+      return inquiries
+    }
+  }
+}
--- a/src/lib/storedInquiries/index.js
+++ b/src/lib/storedInquiries/index.js
@@ -0,0 +1,120 @@
+import { nanoid } from 'nanoid'
+import fu from '@/lib/utils/fileIo'
+import migration from './_migrations'
+
+const migrate = migration._migrate
+
+export default {
+  version: 2,
+  getStoredInquiries () {
+    let myInquiries = JSON.parse(localStorage.getItem('myInquiries'))
+    if (!myInquiries) {
+      const oldInquiries = localStorage.getItem('myQueries')
+      if (oldInquiries) {
+        myInquiries = migrate(1, JSON.parse(oldInquiries))
+        this.updateStorage(myInquiries)
+        return myInquiries
+      }
+      return []
+    }
+
+    return (myInquiries && myInquiries.inquiries) || []
+  },
+
+  duplicateInquiry (baseInquiry) {
+    const newInquiry = JSON.parse(JSON.stringify(baseInquiry))
+    newInquiry.name = newInquiry.name + ' Copy'
+    newInquiry.id = nanoid()
+    newInquiry.createdAt = new Date()
+    delete newInquiry.isPredefined
+
+    return newInquiry
+  },
+
+  isTabNeedName (inquiryTab) {
+    const isFromScratch = !inquiryTab.initName
+    return inquiryTab.isPredefined || isFromScratch
+  },
+
+  save (inquiryTab, newName) {
+    const value = {
+      id: inquiryTab.isPredefined ? nanoid() : inquiryTab.id,
+      query: inquiryTab.query,
+      viewType: inquiryTab.$refs.dataView.mode,
+      viewOptions: inquiryTab.$refs.dataView.getOptionsForSave(),
+      name: newName || inquiryTab.initName
+    }
+
+    // Get inquiries from local storage
+    const myInquiries = this.getStoredInquiries()
+
+    // Set createdAt
+    if (newName) {
+      value.createdAt = new Date()
+    } else {
+      var inquiryIndex = myInquiries.findIndex(oldInquiry => oldInquiry.id === inquiryTab.id)
+      value.createdAt = myInquiries[inquiryIndex].createdAt
+    }
+
+    // Insert in inquiries list
+    if (newName) {
+      myInquiries.push(value)
+    } else {
+      myInquiries[inquiryIndex] = value
+    }
+
+    // Save to local storage
+    this.updateStorage(myInquiries)
+    return value
+  },
+
+  updateStorage (inquiries) {
+    localStorage.setItem('myInquiries', JSON.stringify({ version: this.version, inquiries }))
+  },
+
+  serialiseInquiries (inquiryList) {
+    const preparedData = JSON.parse(JSON.stringify(inquiryList))
+    preparedData.forEach(inquiry => delete inquiry.isPredefined)
+    return JSON.stringify({ version: this.version, inquiries: preparedData }, null, 4)
+  },
+
+  deserialiseInquiries (str) {
+    const inquiries = JSON.parse(str)
+    let inquiryList = []
+    if (!inquiries.version) {
+      // Turn data into array if they are not
+      inquiryList = !Array.isArray(inquiries) ? [inquiries] : inquiries
+      inquiryList = migrate(1, inquiryList)
+    } else {
+      inquiryList = inquiries.inquiries || []
+    }
+
+    // Generate new ids if they are the same as existing inquiries
+    inquiryList.forEach(inquiry => {
+      const allInquiriesIds = this.getStoredInquiries().map(inquiry => inquiry.id)
+      if (allInquiriesIds.includes(inquiry.id)) {
+        inquiry.id = nanoid()
+      }
+    })
+
+    return inquiryList
+  },
+
+  importInquiries () {
+    return fu.importFile()
+      .then(str => {
+        return this.deserialiseInquiries(str)
+      })
+  },
+
+  async readPredefinedInquiries () {
+    const res = await fu.readFile('./inquiries.json')
+    const data = await res.json()
+
+    if (!data.version) {
+      return data.length > 0 ? migrate(1, data) : []
+    } else {
+      return data.inquiries
+    }
+  }
+}
--- a/src/lib/storedQueries.js
+++ b/src/lib/storedQueries.js
@@ -1,96 +0,0 @@
-import { nanoid } from 'nanoid'
-import fu from '@/lib/utils/fileIo'
-
-export default {
-  getStoredQueries () {
-    return JSON.parse(localStorage.getItem('myQueries')) || []
-  },
-
-  duplicateQuery (baseQuery) {
-    const newQuery = JSON.parse(JSON.stringify(baseQuery))
-    newQuery.name = newQuery.name + ' Copy'
-    newQuery.id = nanoid()
-    newQuery.createdAt = new Date()
-    delete newQuery.isPredefined
-
-    return newQuery
-  },
-
-  isTabNeedName (queryTab) {
-    const isFromScratch = !queryTab.initName
-    return queryTab.isPredefined || isFromScratch
-  },
-
-  save (queryTab, newName) {
-    const value = {
-      id: queryTab.isPredefined ? nanoid() : queryTab.id,
-      query: queryTab.query,
-      chart: queryTab.$refs.chart.getChartStateForSave(),
-      name: newName || queryTab.initName
-    }
-
-    // Get queries from local storage
-    const myQueries = this.getStoredQueries()
-
-    // Set createdAt
-    if (newName) {
-      value.createdAt = new Date()
-    } else {
-      var queryIndex = myQueries.findIndex(oldQuery => oldQuery.id === queryTab.id)
-      value.createdAt = myQueries[queryIndex].createdAt
-    }
-
-    // Insert in queries list
-    if (newName) {
-      myQueries.push(value)
-    } else {
-      myQueries[queryIndex] = value
-    }
-
-    // Save to local storage
-    this.updateStorage(myQueries)
-    return value
-  },
-
-  updateStorage (value) {
-    localStorage.setItem('myQueries', JSON.stringify(value))
-  },
-
-  serialiseQueries (queryList) {
-    const preparedData = JSON.parse(JSON.stringify(queryList))
-    preparedData.forEach(query => delete query.isPredefined)
-    return JSON.stringify(preparedData, null, 4)
-  },
-
-  deserialiseQueries (str) {
-    let queryList = JSON.parse(str)
-    // Turn data into array if they are not
-    if (!Array.isArray(queryList)) {
-      queryList = [queryList]
-    }
-
-    // Generate new ids if they are the same as existing queries
-    queryList.forEach(query => {
-      const allQueriesIds = this.getStoredQueries().map(query => query.id)
-      if (allQueriesIds.includes(query.id)) {
-        query.id = nanoid()
-      }
-    })
-
-    return queryList
-  },
-
-  importQueries () {
-    return fu.importFile()
-      .then(data => {
-        return this.deserialiseQueries(data)
-      })
-  },
-
-  readPredefinedQueries () {
-    return fu.readFile('./queries.json')
-      .then(resp => {
-        return resp.json()
-      })
-  }
-}
--- a/src/lib/utils/fileIo.js
+++ b/src/lib/utils/fileIo.js
@@ -10,11 +10,9 @@ export default {
    return file.name.replace(/\.[^.]+$/, '')
  },

-  exportToFile (str, fileName, type = 'octet/stream') {
+  downloadFromUrl (url, fileName) {
    // Create downloader
    const downloader = document.createElement('a')
-    const blob = new Blob([str], { type })
-    const url = URL.createObjectURL(blob)
    downloader.href = url
    downloader.download = fileName

@@ -25,6 +23,12 @@ export default {
    URL.revokeObjectURL(url)
  },

+  async exportToFile (str, fileName, type = 'octet/stream') {
+    const blob = new Blob([str], { type })
+    const url = URL.createObjectURL(blob)
+    this.downloadFromUrl(url, fileName)
+  },
+
  /**
   * Note: if user press Cancel in file choosing dialog
   * it will be an unsettled promise. But it's grabbed by
--- a/src/main.js
+++ b/src/main.js
@@ -11,6 +11,8 @@ import '@/assets/styles/tables.css'
 import '@/assets/styles/dialogs.css'
 import '@/assets/styles/tooltips.css'
 import '@/assets/styles/messages.css'
+import 'vue-multiselect/dist/vue-multiselect.min.css'
+import '@/assets/styles/multiselect.css'

 if (!['localhost', '127.0.0.1'].includes(location.hostname)) {
  import('./registerServiceWorker') // eslint-disable-line no-unused-expressions
--- a/src/router.js
+++ b/src/router.js
@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import VueRouter from 'vue-router'
-import Editor from '@/views/Main/Editor'
-import MyQueries from '@/views/Main/MyQueries'
+import Workspace from '@/views/Main/Workspace'
+import Inquiries from '@/views/Main/Inquiries'
 import Welcome from '@/views/Welcome'
 import Main from '@/views/Main'
 import store from '@/store'
@@ -21,14 +21,14 @@ const routes = [
    component: Main,
    children: [
      {
-        path: '/editor',
-        name: 'Editor',
-        component: Editor
+        path: '/workspace',
+        name: 'Workspace',
+        component: Workspace
      },
      {
-        path: '/my-queries',
-        name: 'MyQueries',
-        component: MyQueries
+        path: '/inquiries',
+        name: 'Inquiries',
+        component: Inquiries
      }
    ]
  }
--- a/src/store/actions.js
+++ b/src/store/actions.js
@@ -5,16 +5,18 @@ export default {
    const tab = data ? JSON.parse(JSON.stringify(data)) : {}
    // If no data then create a new blank one...
    // No data.id means to create new tab, but not blank,
-    // e.g. with 'select * from csv_import' query after csv import
+    // e.g. with 'select * from csv_import' inquiry after csv import
    if (!data || !data.id) {
      tab.id = nanoid()
      tab.name = null
      tab.tempName = state.untitledLastIndex
        ? `Untitled ${state.untitledLastIndex}`
        : 'Untitled'
-      tab.isUnsaved = true
+      tab.viewType = 'chart'
+      tab.viewOptions = undefined
+      tab.isSaved = false
    } else {
-      tab.isUnsaved = false
+      tab.isSaved = true
    }

    // add new tab only if was not already opened
--- a/src/store/mutations.js
+++ b/src/store/mutations.js
@@ -8,7 +8,7 @@ export default {
    state.db = db
  },

-  updateTab (state, { index, name, id, query, chart, isUnsaved }) {
+  updateTab (state, { index, name, id, query, viewType, viewOptions, isSaved }) {
    const tab = state.tabs[index]
    const oldId = tab.id

@@ -19,15 +19,17 @@ export default {
    if (id) { tab.id = id }
    if (name) { tab.name = name }
    if (query) { tab.query = query }
-    if (chart) { tab.chart = chart }
-    if (isUnsaved !== undefined) { tab.isUnsaved = isUnsaved }
-    if (!isUnsaved) {
-      // Saved query is not predefined
+    if (viewType) { tab.viewType = viewType }
+    if (viewOptions) { tab.viewOptions = viewOptions }
+    if (isSaved !== undefined) { tab.isSaved = isSaved }
+    if (isSaved) {
+      // Saved inquiry is not predefined
      delete tab.isPredefined
    }

    Vue.set(state.tabs, index, tab)
  },
+
  deleteTab (state, index) {
    // If closing tab is the current opened
    if (state.tabs[index].id === state.currentTabId) {
@@ -49,11 +51,7 @@ export default {
  setCurrentTab (state, tab) {
    state.currentTab = tab
  },
-  updatePredefinedQueries (state, queries) {
-    if (Array.isArray(queries)) {
-      state.predefinedQueries = queries
-    } else {
-      state.predefinedQueries = [queries]
-    }
+  updatePredefinedInquiries (state, inquiries) {
+    state.predefinedInquiries = Array.isArray(inquiries) ? inquiries : [inquiries]
  }
 }
--- a/src/store/state.js
+++ b/src/store/state.js
@@ -3,6 +3,6 @@ export default {
  currentTab: null,
  currentTabId: null,
  untitledLastIndex: 0,
-  predefinedQueries: [],
+  predefinedInquiries: [],
  db: null
 }
--- a/src/tooltipMixin.js
+++ b/src/tooltipMixin.js
@@ -6,10 +6,28 @@ export default {
      }
    }
  },
+  computed: {
+    tooltipElement () {
+      return this.$refs.tooltip
+    }
+  },
  methods: {
-    showTooltip (e) {
-      this.tooltipStyle.top = e.clientY - 12 + 'px'
-      this.tooltipStyle.left = e.clientX + 12 + 'px'
+    showTooltip (e, tooltipPosition) {
+      const position = tooltipPosition ? tooltipPosition.split('-') : ['top', 'right']
+      const offset = 12
+
+      if (position[0] === 'top') {
+        this.tooltipStyle.top = e.clientY - offset + 'px'
+      } else {
+        this.tooltipStyle.top = e.clientY + offset + 'px'
+      }
+
+      if (position[1] === 'right') {
+        this.tooltipStyle.left = e.clientX + offset + 'px'
+      } else {
+        this.tooltipStyle.left = e.clientX - offset - this.tooltipElement.offsetWidth + 'px'
+      }
+
      this.tooltipStyle.visibility = 'visible'
    },
    hideTooltip () {
--- a/src/views/Main/AppDiagnosticInfo.vue
+++ b/src/views/Main/AppDiagnosticInfo.vue
@@ -47,13 +47,13 @@ export default {
    let result = await state.db.execute('select sqlite_version()')
    this.info.push({
      name: 'SQLite version',
-      info: result.values[0]
+      info: result['sqlite_version()']
    })

    result = await state.db.execute('PRAGMA compile_options')
    this.info.push({
      name: 'SQLite compile options',
-      info: result.values.map(row => row[0])
+      info: result.compile_options
    })
  }
 }
--- a/src/views/Main/Editor/Tabs/Tab/Chart/index.vue
+++ b/src/views/Main/Editor/Tabs/Tab/Chart/index.vue
@@ -1,98 +0,0 @@
-<template>
-<div v-show="visible" class="chart-container">
-  <div class="warning chart-warning" v-show="!sqlResult && visible">
-    There is no data to build a chart. Run your sql query and make sure the result is not empty.
-  </div>
-  <PlotlyEditor
-    :data="state.data"
-    :layout="state.layout"
-    :frames="state.frames"
-    :config="{ editable: true, displaylogo: false }"
-    :dataSources="dataSources"
-    :dataSourceOptions="dataSourceOptions"
-    :plotly="plotly"
-    @onUpdate="update"
-    @onRender="go"
-    :useResizeHandler="true"
-    :debug="true"
-    :advancedTraceTypeSelector="true"
-    class="chart"
-    ref="plotlyEditor"
-    :style="{ height: !sqlResult ? 'calc(100% - 40px)' : '100%' }"
-  />
-</div>
-</template>
-
-<script>
-import plotly from 'plotly.js/dist/plotly'
-import 'react-chart-editor/lib/react-chart-editor.min.css'
-
-import PlotlyEditor from 'react-chart-editor'
-import chartHelper from './chartHelper'
-import dereference from 'react-chart-editor/lib/lib/dereference'
-
-export default {
-  name: 'Chart',
-  props: ['sqlResult', 'initChart', 'visible'],
-  components: {
-    PlotlyEditor
-  },
-  data () {
-    return {
-      plotly: plotly,
-      state: this.initChart || {
-        data: [],
-        layout: {},
-        frames: []
-      }
-    }
-  },
-  computed: {
-    dataSources () {
-      return chartHelper.getDataSourcesFromSqlResult(this.sqlResult)
-    },
-    dataSourceOptions () {
-      return chartHelper.getOptionsFromDataSources(this.dataSources)
-    }
-  },
-  watch: {
-    dataSources () {
-      // we need to update state.data in order to update the graph
-      // https://github.com/plotly/react-chart-editor/issues/948
-      dereference(this.state.data, this.dataSources)
-    }
-  },
-  methods: {
-    go (data, layout, frames) {
-      // TODO: check changes and enable Save button if needed
-    },
-    update (data, layout, frames) {
-      this.state = { data, layout, frames }
-      this.$emit('update')
-    },
-    getChartStateForSave () {
-      return chartHelper.getChartStateForSave(this.state, this.dataSources)
-    }
-  }
-}
-</script>
-
-<style scoped>
-.chart-container {
-  height: calc(100% - 89px);
-}
-
-.chart-warning {
-  height: 40px;
-  line-height: 40px;
-}
-
-.chart {
-  border-top: 1px solid var(--color-border);
-  min-height: 242px;
-}
-
->>> .editor_controls .sidebar__item:before {
-  width: 0;
-}
-</style>
--- a/src/views/Main/Editor/Tabs/Tab/ViewSwitcher.vue
+++ b/src/views/Main/Editor/Tabs/Tab/ViewSwitcher.vue
@@ -1,67 +0,0 @@
-<template>
-  <div class="view-switcher">
-    <div
-      :class="['table-mode', {'active-mode': view === 'table'}]"
-      @click="$emit('update:view','table')"
-    >
-      Table
-    </div>
-    <div
-      :class="['chart-mode', {'active-mode': view === 'chart'}]"
-      @click="$emit('update:view','chart')"
-    >
-      Chart
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'ViewSwitcher',
-  props: ['view']
-}
-</script>
-
-<style scoped>
-.view-switcher {
-  height: 28px;
-  display: flex;
-  padding: 30px;
-  justify-content: center;
-}
-.view-switcher div {
-  height: 100%;
-  width: 136px;
-  box-sizing: border-box;
-  line-height: 28px;
-  font-size: 12px;
-  cursor: pointer;
-  background: var(--color-white);
-  border: 1px solid var(--color-border);
-  color: var(--color-text-base);
-  text-align: center;
-  font-weight: 400;
-}
-.view-switcher div:hover {
-  background-color: var(--color-bg-light);
-  color: var(--color-text-active);
-}
-.view-switcher div.active-mode {
-  background: var(--color-accent);
-  border: 1px solid var(--color-accent-shade);
-  color: var(--color-text-light);
-  text-shadow: var(--shadow);
-  z-index: 1;
-  font-weight: 600;
-}
-.view-switcher div.active-mode:hover {
-  background: var(--color-accent-shade);
-}
-.table-mode {
-  border-radius: var(--border-radius-medium) 0 0 var(--border-radius-medium);
-}
-.chart-mode {
-  margin-left: -1px;
-  border-radius: 0 var(--border-radius-medium) var(--border-radius-medium) 0;
-}
-</style>
--- a/src/views/Main/Editor/Tabs/Tab/index.vue
+++ b/src/views/Main/Editor/Tabs/Tab/index.vue
@@ -1,225 +0,0 @@
-<template>
-  <div class="tab-content-container" v-show="isActive">
-    <splitpanes
-      class="query-results-splitter"
-      horizontal
-      :before="{ size: 50, max: 100 }"
-      :after="{ size: 50, max: 100 }"
-    >
-      <template #left-pane>
-        <div class="query-editor">
-          <sql-editor ref="sqlEditor" v-model="query" />
-        </div>
-      </template>
-      <template #right-pane>
-        <div id="bottomPane" ref="bottomPane">
-          <view-switcher :view.sync="view" />
-          <div v-show="view === 'table'" class="table-view">
-            <div
-              v-show="result === null && !isGettingResults && !error"
-              class="table-preview result-before"
-            >
-              Run your query and get results here
-            </div>
-            <div v-if="isGettingResults" class="table-preview result-in-progress">
-              <loading-indicator :size="30"/>
-              Fetching results...
-            </div>
-            <div
-              v-show="result === undefined && !isGettingResults && !error"
-              class="table-preview result-empty"
-            >
-              No rows retrieved according to your query
-            </div>
-            <logs v-if="error" :messages="[error]"/>
-            <sql-table v-if="result" :data-set="result" :time="time" :height="tableViewHeight" />
-          </div>
-          <chart
-            :visible="view === 'chart'"
-            :sql-result="result"
-            :init-chart="initChart"
-            ref="chart"
-            @update="$store.commit('updateTab', { index: tabIndex, isUnsaved: true })"
-          />
-        </div>
-      </template>
-    </splitpanes>
-  </div>
-</template>
-
-<script>
-import SqlTable from '@/components/SqlTable'
-import Splitpanes from '@/components/Splitpanes'
-import LoadingIndicator from '@/components/LoadingIndicator'
-import SqlEditor from './SqlEditor'
-import ViewSwitcher from './ViewSwitcher'
-import Chart from './Chart'
-import Logs from '@/components/Logs'
-import time from '@/lib/utils/time'
-
-export default {
-  name: 'Tab',
-  props: ['id', 'initName', 'initQuery', 'initChart', 'tabIndex', 'isPredefined'],
-  components: {
-    SqlEditor,
-    SqlTable,
-    Splitpanes,
-    ViewSwitcher,
-    Chart,
-    LoadingIndicator,
-    Logs
-  },
-  data () {
-    return {
-      query: this.initQuery,
-      result: null,
-      view: 'table',
-      tableViewHeight: 0,
-      isGettingResults: false,
-      error: null,
-      resizeObserver: null,
-      time: 0
-    }
-  },
-  computed: {
-    isActive () {
-      return this.id === this.$store.state.currentTabId
-    }
-  },
-  mounted () {
-    this.resizeObserver = new ResizeObserver(this.handleResize)
-    this.resizeObserver.observe(this.$refs.bottomPane)
-    this.calculateTableHeight()
-  },
-  beforeDestroy () {
-    this.resizeObserver.unobserve(this.$refs.bottomPane)
-  },
-  watch: {
-    isActive: {
-      immediate: true,
-      async handler () {
-        if (this.isActive) {
-          this.$store.commit('setCurrentTab', this)
-          await this.$nextTick()
-          this.$refs.sqlEditor.focus()
-        }
-      }
-    },
-    query () {
-      this.$store.commit('updateTab', { index: this.tabIndex, isUnsaved: true })
-    }
-  },
-  methods: {
-    // Run a command in the database
-    async execute () {
-      this.isGettingResults = true
-      this.result = null
-      this.error = null
-      const state = this.$store.state
-      try {
-        const start = new Date()
-        this.result = await state.db.execute(this.query + ';')
-        this.time = time.getPeriod(start, new Date())
-      } catch (err) {
-        this.error = {
-          type: 'error',
-          message: err
-        }
-      }
-      state.db.refreshSchema()
-      this.isGettingResults = false
-    },
-    handleResize () {
-      if (this.view === 'chart') {
-        // hack react-chart editor: hidden and show in order to make the graph resize
-        this.view = 'not chart'
-        this.$nextTick(() => {
-          this.view = 'chart'
-        })
-      }
-      this.calculateTableHeight()
-    },
-    calculateTableHeight () {
-      const bottomPane = this.$refs.bottomPane
-      // 88 - view swittcher height
-      // 34 - table footer width
-      // 12 - desirable space after the table
-      // 5 - padding-bottom of rounded table container
-      // 35 - height of table header
-      const freeSpace = bottomPane.offsetHeight - 88 - 34 - 12 - 5 - 35
-      this.tableViewHeight = freeSpace - (freeSpace % 35)
-    }
-  }
-}
-</script>
-
-<style scoped>
-.tab-content-container {
-  background-color: var(--color-white);
-  border-top: 1px solid var(--color-border-light);
-  margin-top: -1px;
-}
-
-#bottomPane {
-  height: 100%;
-  background-color: var(--color-bg-light);
-}
-
-.query-results-splitter {
-  height: calc(100vh - 104px);
-  background-color: var(--color-bg-light);
-}
-
-.query-editor {
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-  max-height: 100%;
-  box-sizing: border-box;
-  min-height: 190px;
-}
-
-.table-view {
-  margin: 0 52px;
-  height: calc(100% - 88px);
-  position: relative;
-}
-
-.table-preview {
-  position: absolute;
-  top: 40%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  color: var(--color-text-base);
-  font-size: 13px;
-}
-
-.result-in-progress {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  will-change: opacity;
-  /*
-    We need to show loader in 1 sec after starting query execution. We can't do that with
-    setTimeout because the main thread can be busy by getting a result set from the web worker.
-    But we can use CSS animation for opacity. Opacity triggers changes only in the Composite Layer
-    stage in rendering waterfall. Hence it can be processed only with Compositor Thread while
-    the Main Thread processes a result set.
-    https://www.viget.com/articles/animation-performance-101-browser-under-the-hood/
-  */
-  animation: show-loader 1s linear 0s 1;
-}
-
-@keyframes show-loader {
-  0% {
-    opacity: 0;
-  }
-  99% {
-    opacity: 0;
-  }
-  100% {
-    opacity: 1;
-  }
-}
-</style>
--- a/src/views/Main/Inquiries/index.vue
+++ b/src/views/Main/Inquiries/index.vue
@@ -1,22 +1,22 @@
 <template>
  <div>
-    <div id="start-guide" v-if="showedQueries.length === 0">
-      You don't have saved queries so far.
-      <span class="link" @click="$root.$emit('createNewQuery')">Create</span>
+    <div id="start-guide" v-if="showedInquiries.length === 0">
+      You don't have saved inquiries so far.
+      <span class="link" @click="$root.$emit('createNewInquiry')">Create</span>
      the one from scratch or
-      <span @click="importQueries" class="link">import</span> from a file.
+      <span @click="importInquiries" class="link">import</span> from a file.
    </div>
-    <div id="my-queries-content" ref="my-queries-content" v-show="showedQueries.length > 0">
-      <div id="my-queries-toolbar">
+    <div id="my-inquiries-content" ref="my-inquiries-content" v-show="showedInquiries.length > 0">
+      <div id="my-inquiries-toolbar">
        <div id="toolbar-buttons">
-          <button id="toolbar-btns-import" class="toolbar" @click="importQueries">
+          <button id="toolbar-btns-import" class="toolbar" @click="importInquiries">
            Import
          </button>
          <button
            id="toolbar-btns-export"
            class="toolbar"
-            v-show="selectedQueriesCount > 0"
-            @click="exportSelectedQueries()"
+            v-show="selectedInquiriesCount > 0"
+            @click="exportSelectedInquiries()"
          >
            Export
          </button>
@@ -24,13 +24,13 @@
            id="toolbar-btns-delete"
            class="toolbar"
            v-show="selectedNotPredefinedCount > 0"
-            @click="showDeleteDialog(selectedQueriesIds)"
+            @click="showDeleteDialog(selectedInquiriesIds)"
          >
            Delete
          </button>
        </div>
        <div id="toolbar-search">
-          <text-field placeholder="Search query by name" width="300px" v-model="filter"/>
+          <text-field placeholder="Search inquiry by name" width="300px" v-model="filter"/>
        </div>
      </div>
      <div class="rounded-bg">
@@ -46,48 +46,49 @@
        </div>
      </div>
      <div class="table-container" :style="{ 'max-height': `${maxTableHeight}px` }">
-        <table ref="table">
+        <table ref="table" class="sqliteviz-table">
          <tbody>
            <tr
-              v-for="(query, index) in showedQueries"
-              :key="query.id"
-              @click="openQuery(index)"
+              v-for="(inquiry, index) in showedInquiries"
+              :key="inquiry.id"
+              @click="openInquiry(index)"
            >
              <td ref="name-td">
                 <div class="cell-data">
                    <check-box
                      ref="rowCheckBox"
-                      :init="selectAll || selectedQueriesIds.has(query.id)"
-                      @click="toggleRow($event, query.id)"
+                      :init="selectAll || selectedInquiriesIds.has(inquiry.id)"
+                      @click="toggleRow($event, inquiry.id)"
                    />
-                    <div class="name">{{ query.name }}</div>
+                    <div class="name">{{ inquiry.name }}</div>
                    <div
-                      v-if="query.isPredefined"
+                      v-if="inquiry.isPredefined"
                      class="badge"
-                      @mouseover="showTooltip"
-                      @mouseout="hideTooltip"
+                      @mouseenter="showTooltip"
+                      @mouseleave="hideTooltip"
                    >
                      Predefined
-                      <span class="icon-tooltip" :style="tooltipStyle">
-                        Predefined queries come from the server.
-                        These queries can’t be deleted or renamed.
+                      <span class="icon-tooltip" :style="tooltipStyle" ref="tooltip">
+                        Predefined inquiries come from the server.
+                        These inquiries can’t be deleted or renamed.
                      </span>
                    </div>
                 </div>
              </td>
              <td>
                <div class="second-column">
-                  <div class="date-container">{{ query.createdAt | date }}</div>
+                  <div class="date-container">{{ inquiry.createdAt | date }}</div>
                  <div class="icons-container">
-                    <rename-icon v-if="!query.isPredefined" @click="showRenameDialog(query.id)" />
-                    <copy-icon @click="duplicateQuery(index)"/>
+                    <rename-icon v-if="!inquiry.isPredefined" @click="showRenameDialog(inquiry.id)" />
+                    <copy-icon @click="duplicateInquiry(index)"/>
                    <export-icon
-                      @click="exportToFile([query], `${query.name}.json`)"
-                      tooltip="Export query to file"
+                      @click="exportToFile([inquiry], `${inquiry.name}.json`)"
+                      tooltip="Export inquiry to file"
+                      tooltip-position="top-left"
                    />
                    <delete-icon
-                      v-if="!query.isPredefined"
-                      @click="showDeleteDialog((new Set()).add(query.id))"
+                      v-if="!inquiry.isPredefined"
+                      @click="showDeleteDialog((new Set()).add(inquiry.id))"
                    />
                  </div>
                </div>
@@ -99,15 +100,15 @@
    </div>
  </div>

-  <!--Rename Query dialog  -->
+  <!--Rename Inquiry dialog  -->
  <modal name="rename" classes="dialog" height="auto">
    <div class="dialog-header">
-      Rename query
+      Rename inquiry
      <close-icon @click="$modal.hide('rename')"/>
    </div>
    <div class="dialog-body">
      <text-field
-        label="New query name"
+        label="New inquiry name"
        :error-msg="errorMsg"
        v-model="newName"
        width="100%"
@@ -115,26 +116,26 @@
    </div>
    <div class="dialog-buttons-container">
      <button class="secondary" @click="$modal.hide('rename')">Cancel</button>
-      <button class="primary" @click="renameQuery">Rename</button>
+      <button class="primary" @click="renameInquiry">Rename</button>
    </div>
  </modal>

-  <!--Delete Query dialog  -->
+  <!--Delete Inquiry dialog  -->
  <modal name="delete" classes="dialog" height="auto">
    <div class="dialog-header">
-      Delete {{ deleteGroup ? 'queries' : 'query' }}
+      Delete {{ deleteGroup ? 'inquiries' : 'inquiry' }}
      <close-icon @click="$modal.hide('delete')"/>
    </div>
    <div class="dialog-body">
      {{ deleteDialogMsg }}
-      <div v-show="selectedQueriesCount > selectedNotPredefinedCount" id="note">
+      <div v-show="selectedInquiriesCount > selectedNotPredefinedCount" id="note">
        <img :src="require('@/assets/images/info.svg')">
-        Note: Predefined queries you've selected won't be deleted
+        Note: Predefined inquiries you've selected won't be deleted
      </div>
    </div>
    <div class="dialog-buttons-container">
      <button class="secondary" @click="$modal.hide('delete')">Cancel</button>
-      <button class="primary" @click="deleteQuery">Delete</button>
+      <button class="primary" @click="deleteInquiry">Delete</button>
    </div>
  </modal>
 </div>
@@ -149,11 +150,11 @@ import CloseIcon from '@/components/svg/close'
 import TextField from '@/components/TextField'
 import CheckBox from '@/components/CheckBox'
 import tooltipMixin from '@/tooltipMixin'
-import storedQueries from '@/lib/storedQueries'
+import storedInquiries from '@/lib/storedInquiries'
 import fu from '@/lib/utils/fileIo'

 export default {
-  name: 'MyQueries',
+  name: 'Inquiries',
  components: {
    RenameIcon,
    CopyIcon,
@@ -166,13 +167,13 @@ export default {
  mixins: [tooltipMixin],
  data () {
    return {
-      queries: [],
+      inquiries: [],
      filter: null,
      newName: null,
-      processedQueryId: null,
+      processedInquiryId: null,
      errorMsg: null,
-      selectedQueriesIds: new Set(),
-      selectedQueriesCount: 0,
+      selectedInquiriesIds: new Set(),
+      selectedInquiriesCount: 0,
      selectedNotPredefinedCount: 0,
      selectAll: false,
      deleteGroup: false,
@@ -181,61 +182,61 @@ export default {
    }
  },
  computed: {
-    predefinedQueries () {
-      return this.$store.state.predefinedQueries.map(query => {
-        query.isPredefined = true
-        return query
+    predefinedInquiries () {
+      return this.$store.state.predefinedInquiries.map(inquiry => {
+        inquiry.isPredefined = true
+        return inquiry
      })
    },
-    predefinedQueriesIds () {
-      return new Set(this.predefinedQueries.map(query => query.id))
+    predefinedInquiriesIds () {
+      return new Set(this.predefinedInquiries.map(inquiry => inquiry.id))
    },
-    showedQueries () {
-      let showedQueries = this.allQueries
+    showedInquiries () {
+      let showedInquiries = this.allInquiries
      if (this.filter) {
-        showedQueries = showedQueries.filter(
-          query => query.name.toUpperCase().indexOf(this.filter.toUpperCase()) >= 0
+        showedInquiries = showedInquiries.filter(
+          inquiry => inquiry.name.toUpperCase().indexOf(this.filter.toUpperCase()) >= 0
        )
      }
-      return showedQueries
+      return showedInquiries
    },
-    allQueries () {
-      return this.predefinedQueries.concat(this.queries)
+    allInquiries () {
+      return this.predefinedInquiries.concat(this.inquiries)
    },
-    processedQueryIndex () {
-      return this.queries.findIndex(query => query.id === this.processedQueryId)
+    processedInquiryIndex () {
+      return this.inquiries.findIndex(inquiry => inquiry.id === this.processedInquiryId)
    },
    deleteDialogMsg () {
      if (!this.deleteGroup && (
-        this.processedQueryIndex === null ||
-          this.processedQueryIndex < 0 ||
-          this.processedQueryIndex > this.queries.length
+        this.processedInquiryIndex === null ||
+          this.processedInquiryIndex < 0 ||
+          this.processedInquiryIndex > this.inquiries.length
      )) {
        return ''
      }

      const deleteItem = this.deleteGroup
        ? `${this.selectedNotPredefinedCount} ${this.selectedNotPredefinedCount > 1
-          ? 'queries'
-          : 'query'}`
-        : `"${this.queries[this.processedQueryIndex].name}"`
+          ? 'inquiries'
+          : 'inquiry'}`
+        : `"${this.inquiries[this.processedInquiryIndex].name}"`

      return `Are you sure you want to delete ${deleteItem}?`
    }
  },
  created () {
-    storedQueries.readPredefinedQueries()
-      .then(queries => {
-        this.$store.commit('updatePredefinedQueries', queries)
+    storedInquiries.readPredefinedInquiries()
+      .then(inquiries => {
+        this.$store.commit('updatePredefinedInquiries', inquiries)
      })
      .catch(console.error)
      .finally(() => {
-        this.queries = storedQueries.getStoredQueries()
+        this.inquiries = storedInquiries.getStoredInquiries()
      })
  },
  mounted () {
    this.resizeObserver = new ResizeObserver(this.calcMaxTableHeight)
-    this.resizeObserver.observe(this.$refs['my-queries-content'])
+    this.resizeObserver.observe(this.$refs['my-inquiries-content'])

    this.tableResizeObserver = new ResizeObserver(this.calcNameWidth)
    this.tableResizeObserver.observe(this.$refs.table)
@@ -243,7 +244,7 @@ export default {
    this.calcMaxTableHeight()
  },
  beforeDestroy () {
-    this.resizeObserver.unobserve(this.$refs['my-queries-content'])
+    this.resizeObserver.unobserve(this.$refs['my-inquiries-content'])
    this.tableResizeObserver.unobserve(this.$refs.table)
  },
  filters: {
@@ -269,153 +270,153 @@ export default {
      this.$refs['name-th'].style = `width: ${nameWidth}px`
    },
    calcMaxTableHeight () {
-      const freeSpace = this.$refs['my-queries-content'].offsetHeight - 200
+      const freeSpace = this.$refs['my-inquiries-content'].offsetHeight - 200
      this.maxTableHeight = freeSpace - (freeSpace % 40) + 1
    },
-    openQuery (index) {
-      const tab = this.showedQueries[index]
+    openInquiry (index) {
+      const tab = this.showedInquiries[index]
      this.$store.dispatch('addTab', tab).then(id => {
        this.$store.commit('setCurrentTabId', id)
-        this.$router.push('/editor')
+        this.$router.push('/workspace')
      })
    },
    showRenameDialog (id) {
      this.errorMsg = null
-      this.processedQueryId = id
-      this.newName = this.queries[this.processedQueryIndex].name
+      this.processedInquiryId = id
+      this.newName = this.inquiries[this.processedInquiryIndex].name
      this.$modal.show('rename')
    },
-    renameQuery () {
+    renameInquiry () {
      if (!this.newName) {
-        this.errorMsg = 'Query name can\'t be empty'
+        this.errorMsg = "Inquiry name can't be empty"
        return
      }
-      const processedQuery = this.queries[this.processedQueryIndex]
-      processedQuery.name = this.newName
-      this.$set(this.queries, this.processedQueryIndex, processedQuery)
+      const processedInquiry = this.inquiries[this.processedInquiryIndex]
+      processedInquiry.name = this.newName
+      this.$set(this.inquiries, this.processedInquiryIndex, processedInquiry)

-      // update queries in local storage
-      storedQueries.updateStorage(this.queries)
+      // update inquiries in local storage
+      storedInquiries.updateStorage(this.inquiries)

-      // update tab, if renamed query is opened
-      const tabIndex = this.findTabIndex(processedQuery.id)
+      // update tab, if renamed inquiry is opened
+      const tabIndex = this.findTabIndex(processedInquiry.id)
      if (tabIndex >= 0) {
        this.$store.commit('updateTab', {
          index: tabIndex,
          name: this.newName,
-          id: processedQuery.id
+          id: processedInquiry.id
        })
      }
      // hide dialog
      this.$modal.hide('rename')
    },
-    duplicateQuery (index) {
-      const newQuery = storedQueries.duplicateQuery(this.showedQueries[index])
+    duplicateInquiry (index) {
+      const newInquiry = storedInquiries.duplicateInquiry(this.showedInquiries[index])
      if (this.selectAll) {
-        this.selectedQueriesIds.add(newQuery.id)
-        this.selectedQueriesCount = this.selectedQueriesIds.size
+        this.selectedInquiriesIds.add(newInquiry.id)
+        this.selectedInquiriesCount = this.selectedInquiriesIds.size
      }
-      this.queries.push(newQuery)
-      storedQueries.updateStorage(this.queries)
+      this.inquiries.push(newInquiry)
+      storedInquiries.updateStorage(this.inquiries)
    },
    showDeleteDialog (idsSet) {
      this.deleteGroup = idsSet.size > 1
      if (!this.deleteGroup) {
-        this.processedQueryId = idsSet.values().next().value
+        this.processedInquiryId = idsSet.values().next().value
      }
      this.$modal.show('delete')
    },
-    deleteQuery () {
+    deleteInquiry () {
      this.$modal.hide('delete')
      if (!this.deleteGroup) {
-        this.queries.splice(this.processedQueryIndex, 1)
+        this.inquiries.splice(this.processedInquiryIndex, 1)

-        // Close deleted query tab if it was opened
-        const tabIndex = this.findTabIndex(this.processedQueryId)
+        // Close deleted inquiry tab if it was opened
+        const tabIndex = this.findTabIndex(this.processedInquiryId)
        if (tabIndex >= 0) {
          this.$store.commit('deleteTab', tabIndex)
        }

        // Clear checkboxes
-        if (this.selectedQueriesIds.has(this.processedQueryId)) {
-          this.selectedQueriesIds.delete(this.processedQueryId)
+        if (this.selectedInquiriesIds.has(this.processedInquiryId)) {
+          this.selectedInquiriesIds.delete(this.processedInquiryId)
        }
      } else {
-        this.queries = this.selectAll
+        this.inquiries = this.selectAll
          ? []
-          : this.queries.filter(query => !this.selectedQueriesIds.has(query.id))
+          : this.inquiries.filter(inquiry => !this.selectedInquiriesIds.has(inquiry.id))

-        // Close deleted queries if it was opened
+        // Close deleted inquiries if it was opened
        const tabs = this.$store.state.tabs
        for (let i = tabs.length - 1; i >= 0; i--) {
-          if (this.selectedQueriesIds.has(tabs[i].id)) {
+          if (this.selectedInquiriesIds.has(tabs[i].id)) {
            this.$store.commit('deleteTab', i)
          }
        }

        // Clear checkboxes
-        this.selectedQueriesIds.clear()
+        this.selectedInquiriesIds.clear()
      }
-      this.selectedQueriesCount = this.selectedQueriesIds.size
-      storedQueries.updateStorage(this.queries)
+      this.selectedInquiriesCount = this.selectedInquiriesIds.size
+      storedInquiries.updateStorage(this.inquiries)
    },
    findTabIndex (id) {
      return this.$store.state.tabs.findIndex(tab => tab.id === id)
    },
-    exportToFile (queryList, fileName) {
-      const jsonStr = storedQueries.serialiseQueries(queryList)
+    exportToFile (inquiryList, fileName) {
+      const jsonStr = storedInquiries.serialiseInquiries(inquiryList)
      fu.exportToFile(jsonStr, fileName)
    },
-    exportSelectedQueries () {
-      const queryList = this.selectAll
-        ? this.allQueries
-        : this.allQueries.filter(query => this.selectedQueriesIds.has(query.id))
+    exportSelectedInquiries () {
+      const inquiryList = this.selectAll
+        ? this.allInquiries
+        : this.allInquiries.filter(inquiry => this.selectedInquiriesIds.has(inquiry.id))

-      this.exportToFile(queryList, 'My sqliteviz queries.json')
+      this.exportToFile(inquiryList, 'My sqliteviz inquiries.json')
    },
-    importQueries () {
-      storedQueries.importQueries()
-        .then(importedQueries => {
+    importInquiries () {
+      storedInquiries.importInquiries()
+        .then(importedInquiries => {
          if (this.selectAll) {
-            importedQueries.forEach(query => {
-              this.selectedQueriesIds.add(query.id)
+            importedInquiries.forEach(inquiry => {
+              this.selectedInquiriesIds.add(inquiry.id)
            })
-            this.selectedQueriesCount = this.selectedQueriesIds.size
+            this.selectedInquiriesCount = this.selectedInquiriesIds.size
          }

-          this.queries = this.queries.concat(importedQueries)
-          storedQueries.updateStorage(this.queries)
+          this.inquiries = this.inquiries.concat(importedInquiries)
+          storedInquiries.updateStorage(this.inquiries)
        })
    },
    toggleSelectAll (checked) {
      this.selectAll = checked
      this.$refs.rowCheckBox.forEach(item => { item.checked = checked })

-      this.selectedQueriesIds = checked
-        ? new Set(this.allQueries.map(query => query.id))
+      this.selectedInquiriesIds = checked
+        ? new Set(this.allInquiries.map(inquiry => inquiry.id))
        : new Set()

-      this.selectedQueriesCount = this.selectedQueriesIds.size
-      this.selectedNotPredefinedCount = checked ? this.queries.length : 0
+      this.selectedInquiriesCount = this.selectedInquiriesIds.size
+      this.selectedNotPredefinedCount = checked ? this.inquiries.length : 0
    },
    toggleRow (checked, id) {
-      const isPredefined = this.predefinedQueriesIds.has(id)
+      const isPredefined = this.predefinedInquiriesIds.has(id)
      if (checked) {
-        this.selectedQueriesIds.add(id)
+        this.selectedInquiriesIds.add(id)
        if (!isPredefined) {
          this.selectedNotPredefinedCount += 1
        }
      } else {
-        if (this.selectedQueriesIds.size === this.allQueries.length) {
+        if (this.selectedInquiriesIds.size === this.allInquiries.length) {
          this.$refs.mainCheckBox.checked = false
          this.selectAll = false
        }
-        this.selectedQueriesIds.delete(id)
+        this.selectedInquiriesIds.delete(id)
        if (!isPredefined) {
          this.selectedNotPredefinedCount -= 1
        }
      }
-      this.selectedQueriesCount = this.selectedQueriesIds.size
+      this.selectedInquiriesCount = this.selectedInquiriesIds.size
    }
  }
 }
@@ -432,13 +433,13 @@ export default {
  text-align: center;
 }

-#my-queries-content {
+#my-inquiries-content {
  padding: 52px;
  height: 100%;
  box-sizing: border-box;
 }

-#my-queries-toolbar {
+#my-inquiries-toolbar {
  display: flex;
  justify-content: space-between;
  margin-bottom: 18px;
@@ -465,47 +466,47 @@ export default {
  margin-left: 24px;
 }

-table {
+table.sqliteviz-table {
  margin-top: 0;
 }

-tbody tr td {
+.sqliteviz-table tbody tr td {
  min-width: 0;
  height: 40px;
 }

-tbody tr td:first-child {
+.sqliteviz-table tbody tr td:first-child {
  width: 70%;
  max-width: 0;
  padding: 0 12px;
 }
-tbody tr td:last-child {
+.sqliteviz-table tbody tr td:last-child {
  width: 30%;
  max-width: 0;
  padding: 0 24px;
 }

-tbody .cell-data {
+.sqliteviz-table tbody .cell-data {
  display: flex;
  align-items: center;
  max-width: 100%;
  width: 100%;
 }
-tbody .cell-data div.name {
+.sqliteviz-table tbody .cell-data div.name {
  overflow: hidden;
  text-overflow: ellipsis;
  margin-left: 24px;
 }

-tbody tr:hover td {
+.sqliteviz-table tbody tr:hover td {
  cursor: pointer;
 }

-tbody tr:hover td {
+.sqliteviz-table tbody tr:hover td {
  color: var(--color-text-active);
 }

-.second-column {
+.sqliteviz-table .second-column {
  display: flex;
  justify-content: space-between;
  align-items: center;
@@ -523,7 +524,7 @@ tbody tr:hover td {
  overflow: hidden;
  text-overflow: ellipsis;
 }
-tbody tr:hover .icons-container {
+.sqliteviz-table tbody tr:hover .icons-container {
  display: flex;
 }
 .dialog input {
@@ -545,7 +546,7 @@ button.toolbar {
  margin-left: 12px;
 }

-tbody tr:hover .badge {
+.sqliteviz-table tbody tr:hover .badge {
  display: block;
 }
 #note {
--- a/src/views/Main/Inquiries/svg/copy.vue
+++ b/src/views/Main/Inquiries/svg/copy.vue
@@ -6,18 +6,17 @@
      height="18"
      viewBox="0 0 18 18"
      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-      @click.stop="$emit('click')"
-      @mouseover="showTooltip"
-      @mouseout="hideTooltip"
+      @click.stop="onClick"
+      @mouseenter="showTooltip"
+      @mouseleave="hideTooltip"
    >
      <path
        d="M14.25 15.75H6V5.25H14.25V15.75ZM14.25 3.75H6C5.60218 3.75 5.22064 3.90804 4.93934 4.18934C4.65804 4.47064 4.5 4.85218 4.5 5.25V15.75C4.5 16.1478 4.65804 16.5294 4.93934 16.8107C5.22064 17.092 5.60218 17.25 6 17.25H14.25C14.6478 17.25 15.0294 17.092 15.3107 16.8107C15.592 16.5294 15.75 16.1478 15.75 15.75V5.25C15.75 4.85218 15.592 4.47064 15.3107 4.18934C15.0294 3.90804 14.6478 3.75 14.25 3.75ZM12 0.75H3C2.60218 0.75 2.22064 0.908035 1.93934 1.18934C1.65804 1.47064 1.5 1.85218 1.5 2.25V12.75H3V2.25H12V0.75Z"
        fill="#A2B1C6"
      />
    </svg>
-    <span class="icon-tooltip" :style="tooltipStyle">
-      Duplicate query
+    <span class="icon-tooltip" :style="tooltipStyle" ref="tooltip">
+      Duplicate inquiry
    </span>
  </span>
 </template>
@@ -27,7 +26,13 @@ import tooltipMixin from '@/tooltipMixin'

 export default {
  name: 'CopyIcon',
-  mixins: [tooltipMixin]
+  mixins: [tooltipMixin],
+  methods: {
+    onClick () {
+      this.hideTooltip()
+      this.$emit('click')
+    }
+  }
 }
 </script>

--- a/src/views/Main/Inquiries/svg/delete.vue
+++ b/src/views/Main/Inquiries/svg/delete.vue
@@ -6,18 +6,17 @@
      height="18"
      viewBox="0 0 18 18"
      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-      @click.stop="$emit('click')"
-      @mouseover="showTooltip"
-      @mouseout="hideTooltip"
+      @click.stop="onClick"
+      @mouseenter="showTooltip($event, 'top-left')"
+      @mouseleave="hideTooltip"
    >
      <path
        d="M6.75 2.25V3H3V4.5H3.75V14.25C3.75 14.6478 3.90804 15.0294 4.18934 15.3107C4.47064 15.592 4.85218 15.75 5.25 15.75H12.75C13.1478 15.75 13.5294 15.592 13.8107 15.3107C14.092 15.0294 14.25 14.6478 14.25 14.25V4.5H15V3H11.25V2.25H6.75ZM5.25 4.5H12.75V14.25H5.25V4.5ZM6.75 6V12.75H8.25V6H6.75ZM9.75 6V12.75H11.25V6H9.75Z"
        fill="#A2B1C6"
      />
    </svg>
-    <span class="icon-tooltip" :style="tooltipStyle">
-      Delete query
+    <span class="icon-tooltip" :style="tooltipStyle" ref="tooltip">
+      Delete inquiry
    </span>
  </span>
 </template>
@@ -27,7 +26,13 @@ import tooltipMixin from '@/tooltipMixin'

 export default {
  name: 'DeleteIcon',
-  mixins: [tooltipMixin]
+  mixins: [tooltipMixin],
+  methods: {
+    onClick () {
+      this.hideTooltip()
+      this.$emit('click')
+    }
+  }
 }
 </script>

--- a/src/views/Main/Inquiries/svg/rename.vue
+++ b/src/views/Main/Inquiries/svg/rename.vue
@@ -6,18 +6,17 @@
      height="18"
      viewBox="0 0 18 18"
      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-      @click.stop="$emit('click')"
-      @mouseover="showTooltip"
-      @mouseout="hideTooltip"
+      @click.stop="onClick"
+      @mouseenter="showTooltip"
+      @mouseleave="hideTooltip"
    >
      <path
        d="M10.545 6.75L11.25 7.455L4.44 14.25H3.75V13.56L10.545 6.75ZM13.245 2.25C13.0575 2.25 12.8625 2.325 12.72 2.4675L11.3475 3.84L14.16 6.6525L15.5325 5.28C15.825 4.9875 15.825 4.5 15.5325 4.2225L13.7775 2.4675C13.6275 2.3175 13.44 2.25 13.245 2.25ZM10.545 4.6425L2.25 12.9375V15.75H5.0625L13.3575 7.455L10.545 4.6425Z"
        fill="#A2B1C6"
      />
    </svg>
-    <span class="icon-tooltip" :style="tooltipStyle">
-      Rename query
+    <span class="icon-tooltip" :style="tooltipStyle" ref="tooltip">
+      Rename inquiry
    </span>
  </span>
 </template>
@@ -27,7 +26,13 @@ import tooltipMixin from '@/tooltipMixin'

 export default {
  name: 'RenameIcon',
-  mixins: [tooltipMixin]
+  mixins: [tooltipMixin],
+  methods: {
+    onClick () {
+      this.hideTooltip()
+      this.$emit('click')
+    }
+  }
 }
 </script>

--- a/src/views/Main/MainMenu.vue
+++ b/src/views/Main/MainMenu.vue
@@ -1,53 +1,44 @@
 <template>
  <nav>
    <div>
-      <router-link to="/editor">Editor</router-link>
-      <router-link to="/my-queries">My queries</router-link>
+      <router-link to="/workspace">Workspace</router-link>
+      <router-link to="/inquiries">Inquiries</router-link>
      <a href="https://github.com/lana-k/sqliteviz/wiki" target="_blank">Help</a>
    </div>
    <div id="nav-buttons">
-      <button
-        id="run-btn"
-        v-if="currentQuery && $route.path === '/editor'"
-        class="primary"
-        :disabled="runDisabled"
-        @click="currentQuery.execute"
-      >
-        Run
-      </button>
      <button
        id="save-btn"
-        v-show="currentQuery && $route.path === '/editor'"
+        v-show="currentInquiry && $route.path === '/workspace'"
        class="primary"
-        :disabled="!isUnsaved"
-        @click="checkQueryBeforeSave"
+        :disabled="isSaved"
+        @click="checkInquiryBeforeSave"
      >
        Save
      </button>
      <button
        id="create-btn"
        class="primary"
-        @click="createNewQuery"
+        @click="createNewInquiry"
      >
        Create
      </button>
      <app-diagnostic-info />
    </div>

-    <!--Save Query dialog  -->
+    <!--Save Inquiry dialog  -->
    <modal name="save" classes="dialog" height="auto">
      <div class="dialog-header">
-        Save query
+        Save inquiry
        <close-icon @click="cancelSave"/>
      </div>
      <div class="dialog-body">
        <div v-show="isPredefined" id="save-note">
          <img :src="require('@/assets/images/info.svg')">
-          Note: Predefined queries can't be edited.
-          That's why your modifications will be saved as a new query. Enter the name for it.
+          Note: Predefined inquiries can't be edited.
+          That's why your modifications will be saved as a new inquiry. Enter the name for it.
        </div>
        <text-field
-          label="Query name"
+          label="Inquiry name"
          :error-msg="errorMsg"
          v-model="name"
          width="100%"
@@ -55,7 +46,7 @@
      </div>
      <div class="dialog-buttons-container">
        <button class="secondary" @click="cancelSave">Cancel</button>
-        <button class="primary" @click="saveQuery">Save</button>
+        <button class="primary" @click="saveInquiry">Save</button>
      </div>
    </modal>
  </nav>
@@ -64,7 +55,7 @@
 <script>
 import TextField from '@/components/TextField'
 import CloseIcon from '@/components/svg/close'
-import storedQueries from '@/lib/storedQueries'
+import storedInquiries from '@/lib/storedInquiries'
 import AppDiagnosticInfo from './AppDiagnosticInfo'

 export default {
@@ -81,121 +72,122 @@ export default {
    }
  },
  computed: {
-    currentQuery () {
+    currentInquiry () {
      return this.$store.state.currentTab
    },
-    isUnsaved () {
-      if (!this.currentQuery) {
+    isSaved () {
+      if (!this.currentInquiry) {
        return false
      }
-      const tabIndex = this.currentQuery.tabIndex
+      const tabIndex = this.currentInquiry.tabIndex
      const tab = this.$store.state.tabs[tabIndex]
-      return tab && tab.isUnsaved
+      return tab && tab.isSaved
    },
    isPredefined () {
-      if (this.currentQuery) {
-        return this.currentQuery.isPredefined
+      if (this.currentInquiry) {
+        return this.currentInquiry.isPredefined
      } else {
        return false
      }
    },
    runDisabled () {
-      return this.currentQuery && (!this.$store.state.db || !this.currentQuery.query)
+      return this.currentInquiry && (!this.$store.state.db || !this.currentInquiry.query)
    }
  },
  created () {
-    this.$root.$on('createNewQuery', this.createNewQuery)
-    this.$root.$on('saveQuery', this.checkQueryBeforeSave)
+    this.$root.$on('createNewInquiry', this.createNewInquiry)
+    this.$root.$on('saveInquiry', this.checkInquiryBeforeSave)
    document.addEventListener('keydown', this._keyListener)
  },
  beforeDestroy () {
    document.removeEventListener('keydown', this._keyListener)
  },
  methods: {
-    createNewQuery () {
+    createNewInquiry () {
      this.$store.dispatch('addTab').then(id => {
        this.$store.commit('setCurrentTabId', id)
-        if (this.$route.path !== '/editor') {
-          this.$router.push('/editor')
+        if (this.$route.path !== '/workspace') {
+          this.$router.push('/workspace')
        }
      })
    },
    cancelSave () {
      this.$modal.hide('save')
-      this.$root.$off('querySaved')
+      this.$root.$off('inquirySaved')
    },
-    checkQueryBeforeSave () {
+    checkInquiryBeforeSave () {
      this.errorMsg = null
      this.name = ''

-      if (storedQueries.isTabNeedName(this.currentQuery)) {
+      if (storedInquiries.isTabNeedName(this.currentInquiry)) {
        this.$modal.show('save')
      } else {
-        this.saveQuery()
+        this.saveInquiry()
      }
    },
-    saveQuery () {
-      const isNeedName = storedQueries.isTabNeedName(this.currentQuery)
+    saveInquiry () {
+      const isNeedName = storedInquiries.isTabNeedName(this.currentInquiry)
      if (isNeedName && !this.name) {
-        this.errorMsg = 'Query name can\'t be empty'
+        this.errorMsg = 'Inquiry name can\'t be empty'
        return
      }
-      const dataSet = this.currentQuery.result
-      const tabView = this.currentQuery.view
+      const dataSet = this.currentInquiry.result
+      const tabView = this.currentInquiry.view

-      // Save query
-      const value = storedQueries.save(this.currentQuery, this.name)
+      // Save inquiry
+      const value = storedInquiries.save(this.currentInquiry, this.name)

      // Update tab in store
      this.$store.commit('updateTab', {
-        index: this.currentQuery.tabIndex,
+        index: this.currentInquiry.tabIndex,
        name: value.name,
        id: value.id,
        query: value.query,
-        chart: value.chart,
-        isUnsaved: false
+        viewType: value.viewType,
+        viewOptions: value.viewOptions,
+        isSaved: true
      })

      // Restore data:
-      // e.g. if we save predefined query the tab will be created again
+      // e.g. if we save predefined inquiry the tab will be created again
      // (because of new id) and
      // it will be without sql result and has default view - table.
      // That's why we need to restore data and view
      this.$nextTick(() => {
-        this.currentQuery.result = dataSet
-        this.currentQuery.view = tabView
+        this.currentInquiry.result = dataSet
+        this.currentInquiry.view = tabView
      })

      // Hide dialog
      this.$modal.hide('save')

      // Signal about saving
-      this.$root.$emit('querySaved')
+      this.$root.$emit('inquirySaved')
    },
    _keyListener (e) {
-      if (this.$route.path === '/editor') {
+      if (this.$route.path === '/workspace') {
        // Run query Ctrl+R or Ctrl+Enter
        if ((e.key === 'r' || e.key === 'Enter') && (e.ctrlKey || e.metaKey)) {
          e.preventDefault()
          if (!this.runDisabled) {
-            this.currentQuery.execute()
+            this.currentInquiry.execute()
          }
          return
        }

-        // Save query Ctrl+S
+        // Save inquiry Ctrl+S
        if (e.key === 's' && (e.ctrlKey || e.metaKey)) {
          e.preventDefault()
-          if (this.isUnsaved) {
-            this.checkQueryBeforeSave()
+          if (!this.isSaved) {
+            this.checkInquiryBeforeSave()
          }
          return
        }
      }
-      // New (blank) query Ctrl+B
+      // New (blank) inquiry Ctrl+B
      if (e.key === 'b' && (e.ctrlKey || e.metaKey)) {
        e.preventDefault()
-        this.createNewQuery()
+        this.createNewInquiry()
      }
    }
  }
--- a/src/views/Main/Workspace/Schema/TableDescription.vue
+++ b/src/views/Main/Workspace/Schema/TableDescription.vue
--- a/src/views/Main/Workspace/Schema/index.vue
+++ b/src/views/Main/Workspace/Schema/index.vue
--- a/src/views/Main/Workspace/Tabs/Tab/DataView/Chart/chartHelper.js
+++ b/src/views/Main/Workspace/Tabs/Tab/DataView/Chart/chartHelper.js
@@ -1,27 +1,17 @@
 import dereference from 'react-chart-editor/lib/lib/dereference'

-export function getDataSourcesFromSqlResult (sqlResult) {
-  if (!sqlResult) {
-    return {}
-  }
-  const dataSorces = {}
-  const matrix = sqlResult.values
-  const [row] = matrix
-  const transposedMatrix = row.map((value, column) => matrix.map(row => row[column]))
-  sqlResult.columns.forEach((column, index) => {
-    dataSorces[column] = transposedMatrix[index]
-  })
-  return dataSorces
-}
-
 export function getOptionsFromDataSources (dataSources) {
+  if (!dataSources) {
+    return []
+  }
+
  return Object.keys(dataSources).map(name => ({
    value: name,
    label: name
  }))
 }

-export function getChartStateForSave (state, dataSources) {
+export function getOptionsForSave (state, dataSources) {
  // we don't need to save the data, only settings
  // so we modify state.data using dereference
  const stateCopy = JSON.parse(JSON.stringify(state))
@@ -34,7 +24,6 @@ export function getChartStateForSave (state, dataSources) {
 }

 export default {
-  getDataSourcesFromSqlResult,
  getOptionsFromDataSources,
-  getChartStateForSave
+  getOptionsForSave
 }
--- a/src/views/Main/Workspace/Tabs/Tab/DataView/Chart/index.vue
+++ b/src/views/Main/Workspace/Tabs/Tab/DataView/Chart/index.vue
@@ -0,0 +1,118 @@
+<template>
+  <div v-show="visible" class="chart-container" ref="chartContainer">
+    <div class="warning chart-warning" v-show="!dataSources && visible">
+      There is no data to build a chart. Run your SQL query and make sure the result is not empty.
+    </div>
+    <PlotlyEditor
+      :data="state.data"
+      :layout="state.layout"
+      :frames="state.frames"
+      :config="{ editable: true, displaylogo: false, modeBarButtonsToRemove: ['toImage'] }"
+      :dataSources="dataSources"
+      :dataSourceOptions="dataSourceOptions"
+      :plotly="plotly"
+      @onUpdate="update"
+      @onRender="onRender"
+      :useResizeHandler="true"
+      :debug="true"
+      :advancedTraceTypeSelector="true"
+      class="chart"
+      ref="plotlyEditor"
+      :style="{ height: !dataSources ? 'calc(100% - 40px)' : '100%' }"
+    />
+</div>
+</template>
+
+<script>
+import plotly from 'plotly.js'
+import 'react-chart-editor/lib/react-chart-editor.min.css'
+
+import PlotlyEditor from 'react-chart-editor'
+import chartHelper from './chartHelper'
+import dereference from 'react-chart-editor/lib/lib/dereference'
+import fIo from '@/lib/utils/fileIo'
+
+export default {
+  name: 'Chart',
+  props: ['dataSources', 'initOptions', 'importToPngEnabled'],
+  components: {
+    PlotlyEditor
+  },
+  data () {
+    return {
+      plotly: plotly,
+      state: this.initOptions || {
+        data: [],
+        layout: {},
+        frames: []
+      },
+      visible: true,
+      resizeObserver: null
+    }
+  },
+  computed: {
+    dataSourceOptions () {
+      return chartHelper.getOptionsFromDataSources(this.dataSources)
+    }
+  },
+  mounted () {
+    this.resizeObserver = new ResizeObserver(this.handleResize)
+    this.resizeObserver.observe(this.$refs.chartContainer)
+  },
+  beforeDestroy () {
+    this.resizeObserver.unobserve(this.$refs.chartContainer)
+  },
+  watch: {
+    dataSources () {
+      // we need to update state.data in order to update the graph
+      // https://github.com/plotly/react-chart-editor/issues/948
+      dereference(this.state.data, this.dataSources)
+    }
+  },
+  methods: {
+    handleResize () {
+      this.visible = false
+      this.$nextTick(() => {
+        this.visible = true
+      })
+    },
+    onRender (data, layout, frames) {
+      // TODO: check changes and enable Save button if needed
+    },
+    update (data, layout, frames) {
+      this.state = { data, layout, frames }
+      this.$emit('update')
+    },
+    getOptionsForSave () {
+      return chartHelper.getOptionsForSave(this.state, this.dataSources)
+    },
+    async saveAsPng () {
+      const chartElement = this.$refs.plotlyEditor.$el.querySelector('.js-plotly-plot')
+      const url = await plotly.toImage(chartElement, { format: 'png', width: null, height: null })
+      this.$emit('loadingImageCompleted')
+      fIo.downloadFromUrl(url, 'chart')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.chart-container {
+  height: 100%;
+}
+
+.chart-warning {
+  height: 40px;
+  line-height: 40px;
+  border-bottom: 1px solid var(--color-border);
+  box-sizing: border-box;
+}
+
+.chart {
+  min-height: 242px;
+}
+
+>>> .editor_controls .sidebar__item:before {
+  width: 0;
+}
+</style>
--- a/src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotSortBtn.vue
+++ b/src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotSortBtn.vue
@@ -0,0 +1,71 @@
+<template>
+  <div :class="['pivot-sort-btn', direction] " @click="changeSorting">
+  {{ value.includes('key') ? 'key' : 'value' }}
+  <sort-icon
+    class="sort-icon"
+    :horizontal="direction === 'col'"
+    :asc="value.includes('a_to_z')"
+  />
+  </div>
+</template>
+
+<script>
+import SortIcon from '@/components/svg/sort'
+
+export default {
+  name: 'PivotSortBtn',
+  props: ['direction', 'value'],
+  components: {
+    SortIcon
+  },
+  methods: {
+    changeSorting () {
+      if (this.value === 'key_a_to_z') {
+        this.$emit('input', 'value_a_to_z')
+      } else if (this.value === 'value_a_to_z') {
+        this.$emit('input', 'value_z_to_a')
+      } else {
+        this.$emit('input', 'key_a_to_z')
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.pivot-sort-btn {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 43px;
+  height: 27px;
+  background-color: var(--color-bg-light-4);
+  border-radius: var(--border-radius-medium-2);
+  border: 1px solid var(--color-border);
+  cursor: pointer;
+  font-size: 11px;
+  color: var(--color-text-base);
+  line-height: 8px;
+  box-sizing: border-box;
+}
+.pivot-sort-btn:hover {
+  color: var(--color-text-active);
+  border-color: var(--color-border-dark);
+}
+.pivot-sort-btn:hover >>> .sort-icon path {
+  fill: var(--color-text-active);
+}
+
+.pivot-sort-btn.col {
+  flex-direction: column;
+  padding-top: 5px;
+}
+
+.pivot-sort-btn.row {
+  flex-direction: row;
+}
+
+.pivot-sort-btn.row .sort-icon {
+  margin-left: 2px;
+}
+</style>
--- a/src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/index.vue
+++ b/src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/index.vue
@@ -0,0 +1,302 @@
+<template>
+  <div class="pivot-ui">
+    <div :class="{collapsed}">
+      <div class="row">
+        <label>Columns</label>
+        <multiselect
+          class="sqliteviz-select cols"
+          v-model="cols"
+          :options="colsToSelect"
+          :disabled="colsToSelect.length === 0"
+          :multiple="true"
+          :hideSelected="true"
+          :close-on-select="true"
+          :show-labels="false"
+          :max="colsToSelect.length"
+          open-direction="bottom"
+          placeholder=""
+        >
+          <template slot="maxElements">
+            <span class="no-results">No Results</span>
+          </template>
+
+          <template slot="placeholder">Choose columns</template>
+
+          <template slot="noResult">
+            <span class="no-results">No Results</span>
+          </template>
+        </multiselect>
+        <pivot-sort-btn class="sort-btn" direction="col" v-model="colOrder" />
+      </div>
+
+      <div class="row">
+        <label>Rows</label>
+        <multiselect
+          class="sqliteviz-select rows"
+          v-model="rows"
+          :options="rowsToSelect"
+          :disabled="rowsToSelect.length === 0"
+          :multiple="true"
+          :hideSelected="true"
+          :close-on-select="true"
+          :show-labels="false"
+          :max="rowsToSelect.length"
+          :option-height="29"
+          open-direction="bottom"
+          placeholder=""
+        >
+          <template slot="maxElements">
+            <span class="no-results">No Results</span>
+          </template>
+
+          <template slot="placeholder">Choose rows</template>
+
+          <template slot="noResult">
+            <span class="no-results">No Results</span>
+          </template>
+        </multiselect>
+        <pivot-sort-btn class="sort-btn" direction="row" v-model="rowOrder" />
+      </div>
+
+      <div class="row aggregator">
+        <label>Aggregator</label>
+        <multiselect
+          class="sqliteviz-select short aggregator"
+          v-model="aggregator"
+          :options="aggregators"
+          label="name"
+          track-by="name"
+          :close-on-select="true"
+          :show-labels="false"
+          :hideSelected="true"
+          :option-height="29"
+          open-direction="bottom"
+          placeholder="Choose a function"
+        >
+          <template slot="noResult">
+            <span class="no-results">No Results</span>
+          </template>
+        </multiselect>
+
+        <multiselect
+          class="sqliteviz-select aggr-arg"
+          v-show="valCount > 0"
+          v-model="val1"
+          :options="keyNames"
+          :disabled="keyNames.length === 0"
+          :close-on-select="true"
+          :show-labels="false"
+          :hideSelected="true"
+          :option-height="29"
+          open-direction="bottom"
+          placeholder="Choose an argument"
+        />
+
+        <multiselect
+          class="sqliteviz-select aggr-arg"
+          v-show="valCount > 1"
+          v-model="val2"
+          :options="keyNames"
+          :disabled="keyNames.length === 0"
+          :close-on-select="true"
+          :show-labels="false"
+          :hideSelected="true"
+          :option-height="29"
+          open-direction="bottom"
+          placeholder="Choose a second argument"
+        />
+      </div>
+
+      <div class="row">
+        <label>View</label>
+        <multiselect
+          class="sqliteviz-select short renderer"
+          v-model="renderer"
+          :options="renderers"
+          label="name"
+          track-by="name"
+          :close-on-select="true"
+          :allow-empty="false"
+          :show-labels="false"
+          :hideSelected="true"
+          :option-height="29"
+          open-direction="bottom"
+          placeholder="Choose a view"
+        >
+          <template slot="noResult">
+            <span class="no-results">No Results</span>
+          </template>
+        </multiselect>
+      </div>
+    </div>
+    <span @click="collapsed = !collapsed" class="switcher">
+      {{ collapsed ? 'Show pivot settings' : 'Hide pivot settings' }}
+    </span>
+  </div>
+</template>
+
+<script>
+import $ from 'jquery'
+import Multiselect from 'vue-multiselect'
+import PivotSortBtn from './PivotSortBtn'
+import { renderers, aggregators, zeroValAggregators, twoValAggregators } from './pivotHelper'
+import Chart from '@/views/Main/Workspace/Tabs/Tab/DataView/Chart'
+import Vue from 'vue'
+const ChartClass = Vue.extend(Chart)
+
+export default {
+  name: 'pivotUi',
+  props: ['keyNames', 'value'],
+  components: {
+    Multiselect,
+    PivotSortBtn
+  },
+  data () {
+    const aggregatorName = (this.value && this.value.aggregatorName) || 'Count'
+    const rendererName = (this.value && this.value.rendererName) || 'Table'
+    return {
+      collapsed: false,
+      renderer: { name: rendererName, fun: $.pivotUtilities.renderers[rendererName] },
+      aggregator: { name: aggregatorName, fun: $.pivotUtilities.aggregators[aggregatorName] },
+      rows: (this.value && this.value.rows) || [],
+      cols: (this.value && this.value.cols) || [],
+      val1: (this.value && this.value.vals && this.value.vals[0]) || '',
+      val2: (this.value && this.value.vals && this.value.vals[1]) || '',
+      colOrder: (this.value && this.value.colOrder) || 'key_a_to_z',
+      rowOrder: (this.value && this.value.rowOrder) || 'key_a_to_z',
+      customChartComponent:
+        (this.value && this.value.rendererOptions && this.value.rendererOptions.customChartComponent) ||
+        new ChartClass()
+    }
+  },
+  computed: {
+    valCount () {
+      if (zeroValAggregators.includes(this.aggregator.name)) {
+        return 0
+      }
+
+      if (twoValAggregators.includes(this.aggregator.name)) {
+        return 2
+      }
+
+      return 1
+    },
+    renderers () {
+      return renderers
+    },
+    aggregators () {
+      return aggregators
+    },
+    rowsToSelect () {
+      return this.keyNames.filter(key => !this.cols.includes(key))
+    },
+    colsToSelect () {
+      return this.keyNames.filter(key => !this.rows.includes(key))
+    }
+  },
+  watch: {
+    renderer () {
+      this.returnValue()
+    },
+    aggregator () {
+      this.returnValue()
+    },
+    rows () {
+      this.returnValue()
+    },
+    cols () {
+      this.returnValue()
+    },
+    val1 () {
+      this.returnValue()
+    },
+    val2 () {
+      this.returnValue()
+    },
+    colOrder () {
+      this.returnValue()
+    },
+    rowOrder () {
+      this.returnValue()
+    }
+  },
+  created () {
+    this.customChartComponent.$on('update', () => { this.$emit('update') })
+    this.customChartComponent.$on('loadingImageCompleted', value => { this.$emit('loadingCustomChartImageCompleted') })
+  },
+  methods: {
+    returnValue () {
+      const vals = []
+      for (let i = 1; i <= this.valCount; i++) {
+        vals.push(this[`val${i}`])
+      }
+      this.$emit('update')
+      this.$emit('input', {
+        rows: this.rows,
+        cols: this.cols,
+        colOrder: this.colOrder,
+        rowOrder: this.rowOrder,
+        aggregator: this.aggregator.fun(vals),
+        aggregatorName: this.aggregator.name,
+        renderer: this.renderer.fun,
+        rendererName: this.renderer.name,
+        rendererOptions: this.renderer.name !== 'Custom chart' ? undefined : {
+          customChartComponent: this.customChartComponent
+        },
+        vals
+      })
+    }
+  }
+}
+</script>
+<style scoped>
+.pivot-ui {
+  padding: 12px 24px;
+  color: var(--color-text-base);
+  font-size: 12px;
+  border-bottom: 1px solid var(--color-border-light);
+  background-color: var(--color-bg-light);
+}
+
+.pivot-ui .row {
+  display: flex;
+  align-items: center;
+  margin: 12px 0;
+}
+
+.pivot-ui .row label {
+  width: 76px;
+  flex-shrink: 0;
+}
+
+.pivot-ui .row .sqliteviz-select.short {
+  width: 220px;
+  flex-shrink: 0;
+}
+
+.pivot-ui .row .aggr-arg {
+  margin-left: 12px;
+  max-width: 220px;
+}
+
+.pivot-ui .row .sort-btn {
+  margin-left: 12px;
+  flex-shrink: 0;
+}
+.collapsed {
+  display: none;
+}
+
+.switcher {
+  display: block;
+  width: min-content;
+  white-space: nowrap;
+  margin: auto;
+  cursor: pointer;
+
+}
+
+.switcher:hover {
+  color: var(--color-accent);
+}
+</style>
--- a/src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/pivotHelper.js
+++ b/src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/pivotHelper.js
@@ -0,0 +1,77 @@
+import $ from 'jquery'
+import 'pivottable'
+import 'pivottable/dist/export_renderers.js'
+import 'pivottable/dist/plotly_renderers.js'
+
+export const zeroValAggregators = [
+  'Count',
+  'Count as Fraction of Total',
+  'Count as Fraction of Rows',
+  'Count as Fraction of Columns'
+]
+
+export const twoValAggregators = [
+  'Sum over Sum',
+  '80% Upper Bound',
+  '80% Lower Bound'
+]
+
+export function _getDataSources (pivotData) {
+  const rowKeys = pivotData.getRowKeys()
+  const colKeys = pivotData.getColKeys()
+
+  const dataSources = {
+    'Column keys': colKeys.map(colKey => colKey.join('-')),
+    'Row keys': rowKeys.map(rowKey => rowKey.join('-'))
+  }
+
+  const dataSourcesByRows = {}
+  const dataSourcesByCols = {}
+
+  const rowAttrs = pivotData.rowAttrs.join('-')
+  const colAttrs = pivotData.colAttrs.join('-')
+
+  colKeys.forEach(colKey => {
+    const sourceColKey = colAttrs + ':' + colKey.join('-')
+    dataSourcesByCols[sourceColKey] = []
+    rowKeys.forEach(rowKey => {
+      const value = pivotData.getAggregator(rowKey, colKey).value()
+      dataSourcesByCols[sourceColKey].push(value)
+      const sourceRowKey = rowAttrs + ':' + rowKey.join('-')
+      if (!dataSourcesByRows[sourceRowKey]) {
+        dataSourcesByRows[sourceRowKey] = []
+      }
+      dataSourcesByRows[sourceRowKey].push(value)
+    })
+  })
+
+  return Object.assign(dataSources, dataSourcesByCols, dataSourcesByRows)
+}
+
+function customChartRenderer (data, options) {
+  options.customChartComponent.dataSources = _getDataSources(data)
+  options.customChartComponent.$mount()
+
+  return $(options.customChartComponent.$el)
+}
+
+$.extend(
+  $.pivotUtilities.renderers,
+  $.pivotUtilities.export_renderers,
+  $.pivotUtilities.plotly_renderers,
+  { 'Custom chart': customChartRenderer }
+)
+
+export const renderers = Object.keys($.pivotUtilities.renderers).map(key => {
+  return {
+    name: key,
+    fun: $.pivotUtilities.renderers[key]
+  }
+})
+
+export const aggregators = Object.keys($.pivotUtilities.aggregators).map(key => {
+  return {
+    name: key,
+    fun: $.pivotUtilities.aggregators[key]
+  }
+})
--- a/src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/index.vue
+++ b/src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/index.vue
@@ -0,0 +1,228 @@
+<template>
+<div class="pivot-container">
+  <div class="warning pivot-warning" v-show="!dataSources">
+    There is no data to build a pivot. Run your SQL query and make sure the result is not empty.
+  </div>
+  <pivot-ui
+    :key-names="columns"
+    v-model="pivotOptions"
+    @update="$emit('update')"
+    @loadingCustomChartImageCompleted="$emit('loadingImageCompleted')"
+  />
+  <div ref="pivotOutput" class="pivot-output"/>
+</div>
+</template>
+
+<script>
+import html2canvas from 'html2canvas'
+import plotly from 'plotly.js'
+import fIo from '@/lib/utils/fileIo'
+import $ from 'jquery'
+import 'pivottable'
+import 'pivottable/dist/pivot.css'
+import PivotUi from './PivotUi'
+import Chart from '@/views/Main/Workspace/Tabs/Tab/DataView/Chart'
+import Vue from 'vue'
+const ChartClass = Vue.extend(Chart)
+
+export default {
+  name: 'pivot',
+  props: ['dataSources', 'initOptions', 'importToPngEnabled'],
+  components: {
+    PivotUi
+  },
+  data () {
+    return {
+      resizeObserver: null,
+      pivotOptions: !this.initOptions
+        ? {
+          rows: [],
+          cols: [],
+          colOrder: 'key_a_to_z',
+          rowOrder: 'key_a_to_z',
+          aggregatorName: 'Count',
+          aggregator: $.pivotUtilities.aggregators.Count(),
+          vals: [],
+          rendererName: 'Table',
+          renderer: $.pivotUtilities.renderers.Table,
+          rendererOptions: undefined
+        }
+        : {
+          rows: this.initOptions.rows,
+          cols: this.initOptions.cols,
+          colOrder: this.initOptions.colOrder,
+          rowOrder: this.initOptions.rowOrder,
+          aggregatorName: this.initOptions.aggregatorName,
+          aggregator: $.pivotUtilities.aggregators[this.initOptions.aggregatorName](this.initOptions.vals),
+          vals: this.initOptions.vals,
+          rendererName: this.initOptions.rendererName,
+          renderer: $.pivotUtilities.renderers[this.initOptions.rendererName],
+          rendererOptions: !this.initOptions.rendererOptions ? undefined : {
+            customChartComponent: new ChartClass({
+              propsData: { initOptions: this.initOptions.rendererOptions.customChartOptions }
+            })
+          }
+        }
+    }
+  },
+  computed: {
+    columns () {
+      return Object.keys(this.dataSources || {})
+    }
+  },
+  watch: {
+    dataSources () {
+      this.show()
+    },
+    'pivotOptions.rendererName': {
+      immediate: true,
+      handler () {
+        this.$emit('update:importToPngEnabled', this.pivotOptions.rendererName !== 'TSV Export')
+      }
+    },
+    pivotOptions () {
+      this.show()
+    }
+  },
+  mounted () {
+    this.show()
+    // We need to detect resizing because plotly doesn't resize when resixe its container
+    // but it resize on window.resize (we will trigger it manualy in order to make plotly resize)
+    this.resizeObserver = new ResizeObserver(this.handleResize)
+    this.resizeObserver.observe(this.$refs.pivotOutput)
+  },
+  beforeDestroy () {
+    this.resizeObserver.unobserve(this.$refs.pivotOutput)
+  },
+  methods: {
+    handleResize () {
+      // hack: plotly changes size only on window.resize event,
+      // so, we trigger it when container resizes (e.g. when move splitter)
+      if (this.pivotOptions.rendererName in $.pivotUtilities.plotly_renderers) {
+        window.dispatchEvent(new Event('resize'))
+      }
+    },
+
+    show () {
+      const options = { ...this.pivotOptions }
+      if (this.pivotOptions.rendererName in $.pivotUtilities.plotly_renderers) {
+        options.rendererOptions = {
+          plotly: {
+            autosize: true,
+            width: null,
+            height: null
+          },
+          plotlyConfig: {
+            displaylogo: false,
+            responsive: true,
+            modeBarButtonsToRemove: ['toImage']
+          }
+        }
+      }
+
+      $(this.$refs.pivotOutput).pivot(
+        function (callback) {
+          const rowCount = !this.dataSources ? 0 : this.dataSources[this.columns[0]].length
+          for (let i = 1; i <= rowCount; i++) {
+            const row = {}
+            this.columns.forEach(col => {
+              row[col] = this.dataSources[col][i - 1]
+            })
+            callback(row)
+          }
+        }.bind(this),
+        options
+      )
+
+      // fix for Firefox: fit plotly renderers just after choosing it in pivotUi
+      if (this.pivotOptions.rendererName in $.pivotUtilities.plotly_renderers) {
+        window.dispatchEvent(new Event('resize'))
+      }
+    },
+
+    getOptionsForSave () {
+      const options = { ...this.pivotOptions }
+      if (options.rendererOptions) {
+        const chartComponent = this.pivotOptions.rendererOptions.customChartComponent
+        options.rendererOptions = {
+          customChartOptions: chartComponent.getOptionsForSave()
+        }
+      }
+
+      return options
+    },
+
+    async saveAsPng () {
+      if (this.pivotOptions.rendererName === 'Custom chart') {
+        this.pivotOptions.rendererOptions.customChartComponent.saveAsPng()
+      } else if (this.pivotOptions.rendererName in $.pivotUtilities.plotly_renderers) {
+        const chartElement = this.$refs.pivotOutput.querySelector('.js-plotly-plot')
+        const url = await plotly.toImage(chartElement, {
+          format: 'png',
+          width: null,
+          height: null
+        })
+        this.$emit('loadingImageCompleted')
+        fIo.downloadFromUrl(url, 'pivot')
+      } else {
+        const tableElement = this.$refs.pivotOutput.querySelector('.pvtTable')
+        const canvas = await html2canvas(tableElement)
+        this.$emit('loadingImageCompleted')
+        fIo.downloadFromUrl(canvas.toDataURL('image/png'), 'pivot', 'image/png')
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.pivot-container {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  background-color: var(--color-white);
+}
+
+.pivot-output {
+  flex-grow: 1;
+  width: 100%;
+  overflow: auto;
+}
+
+.pivot-warning {
+  height: 40px;
+  line-height: 40px;
+  box-sizing: border-box;
+}
+>>> .pvtTable {
+  min-width: 100%;
+}
+
+>>> table.pvtTable tbody tr td,
+>>> table.pvtTable thead tr th,
+>>> table.pvtTable tbody tr th {
+  border-color: var(--color-border-light);
+}
+>>> table.pvtTable thead tr th,
+>>> table.pvtTable tbody tr th {
+  background-color: var(--color-bg-dark);
+  color: var(--color-text-light);
+}
+
+>>> table.pvtTable tbody tr td {
+  color: var(--color-text-base);
+}
+
+.pivot-output >>> textarea {
+  color: var(--color-text-base);
+  min-width: 100%;
+  height: 100% !important;
+  display: block;
+  box-sizing: border-box;
+  border-width: 0;
+}
+
+.pivot-output >>> textarea:focus-visible {
+  outline: none;
+}
+</style>
--- a/src/views/Main/Workspace/Tabs/Tab/DataView/index.vue
+++ b/src/views/Main/Workspace/Tabs/Tab/DataView/index.vue
@@ -0,0 +1,118 @@
+<template>
+  <div class="data-view-panel">
+    <div class="data-view-panel-content">
+      <component
+        :is="mode"
+        :init-options="mode === initMode ? initOptions : undefined"
+        :data-sources="dataSource"
+        :import-to-png-enabled.sync="importToPngEnabled"
+        @loadingImageCompleted="loadingImage = false"
+        ref="viewComponent"
+        @update="$emit('update')"
+      />
+    </div>
+    <side-tool-bar panel="dataView" @switchTo="$emit('switchTo', $event)">
+      <icon-button
+        :active="mode === 'chart'"
+        @click="mode = 'chart'"
+        tooltip="Switch to chart"
+        tooltip-position="top-left"
+      >
+        <chart-icon />
+      </icon-button>
+      <icon-button
+        :active="mode === 'pivot'"
+        @click="mode = 'pivot'"
+        tooltip="Switch to pivot"
+        tooltip-position="top-left"
+      >
+        <pivot-icon />
+      </icon-button>
+
+      <div class="side-tool-bar-divider"/>
+
+      <icon-button
+        :disabled="!importToPngEnabled || loadingImage"
+        :loading="loadingImage"
+        tooltip="Save as PNG image"
+        tooltip-position="top-left"
+        @click="saveAsPng"
+      >
+        <png-icon />
+      </icon-button>
+    </side-tool-bar>
+  </div>
+</template>
+
+<script>
+import Chart from './Chart'
+import Pivot from './Pivot'
+import SideToolBar from '../SideToolBar'
+import IconButton from '@/components/IconButton'
+import ChartIcon from '@/components/svg/chart'
+import PivotIcon from '@/components/svg/pivot'
+import PngIcon from '@/components/svg/png'
+
+export default {
+  name: 'DataView',
+  props: ['dataSource', 'initOptions', 'initMode'],
+  components: {
+    Chart,
+    Pivot,
+    SideToolBar,
+    IconButton,
+    ChartIcon,
+    PivotIcon,
+    PngIcon
+  },
+  data () {
+    return {
+      mode: this.initMode || 'chart',
+      importToPngEnabled: true,
+      loadingImage: false
+    }
+  },
+  watch: {
+    mode () {
+      this.$emit('update')
+      this.importToPngEnabled = true
+    }
+  },
+  methods: {
+    async saveAsPng () {
+      this.loadingImage = true
+      /*
+      setTimeout does its thing by putting its callback on the callback queue. The callback queue is only called by the browser after both the call stack and the render queue are done. So our animation (which is on the call stack) gets done, the render queue renders it, and then the browser is ready for the callback queue and calls the long-calculation.
+
+      nextTick allows you to do something after you have changed the data and VueJS has updated the DOM based on your data change, but before the browser has rendered those changed on the page.
+
+      Lees meer van Katinka Hesselink: http://www.hesselinkwebdesign.nl/2019/nexttick-vs-settimeout-in-vue/
+
+      */
+      setTimeout(() => {
+        this.$refs.viewComponent.saveAsPng()
+      }, 0)
+    },
+    getOptionsForSave () {
+      return this.$refs.viewComponent.getOptionsForSave()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.data-view-panel {
+  display: flex;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+}
+
+.data-view-panel-content {
+  position: relative;
+  flex-grow: 1;
+  width: calc(100% - 39px);
+  height: 100%;
+  overflow: auto;
+}
+</style>
--- a/src/views/Main/Workspace/Tabs/Tab/RunResult.vue
+++ b/src/views/Main/Workspace/Tabs/Tab/RunResult.vue
@@ -0,0 +1,130 @@
+<template>
+  <div class="run-result-panel" ref="runResultPanel">
+    <div class="run-result-panel-content">
+      <div
+        v-show="result === null && !isGettingResults && !error"
+        class="table-preview result-before"
+      >
+        Run your query and get results here
+      </div>
+      <div v-if="isGettingResults" class="table-preview result-in-progress">
+        <loading-indicator :size="30"/>
+        Fetching results...
+      </div>
+      <div
+        v-show="result === undefined && !isGettingResults && !error"
+        class="table-preview result-empty"
+      >
+        No rows retrieved according to your query
+      </div>
+      <logs v-if="error" :messages="[error]"/>
+      <sql-table
+        v-if="result"
+        :data-set="result"
+        :time="time"
+        :pageSize="pageSize"
+        class="straight"
+      />
+    </div>
+    <side-tool-bar @switchTo="$emit('switchTo', $event)" panel="table"/>
+  </div>
+</template>
+
+<script>
+import Logs from '@/components/Logs'
+import SqlTable from '@/components/SqlTable'
+import LoadingIndicator from '@/components/LoadingIndicator'
+import SideToolBar from './SideToolBar'
+
+export default {
+  name: 'RunResult',
+  props: ['result', 'isGettingResults', 'error', 'time'],
+  data () {
+    return {
+      resizeObserver: null,
+      pageSize: 20
+    }
+  },
+  components: {
+    SqlTable,
+    LoadingIndicator,
+    Logs,
+    SideToolBar
+  },
+  mounted () {
+    this.resizeObserver = new ResizeObserver(this.handleResize)
+    this.resizeObserver.observe(this.$refs.runResultPanel)
+    this.calculatePageSize()
+  },
+  beforeDestroy () {
+    this.resizeObserver.unobserve(this.$refs.runResultPanel)
+  },
+  methods: {
+    handleResize () {
+      this.calculatePageSize()
+    },
+    calculatePageSize () {
+      const runResultPanel = this.$refs.runResultPanel
+      // 27 - table footer hight
+      // 5 - padding-bottom of rounded table container
+      // 35 - height of table header
+      const freeSpace = runResultPanel.offsetHeight - 27 - 5 - 35
+      this.pageSize = Math.max(Math.floor(freeSpace / 35), 20)
+    }
+  }
+}
+</script>
+
+<style scoped>
+.run-result-panel {
+  display: flex;
+  height: 100%;
+  overflow: hidden;
+}
+
+.run-result-panel-content {
+  position: relative;
+  flex-grow: 1;
+  height: 100%;
+  width: 0;
+  box-sizing: border-box;
+}
+
+.table-preview {
+  position: absolute;
+  top: 40%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  color: var(--color-text-base);
+  font-size: 13px;
+}
+
+.result-in-progress {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  will-change: opacity;
+  /*
+    We need to show loader in 1 sec after starting query execution. We can't do that with
+    setTimeout because the main thread can be busy by getting a result set from the web worker.
+    But we can use CSS animation for opacity. Opacity triggers changes only in the Composite Layer
+    stage in rendering waterfall. Hence it can be processed only with Compositor Thread while
+    the Main Thread processes a result set.
+    https://www.viget.com/articles/animation-performance-101-browser-under-the-hood/
+  */
+  animation: show-loader 1s linear 0s 1;
+}
+
+@keyframes show-loader {
+  0% {
+    opacity: 0;
+  }
+  99% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
+}
+</style>
--- a/src/views/Main/Workspace/Tabs/Tab/SideToolBar.vue
+++ b/src/views/Main/Workspace/Tabs/Tab/SideToolBar.vue
@@ -0,0 +1,67 @@
+<template>
+  <div class="side-tool-bar">
+    <icon-button
+      :active="panel === 'sqlEditor'"
+      tooltip="Switch panel to SQL editor"
+      tooltip-position="top-left"
+      @click.native="$emit('switchTo', 'sqlEditor')"
+    >
+      <sql-editor-icon />
+    </icon-button>
+
+    <icon-button
+      :active="panel === 'table'"
+      tooltip="Switch panel to result set"
+      tooltip-position="top-left"
+      @click.native="$emit('switchTo', 'table')"
+    >
+      <table-icon/>
+    </icon-button>
+
+    <icon-button
+      :active="panel === 'dataView'"
+      tooltip="Switch panel to data view"
+      tooltip-position="top-left"
+      @click.native="$emit('switchTo', 'dataView')"
+    >
+      <data-view-icon />
+    </icon-button>
+
+    <div class="side-tool-bar-divider" v-if="$slots.default"/>
+
+    <slot/>
+  </div>
+</template>
+
+<script>
+import IconButton from '@/components/IconButton'
+import TableIcon from '@/components/svg/table'
+import SqlEditorIcon from '@/components/svg/sqlEditor'
+import DataViewIcon from '@/components/svg/dataView'
+
+export default {
+  name: 'SideToolBar',
+  props: ['panel'],
+  components: {
+    IconButton,
+    SqlEditorIcon,
+    DataViewIcon,
+    TableIcon
+  }
+}
+</script>
+
+<style scoped>
+.side-tool-bar {
+  background-color: var(--color-bg-light);
+  border-left: 1px solid var(--color-border-light);
+  padding: 6px;
+}
+
+.side-tool-bar-divider {
+  width: 26px;
+  height: 1px;
+  background: var(--color-border-light);
+  margin: 6px 0;
+}
+</style>
--- a/src/views/Main/Workspace/Tabs/Tab/SqlEditor/hint.js
+++ b/src/views/Main/Workspace/Tabs/Tab/SqlEditor/hint.js
--- a/src/views/Main/Workspace/Tabs/Tab/SqlEditor/index.vue
+++ b/src/views/Main/Workspace/Tabs/Tab/SqlEditor/index.vue
@@ -1,6 +1,24 @@
 <template>
-  <div class="codemirror-container">
-    <codemirror ref="cm" v-model="query" :options="cmOptions" @changes="onChange" />
+  <div class="sql-editor-panel">
+    <div class="codemirror-container">
+      <codemirror
+        ref="cm"
+        v-model="query"
+        :options="cmOptions"
+        @changes="onChange"
+      />
+    </div>
+    <side-tool-bar panel="sqlEditor" @switchTo="$emit('switchTo', $event)">
+      <icon-button
+        :disabled="runDisabled"
+        :loading="isGettingResults"
+        tooltip="Run SQL query"
+        tooltip-position="top-left"
+        @click="$emit('run')"
+      >
+        <run-icon :disabled="runDisabled"/>
+      </icon-button>
+    </side-tool-bar>
  </div>
 </template>

@@ -13,16 +31,23 @@ import 'codemirror/mode/sql/sql.js'
 import 'codemirror/theme/neo.css'
 import 'codemirror/addon/hint/show-hint.css'
 import 'codemirror/addon/display/autorefresh.js'
+import SideToolBar from '../SideToolBar'
+import IconButton from '@/components/IconButton'
+import RunIcon from '@/components/svg/run'

 export default {
  name: 'SqlEditor',
-  props: ['value'],
-  components: { codemirror },
+  props: ['value', 'isGettingResults'],
+  components: {
+    codemirror,
+    SideToolBar,
+    IconButton,
+    RunIcon
+  },
  data () {
    return {
      query: this.value,
      cmOptions: {
-        // codemirror options
        tabSize: 4,
        mode: 'text/x-mysql',
        theme: 'neo',
@@ -33,6 +58,11 @@ export default {
      }
    }
  },
+  computed: {
+    runDisabled () {
+      return (!this.$store.state.db || !this.query || this.isGettingResults)
+    }
+  },
  watch: {
    query () {
      this.$emit('input', this.query)
@@ -48,9 +78,18 @@ export default {
 </script>

 <style scoped>
+.sql-editor-panel {
+  display: flex;
+  flex-grow: 1;
+  height: 100%;
+  max-height: 100%;
+  box-sizing: border-box;
+  overflow: hidden;
+}
+
 .codemirror-container {
  flex-grow: 1;
-  min-height: 0;
+  overflow: auto;
 }

 >>> .vue-codemirror {
--- a/src/views/Main/Workspace/Tabs/Tab/index.vue
+++ b/src/views/Main/Workspace/Tabs/Tab/index.vue
@@ -0,0 +1,160 @@
+<template>
+  <div class="tab-content-container" v-show="isActive">
+    <splitpanes
+      class="query-results-splitter"
+      horizontal
+      :before="{ size: 50, max: 100 }"
+      :after="{ size: 50, max: 100 }"
+    >
+      <template #left-pane>
+        <div :id="'above-' + tabIndex" class="above" />
+      </template>
+      <template #right-pane>
+        <div :id="'bottom-'+ tabIndex" ref="bottomPane" class="bottomPane" />
+      </template>
+    </splitpanes>
+
+    <div :id="'hidden-'+ tabIndex" class="hidden-part" />
+
+    <teleport :to="`#${layout.sqlEditor}-${tabIndex}`">
+      <sql-editor
+        ref="sqlEditor"
+        v-model="query"
+        :is-getting-results="isGettingResults"
+        @switchTo="onSwitchView('sqlEditor', $event)"
+        @run="execute"
+      />
+    </teleport>
+
+    <teleport :to="`#${layout.table}-${tabIndex}`">
+      <run-result
+        :result="result"
+        :is-getting-results="isGettingResults"
+        :error="error"
+        :time="time"
+        @switchTo="onSwitchView('table', $event)"
+      />
+    </teleport>
+
+    <teleport :to="`#${layout.dataView}-${tabIndex}`">
+      <data-view
+        :data-source="result"
+        :init-options="initViewOptions"
+        :init-mode="initViewType"
+        ref="dataView"
+        @switchTo="onSwitchView('dataView', $event)"
+        @update="onDataViewUpdate"
+      />
+    </teleport>
+  </div>
+</template>
+
+<script>
+import Splitpanes from '@/components/Splitpanes'
+import SqlEditor from './SqlEditor'
+import DataView from './DataView'
+import RunResult from './RunResult'
+import time from '@/lib/utils/time'
+import Teleport from 'vue2-teleport'
+
+export default {
+  name: 'Tab',
+  props: ['id', 'initName', 'initQuery', 'initViewOptions', 'tabIndex', 'isPredefined', 'initViewType'],
+  components: {
+    SqlEditor,
+    DataView,
+    RunResult,
+    Splitpanes,
+    Teleport
+  },
+  data () {
+    return {
+      query: this.initQuery,
+      result: null,
+      isGettingResults: false,
+      error: null,
+      time: 0,
+      layout: {
+        sqlEditor: 'above',
+        table: 'bottom',
+        dataView: 'hidden'
+      }
+    }
+  },
+  computed: {
+    isActive () {
+      return this.id === this.$store.state.currentTabId
+    }
+  },
+  watch: {
+    isActive: {
+      immediate: true,
+      async handler () {
+        if (this.isActive) {
+          this.$store.commit('setCurrentTab', this)
+          await this.$nextTick()
+          this.$refs.sqlEditor.focus()
+        }
+      }
+    },
+    query () {
+      this.$store.commit('updateTab', { index: this.tabIndex, isSaved: false })
+    }
+  },
+  methods: {
+    onSwitchView (from, to) {
+      const fromPosition = this.layout[from]
+      this.layout[from] = this.layout[to]
+      this.layout[to] = fromPosition
+    },
+    onDataViewUpdate () {
+      this.$store.commit('updateTab', { index: this.tabIndex, isSaved: false })
+    },
+    async execute () {
+      this.isGettingResults = true
+      this.result = null
+      this.error = null
+      const state = this.$store.state
+      try {
+        const start = new Date()
+        this.result = await state.db.execute(this.query + ';')
+        this.time = time.getPeriod(start, new Date())
+      } catch (err) {
+        this.error = {
+          type: 'error',
+          message: err
+        }
+      }
+      state.db.refreshSchema()
+      this.isGettingResults = false
+    }
+  }
+}
+</script>
+
+<style scoped>
+.above {
+  height: 100%;
+  max-height: 100%;
+}
+
+.hidden-part {
+  display: none;
+}
+
+.tab-content-container {
+  background-color: var(--color-white);
+  border-top: 1px solid var(--color-border-light);
+  margin-top: -1px;
+}
+
+.bottomPane {
+  height: 100%;
+  background-color: var(--color-bg-light);
+}
+
+.query-results-splitter {
+  height: calc(100vh - 104px);
+  background-color: var(--color-bg-light);
+}
+</style>
--- a/src/views/Main/Workspace/Tabs/index.vue
+++ b/src/views/Main/Workspace/Tabs/index.vue
@@ -8,7 +8,7 @@
        :class="[{'tab-selected': (tab.id === selectedIndex)}, 'tab']"
      >
        <div class="tab-name">
-          <span v-show="tab.isUnsaved" class="star">*</span>
+          <span v-show="!tab.isSaved" class="star">*</span>
          <span v-if="tab.name">{{ tab.name }}</span>
          <span v-else class="tab-untitled">{{ tab.tempName }}</span>
        </div>
@@ -23,14 +23,15 @@
      :id="tab.id"
      :init-name="tab.name"
      :init-query="tab.query"
-      :init-chart="tab.chart"
+      :init-view-options="tab.viewOptions"
+      :init-view-type="tab.viewType"
      :is-predefined="tab.isPredefined"
      :tab-index="index"
    />
    <div v-show="tabs.length === 0" id="start-guide">
-      <span class="link" @click="$root.$emit('createNewQuery')">Create</span>
-      a new query from scratch or open the one from
-      <router-link class="link" to="/my-queries">My queries</router-link>
+      <span class="link" @click="$root.$emit('createNewInquiry')">Create</span>
+      new inquiry from scratch or open one from
+      <router-link class="link" to="/inquiries">Inquiries</router-link>
    </div>

    <!--Close tab warning dialog  -->
@@ -88,7 +89,7 @@ export default {
  },
  methods: {
    leavingSqliteviz (event) {
-      if (this.tabs.some(tab => tab.isUnsaved)) {
+      if (this.tabs.some(tab => !tab.isSaved)) {
        event.preventDefault()
        event.returnValue = ''
      }
@@ -98,7 +99,7 @@ export default {
    },
    beforeCloseTab (index) {
      this.closingTabIndex = index
-      if (this.tabs[index].isUnsaved) {
+      if (!this.tabs[index].isSaved) {
        this.$modal.show('close-warn')
      } else {
        this.closeTab(index)
@@ -110,14 +111,14 @@ export default {
      this.$store.commit('deleteTab', index)
    },
    saveAndClose (index) {
-      this.$root.$on('querySaved', () => {
+      this.$root.$on('inquirySaved', () => {
        this.closeTab(index)
-        this.$root.$off('querySaved')
+        this.$root.$off('inquirySaved')
      })
      this.selectTab(this.tabs[index].id)
      this.$modal.hide('close-warn')
      this.$nextTick(() => {
-        this.$root.$emit('saveQuery')
+        this.$root.$emit('saveInquiry')
      })
    }
  }
@@ -159,18 +160,29 @@ export default {
  flex-shrink: 1;
 }

-#tabs-header div:hover {
+#tabs-header .tab:hover {
  cursor: pointer;
 }

 #tabs-header .tab-selected {
  color: var(--color-text-active);
-  font-weight: 600;
  border-bottom: none;
  background-color: var(--color-white);
+  position: relative;
 }
-#tabs-header .tab-selected:hover {
-    cursor: default;
+
+#tabs-header .tab-selected:after {
+  content: '';
+  width: 100%;
+  height: 4px;
+  background-color: var(--color-accent);
+  position: absolute;
+  left: 0;
+  bottom: 0;
+}
+
+#tabs-header .tab.tab-selected:hover {
+  cursor: default;
 }

 .close-icon {
--- a/src/views/Main/Workspace/index.vue
+++ b/src/views/Main/Workspace/index.vue
@@ -21,7 +21,7 @@ import Schema from './Schema'
 import Tabs from './Tabs'

 export default {
-  name: 'Editor',
+  name: 'Workspace',
  components: {
    Schema,
    Splitpanes,
--- a/src/views/Main/index.vue
+++ b/src/views/Main/index.vue
@@ -1,7 +1,7 @@
 <template>
  <div>
    <main-menu />
-    <keep-alive include="Editor">
+    <keep-alive include="Workspace">
      <router-view id="main-view" />
    </keep-alive>
  </div>
--- a/src/views/Welcome.vue
+++ b/src/views/Welcome.vue
@@ -4,7 +4,7 @@
    <div id="note">
      Sqliteviz is fully client-side. Your database never leaves your computer.
    </div>
-    <button id="skip" class="secondary" @click="$router.push('/editor')">
+    <button id="skip" class="secondary" @click="$router.push('/workspace')">
      Create empty database
    </button>
  </div>
--- a/tests/components/CsvImport/CsvImport.spec.js
+++ b/tests/components/CsvImport/CsvImport.spec.js
@@ -58,12 +58,10 @@ describe('CsvImport.vue', () => {
    sinon.stub(csv, 'parse').resolves({
      delimiter: '|',
      data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo'],
-          [2, 'bar']
-        ]
+        col1: [1, 2],
+        col2: ['foo', 'bar']
      },
+      rowCount: 2,
      messages: [{
        code: 'UndetectableDelimiter',
        message: 'Comma was used as a standart delimiter',
@@ -101,11 +99,10 @@ describe('CsvImport.vue', () => {
    parse.onCall(0).resolves({
      delimiter: '|',
      data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo']
-        ]
-      }
+        col1: [1],
+        col2: ['foo']
+      },
+      rowCount: 1
    })

    wrapper.vm.previewCsv()
@@ -116,11 +113,10 @@ describe('CsvImport.vue', () => {
    parse.onCall(1).resolves({
      delimiter: ',',
      data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [2, 'bar']
-        ]
+        col1: [2],
+        col2: ['bar']
      },
+      rowCount: 1,
      hasErrors: false
    })
    await wrapper.find('.delimiter-selector-container input').setValue(',')
@@ -137,11 +133,10 @@ describe('CsvImport.vue', () => {
    parse.onCall(2).resolves({
      delimiter: ',',
      data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [3, 'baz']
-        ]
+        col1: [3],
+        col2: ['baz']
      },
+      rowCount: 1,
      hasErrors: true,
      messages: [{
        code: 'MissingQuotes',
@@ -167,11 +162,10 @@ describe('CsvImport.vue', () => {
    parse.onCall(3).resolves({
      delimiter: ',',
      data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [4, 'qux']
-        ]
+        col1: [4],
+        col2: ['qux']
      },
+      rowCount: 1,
      hasErrors: false
    })
    await wrapper.find('#escape-char input').setValue("'")
@@ -187,11 +181,10 @@ describe('CsvImport.vue', () => {
    parse.onCall(4).resolves({
      delimiter: ',',
      data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [5, 'corge']
-        ]
+        col1: [5],
+        col2: ['corge']
      },
+      rowCount: 1,
      hasErrors: false
    })
    await wrapper.findComponent({ name: 'check-box' }).trigger('click')
@@ -210,11 +203,10 @@ describe('CsvImport.vue', () => {
    parse.onCall(0).resolves({
      delimiter: '|',
      data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo']
-        ]
-      }
+        col1: [1],
+        col2: ['foo']
+      },
+      rowCount: 1
    })

    wrapper.vm.previewCsv()
@@ -264,11 +256,10 @@ describe('CsvImport.vue', () => {
    parse.onCall(0).resolves({
      delimiter: '|',
      data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo']
-        ]
+        col1: [1],
+        col2: ['foo']
      },
+      rowCount: 1,
      hasErrors: false,
      messages: []
    })
@@ -276,12 +267,10 @@ describe('CsvImport.vue', () => {
    parse.onCall(1).resolves({
      delimiter: '|',
      data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo'],
-          [2, 'bar']
-        ]
+        col1: [1, 2],
+        col2: ['foo', 'bar']
      },
+      rowCount: 2,
      hasErrors: false,
      messages: []
    })
@@ -322,11 +311,10 @@ describe('CsvImport.vue', () => {
    parse.onCall(0).resolves({
      delimiter: '|',
      data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo']
-        ]
+        col1: [1],
+        col2: ['foo']
      },
+      rowCount: 1,
      hasErrors: false,
      messages: []
    })
@@ -334,12 +322,10 @@ describe('CsvImport.vue', () => {
    parse.onCall(1).resolves({
      delimiter: '|',
      data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo'],
-          [2, 'bar']
-        ]
+        col1: [1, 2],
+        col2: ['foo', 'bar']
      },
+      rowCount: 2,
      hasErrors: false,
      messages: [{
        code: 'UndetectableDelimiter',
@@ -387,11 +373,10 @@ describe('CsvImport.vue', () => {
    parse.onCall(0).resolves({
      delimiter: '|',
      data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo']
-        ]
+        col1: [1],
+        col2: ['foo']
      },
+      rowCount: 1,
      hasErrors: false,
      messages: []
    })
@@ -399,12 +384,10 @@ describe('CsvImport.vue', () => {
    parse.onCall(1).resolves({
      delimiter: '|',
      data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo'],
-          [2, 'bar']
-        ]
+        col1: [1, 2],
+        col2: ['foo', 'bar']
      },
+      rowCount: 2,
      hasErrors: true,
      messages: [{
        code: 'Error',
@@ -446,11 +429,10 @@ describe('CsvImport.vue', () => {
    parse.onCall(0).resolves({
      delimiter: '|',
      data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo']
-        ]
+        col1: [1],
+        col2: ['foo']
      },
+      rowCount: 1,
      hasErrors: false,
      messages: []
    })
@@ -458,12 +440,10 @@ describe('CsvImport.vue', () => {
    parse.onCall(1).resolves({
      delimiter: '|',
      data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo'],
-          [2, 'bar']
-        ]
+        col1: [1, 2],
+        col2: ['foo', 'bar']
      },
+      rowCount: 2,
      hasErrors: false,
      messages: []
    })
@@ -516,11 +496,10 @@ describe('CsvImport.vue', () => {
    parse.onCall(0).resolves({
      delimiter: '|',
      data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo']
-        ]
+        col1: [1],
+        col2: ['foo']
      },
+      rowCount: 1,
      hasErrors: false,
      messages: []
    })
@@ -528,12 +507,10 @@ describe('CsvImport.vue', () => {
    parse.onCall(1).resolves({
      delimiter: '|',
      data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo'],
-          [2, 'bar']
-        ]
+        col1: [1, 2],
+        col2: ['foo', 'bar']
      },
+      rowCount: 2,
      hasErrors: false,
      messages: []
    })
@@ -568,11 +545,10 @@ describe('CsvImport.vue', () => {
    parse.onCall(0).resolves({
      delimiter: '|',
      data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo']
-        ]
+        col1: [1],
+        col2: ['foo']
      },
+      rowCount: 1,
      hasErrors: false,
      messages: []
    })
@@ -580,12 +556,10 @@ describe('CsvImport.vue', () => {
    parse.onCall(1).resolves({
      delimiter: '|',
      data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo'],
-          [2, 'bar']
-        ]
+        col1: [1, 2],
+        col2: ['foo', 'bar']
      },
+      rowCount: 2,
      hasErrors: false,
      messages: []
    })
@@ -622,11 +596,10 @@ describe('CsvImport.vue', () => {
    sinon.stub(csv, 'parse').resolves({
      delimiter: '|',
      data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo']
-        ]
+        col1: [1],
+        col2: ['foo']
      },
+      rowCount: 1,
      hasErrors: false,
      messages: []
    })
@@ -651,11 +624,10 @@ describe('CsvImport.vue', () => {
    sinon.stub(csv, 'parse').resolves({
      delimiter: '|',
      data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo']
-        ]
+        col1: [1],
+        col2: ['foo']
      },
+      rowCount: 1,
      hasErrors: false,
      messages: []
    })
--- a/tests/components/CsvImport/csv.spec.js
+++ b/tests/components/CsvImport/csv.spec.js
@@ -19,11 +19,9 @@ describe('csv.js', () => {
      }
    }
    expect(csv.getResult(source)).to.eql({
-      columns: ['id', 'name', 'date'],
-      values: [
-        [1, 'foo', '2021-06-30T14:10:24.717Z'],
-        [2, 'bar', '2021-07-30T14:10:15.717Z']
-      ]
+      id: [1, 2],
+      name: ['foo', 'bar'],
+      date: ['2021-06-30T14:10:24.717Z', '2021-07-30T14:10:15.717Z']
    })
  })

@@ -36,11 +34,9 @@ describe('csv.js', () => {
      meta: {}
    }
    expect(csv.getResult(source)).to.eql({
-      columns: ['col1', 'col2', 'col3'],
-      values: [
-        [1, 'foo', '2021-06-30T14:10:24.717Z'],
-        [2, 'bar', '2021-07-30T14:10:15.717Z']
-      ]
+      col1: [1, 2],
+      col2: ['foo', 'bar'],
+      col3: ['2021-06-30T14:10:24.717Z', '2021-07-30T14:10:15.717Z']
    })
  })

@@ -77,13 +73,11 @@ describe('csv.js', () => {
    const result = await csv.parse(file)
    expect(result).to.eql({
      data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo'],
-          [2, 'bar']
-        ]
+        col1: [1, 2],
+        col2: ['foo', 'bar']
      },
      delimiter: ',',
+      rowCount: 2,
      hasErrors: true,
      messages: [
        {
--- a/tests/components/DbUploader.spec.js
+++ b/tests/components/DbUploader.spec.js
@@ -29,7 +29,7 @@ describe('DbUploader.vue', () => {
    place.remove()
  })

-  it('loads db on click and redirects to /editor', async () => {
+  it('loads db on click and redirects to /workspace', async () => {
    // mock getting a file from user
    const file = { name: 'test.db' }
    sinon.stub(fu, 'getFileFromUser').resolves(file)
@@ -59,11 +59,11 @@ describe('DbUploader.vue', () => {
    await db.loadDb.returnValues[0]
    await wrapper.vm.animationPromise
    await wrapper.vm.$nextTick()
-    expect($router.push.calledOnceWith('/editor')).to.equal(true)
+    expect($router.push.calledOnceWith('/workspace')).to.equal(true)
    wrapper.destroy()
  })

-  it('loads db on drop and redirects to /editor', async () => {
+  it('loads db on drop and redirects to /workspace', async () => {
    // mock db loading
    const db = {
      loadDb: sinon.stub().resolves()
@@ -97,11 +97,11 @@ describe('DbUploader.vue', () => {
    await db.loadDb.returnValues[0]
    await wrapper.vm.animationPromise
    await wrapper.vm.$nextTick()
-    expect($router.push.calledOnceWith('/editor')).to.equal(true)
+    expect($router.push.calledOnceWith('/workspace')).to.equal(true)
    wrapper.destroy()
  })

-  it("doesn't redirect if already on /editor", async () => {
+  it("doesn't redirect if already on /workspace", async () => {
    // mock getting a file from user
    const file = { name: 'test.db' }
    sinon.stub(fu, 'getFileFromUser').resolves(file)
@@ -114,7 +114,7 @@ describe('DbUploader.vue', () => {

    // mock router
    const $router = { push: sinon.stub() }
-    const $route = { path: '/editor' }
+    const $route = { path: '/workspace' }

    // mount the component
    const wrapper = shallowMount(DbUploader, {
@@ -141,7 +141,7 @@ describe('DbUploader.vue', () => {

    // mock router
    const $router = { push: sinon.stub() }
-    const $route = { path: '/editor' }
+    const $route = { path: '/workspace' }

    // mount the component
    const wrapper = mount(DbUploader, {
@@ -175,7 +175,7 @@ describe('DbUploader.vue', () => {

    // mock router
    const $router = { push: sinon.stub() }
-    const $route = { path: '/editor' }
+    const $route = { path: '/workspace' }

    // mount the component
    const wrapper = mount(DbUploader, {
--- a/tests/components/Logs.spec.js
+++ b/tests/components/Logs.spec.js
@@ -8,6 +8,7 @@ describe('Logs.vue', () => {
    place = document.createElement('div')
    document.body.appendChild(place)
  })
+
  afterEach(() => {
    place.remove()
  })
--- a/tests/lib/database/_sql.spec.js
+++ b/tests/lib/database/_sql.spec.js
@@ -34,10 +34,11 @@ describe('_sql.js', () => {
    sql.open(data)
    const result = sql.exec('SELECT * from test')
    expect(result).to.have.lengthOf(1)
-    expect(result[0].columns).to.eql(['id', 'name', 'faculty'])
-    expect(result[0].values).to.have.lengthOf(2)
-    expect(result[0].values[0]).to.eql([1, 'Harry Potter', 'Griffindor'])
-    expect(result[0].values[1]).to.eql([2, 'Draco Malfoy', 'Slytherin'])
+    expect(result[0]).to.eql({
+      id: [1, 2],
+      name: ['Harry Potter', 'Draco Malfoy'],
+      faculty: ['Griffindor', 'Slytherin']
+    })
  })

  it('throws an error if query is empty', async () => {
@@ -63,26 +64,21 @@ describe('_sql.js', () => {

  it('imports', async () => {
    const data = {
-      columns: ['id', 'name'],
-      values: [
-        [1, 'Harry Potter'],
-        [2, 'Draco Malfoy'],
-        [3, 'Hermione Granger'],
-        [4, 'Ron Weasley']
+      id: [1, 2, 3, 4],
+      name: [
+        'Harry Potter',
+        'Draco Malfoy',
+        'Hermione Granger',
+        'Ron Weasley'
      ]
    }
    const progressCallback = sinon.stub()
    const progressCounterId = 1
    const sql = await Sql.build()
-    sql.import('foo', data.columns, data.values, progressCounterId, progressCallback, 2)
+    sql.import('foo', data, progressCounterId, progressCallback, 2)
    const result = sql.exec('SELECT * from foo')
    expect(result).to.have.lengthOf(1)
-    expect(result[0].columns).to.eql(['id', 'name'])
-    expect(result[0].values).to.have.lengthOf(4)
-    expect(result[0].values[0]).to.eql([1, 'Harry Potter'])
-    expect(result[0].values[1]).to.eql([2, 'Draco Malfoy'])
-    expect(result[0].values[2]).to.eql([3, 'Hermione Granger'])
-    expect(result[0].values[3]).to.eql([4, 'Ron Weasley'])
+    expect(result[0]).to.eql(data)

    expect(progressCallback.calledThrice).to.equal(true)
    expect(progressCallback.getCall(0).args[0]).to.eql({ progress: 0, id: 1 })
@@ -108,10 +104,11 @@ describe('_sql.js', () => {
    anotherSql.open(data)
    const result = anotherSql.exec('SELECT * from test')
    expect(result).to.have.lengthOf(1)
-    expect(result[0].columns).to.eql(['id', 'name', 'faculty'])
-    expect(result[0].values).to.have.lengthOf(2)
-    expect(result[0].values[0]).to.eql([1, 'Harry Potter', 'Griffindor'])
-    expect(result[0].values[1]).to.eql([2, 'Draco Malfoy', 'Slytherin'])
+    expect(result[0]).to.eql({
+      id: [1, 2],
+      name: ['Harry Potter', 'Draco Malfoy'],
+      faculty: ['Griffindor', 'Slytherin']
+    })
  })

  it('closes', async () => {
@@ -149,22 +146,28 @@ describe('_sql.js', () => {
    `)

    let result = sql.exec('SELECT * from test')
-    expect(result[0].values).to.have.lengthOf(2)
+    expect(result[0]).to.eql({
+      id: [1, 2],
+      name: ['foo', 'bar']
+    })

    const data = {
-      columns: ['id', 'name'],
-      values: [
-        [1, 'Harry Potter'],
-        [2, 'Draco Malfoy'],
-        [3, 'Hermione Granger'],
-        [4, 'Ron Weasley']
+      id: [1, 2, 3, 4],
+      name: [
+        'Harry Potter',
+        'Draco Malfoy',
+        'Hermione Granger',
+        'Ron Weasley'
      ]
    }
    // import adds table
-    sql.import('foo', data.columns, data.values, 1, sinon.stub(), 2)
+    sql.import('foo', data, 1, sinon.stub(), 2)
    result = sql.exec('SELECT * from foo')
-    expect(result[0].values).to.have.lengthOf(4)
+    expect(result[0]).to.eql(data)
    result = sql.exec('SELECT * from test')
-    expect(result[0].values).to.have.lengthOf(2)
+    expect(result[0]).to.eql({
+      id: [1, 2],
+      name: ['foo', 'bar']
+    })
  })
 })
--- a/tests/lib/database/_statements.spec.js
+++ b/tests/lib/database/_statements.spec.js
@@ -3,16 +3,18 @@ import stmts from '@/lib/database/_statements'

 describe('_statements.js', () => {
  it('generateChunks', () => {
-    const arr = ['1', '2', '3', '4', '5']
+    const source = {
+      id: ['1', '2', '3', '4', '5']
+    }
    const size = 2
-    const chunks = stmts.generateChunks(arr, size)
+    const chunks = stmts.generateChunks(source, size)
    const output = []
    for (const chunk of chunks) {
      output.push(chunk)
    }
-    expect(output[0]).to.eql(['1', '2'])
-    expect(output[1]).to.eql(['3', '4'])
-    expect(output[2]).to.eql(['5'])
+    expect(output[0]).to.eql([['1'], ['2']])
+    expect(output[1]).to.eql([['3'], ['4']])
+    expect(output[2]).to.eql([['5']])
  })

  it('getInsertStmt', () => {
@@ -22,12 +24,14 @@ describe('_statements.js', () => {
  })

  it('getCreateStatement', () => {
-    const columns = ['id', 'name', 'isAdmin', 'startDate']
-    const values = [
-      [1, 'foo', true, new Date()],
-      [2, 'bar', false, new Date()]
-    ]
-    expect(stmts.getCreateStatement('foo', columns, values)).to.equal(
+    const data = {
+      id: [1, 2],
+      name: ['foo', 'bar'],
+      isAdmin: [true, false],
+      startDate: [new Date(), new Date()]
+    }
+
+    expect(stmts.getCreateStatement('foo', data)).to.equal(
      'CREATE table "foo"("id" REAL, "name" TEXT, "isAdmin" INTEGER, "startDate" TEXT);'
    )
  })
--- a/tests/lib/database/database.spec.js
+++ b/tests/lib/database/database.spec.js
@@ -25,10 +25,7 @@ describe('database.js', () => {
  it('creates schema', async () => {
    const SQL = await getSQL
    const tempDb = new SQL.Database()
-    tempDb.run(`CREATE TABLE test (
-      col1,
-      col2 integer
-    )`)
+    tempDb.run('CREATE TABLE test (col1, col2 integer)')

    const data = tempDb.export()
    const buffer = new Blob([data])
@@ -88,11 +85,11 @@ describe('database.js', () => {

    await db.loadDb(buffer)
    const result = await db.execute('SELECT * from test limit 1; SELECT * from test;')
-    expect(result.columns).to.have.lengthOf(3)
-    expect(result.columns).to.eql(['id', 'name', 'faculty'])
-    expect(result.values).to.have.lengthOf(2)
-    expect(result.values[0]).to.eql([1, 'Harry Potter', 'Griffindor'])
-    expect(result.values[1]).to.eql([2, 'Draco Malfoy', 'Slytherin'])
+    expect(result).to.eql({
+      id: [1, 2],
+      name: ['Harry Potter', 'Draco Malfoy'],
+      faculty: ['Griffindor', 'Slytherin']
+    })
  })

  it('returns an error', async () => {
@@ -119,11 +116,9 @@ describe('database.js', () => {

  it('adds table from csv', async () => {
    const data = {
-      columns: ['id', 'name', 'faculty'],
-      values: [
-        [1, 'Harry Potter', 'Griffindor'],
-        [2, 'Draco Malfoy', 'Slytherin']
-      ]
+      id: [1, 2],
+      name: ['Harry Potter', 'Draco Malfoy'],
+      faculty: ['Griffindor', 'Slytherin']
    }
    const progressHandler = sinon.spy()
    const progressCounterId = db.createProgressCounter(progressHandler)
@@ -140,8 +135,7 @@ describe('database.js', () => {
    expect(db.schema[0].columns[2]).to.eql({ name: 'faculty', type: 'text' })

    const result = await db.execute('SELECT * from foo')
-    expect(result.columns).to.eql(data.columns)
-    expect(result.values).to.eql(data.values)
+    expect(result).to.eql(data)

    expect(progressHandler.calledTwice).to.equal(true)
    expect(progressHandler.firstCall.calledWith(0)).to.equal(true)
@@ -150,16 +144,13 @@ describe('database.js', () => {

  it('addTableFromCsv throws errors', async () => {
    const data = {
-      columns: ['id', 'name'],
-      values: [
-        [1, 'Harry Potter', 'Griffindor'],
-        [2, 'Draco Malfoy', 'Slytherin']
-      ]
+      id: [1, 2],
+      name: ['Harry Potter', 'Draco Malfoy'],
+      faculty: null
    }
    const progressHandler = sinon.stub()
    const progressCounterId = db.createProgressCounter(progressHandler)
-    await expect(db.addTableFromCsv('foo', data, progressCounterId))
-      .to.be.rejectedWith('column index out of range')
+    await expect(db.addTableFromCsv('foo', data, progressCounterId)).to.be.rejected
  })

  it('progressCounters', () => {
@@ -222,9 +213,10 @@ describe('database.js', () => {

    // check that new db works and has the same table and data
    result = await anotherDb.execute('SELECT * from foo')
-    expect(result.columns).to.eql(['id', 'name'])
-    expect(result.values).to.have.lengthOf(1)
-    expect(result.values[0]).to.eql([1, 'Harry Potter'])
+    expect(result).to.eql({
+      id: [1],
+      name: ['Harry Potter']
+    })
  })

  it('sanitizeTableName', () => {
--- a/tests/lib/database/sqliteExtensions.spec.js
+++ b/tests/lib/database/sqliteExtensions.spec.js
@@ -36,7 +36,27 @@ describe('SQLite extensions', function () {
        abs(pi() - radians(180))    < 0.000001,
        abs(pi() / 2 - atan2(1, 0)) < 0.000001
    `)
-    expect(actual.values).to.eql([[1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]])
+
+    expect(actual).to.eql({
+      'abs(3.1415926 - pi())       < 0.000001': [1],
+      'abs(1 - cos(2 * pi()))      < 0.000001': [1],
+      'abs(0 - sin(pi()))          < 0.000001': [1],
+      'abs(0 - tan(0))             < 0.000001': [1],
+      'abs(0 - cot(pi() / 2))      < 0.000001': [1],
+      'abs(1 - acos(cos(1)))       < 0.000001': [1],
+      'abs(1 - asin(sin(1)))       < 0.000001': [1],
+      'abs(1 - atan(tan(1)))       < 0.000001': [1],
+      'abs(1 - cosh(0))            < 0.000001': [1],
+      'abs(0 - sinh(0))            < 0.000001': [1],
+      'abs(tanh(1) + tanh(-1))     < 0.000001': [1],
+      'abs(coth(1) + coth(-1))     < 0.000001': [1],
+      'abs(1 - acosh(cosh(1)))     < 0.000001': [1],
+      'abs(1 - asinh(sinh(1)))     < 0.000001': [1],
+      'abs(1 - atanh(tanh(1)))     < 0.000001': [1],
+      'abs(180 - degrees(pi()))    < 0.000001': [1],
+      'abs(pi() - radians(180))    < 0.000001': [1],
+      'abs(pi() / 2 - atan2(1, 0)) < 0.000001': [1]
+    })
  })

  it('supports contrib math functions', async function () {
@@ -51,7 +71,17 @@ describe('SQLite extensions', function () {
        ceil(-1.95) + ceil(1.95),
        floor(-1.95) + floor(1.95)
    `)
-    expect(actual.values).to.eql([[1, 1, 4, 8, 0, 16, 1, -1]])
+    expect(actual).to.eql({
+      'exp(0)': [1],
+      'log(exp(1))': [1],
+      'log10(10000)': [4],
+      'power(2, 3)': [8],
+      'sign(-10) + sign(20)': [0],
+      'sqrt(square(16))': [16],
+      'ceil(-1.95) + ceil(1.95)': [1],
+      'floor(-1.95) + floor(1.95)': [-1]
+
+    })
  })

  it('supports contrib string functions', async function () {
@@ -69,9 +99,19 @@ describe('SQLite extensions', function () {
        padc('foo', 5),
        strfilter('abcba', 'bc')
    `)
-    expect(actual.values).to.eql([
-      ['abababab', 7, 0, 'fo', 'ar', 'raboof', 'Foobar', '  foo', 'foo  ', ' foo ', 'bcb']
-    ])
+    expect(actual).to.eql({
+      "replicate('ab', 4)": ['abababab'],
+      "charindex('ab', 'foobarabbarfoo')": [7],
+      "charindex('ab', 'foobarabbarfoo', 8)": [0],
+      "leftstr('foobar', 2)": ['fo'],
+      "rightstr('foobar', 2)": ['ar'],
+      "reverse('foobar')": ['raboof'],
+      "proper('fooBar')": ['Foobar'],
+      "padl('foo', 5)": ['  foo'],
+      "padr('foo', 5)": ['foo  '],
+      "padc('foo', 5)": [' foo '],
+      "strfilter('abcba', 'bc')": ['bcb']
+    })
  })

  it('supports contrib aggregate functions', async function () {
@@ -97,7 +137,14 @@ describe('SQLite extensions', function () {
        VALUES (1)
      )
    `)
-    expect(actual.values).to.eql([[1, 1, 1, 6, 3, 9]])
+    expect(actual).to.eql({
+      'abs( 3.77406806 - stdev(x))    < 0.000001': [1],
+      'abs(14.24358974 - variance(x)) < 0.000001': [1],
+      'mode(x)': [1],
+      'median(x)': [6],
+      'lower_quartile(x)': [3],
+      'upper_quartile(x)': [9]
+    })
  })

  it('supports generate_series', async function () {
@@ -105,7 +152,9 @@ describe('SQLite extensions', function () {
      SELECT value
      FROM generate_series(5, 20, 5)
    `)
-    expect(actual.values).to.eql([[5], [10], [15], [20]])
+    expect(actual).to.eql({
+      value: [5, 10, 15, 20]
+    })
  })

  it('supports transitive_closure', async function () {
@@ -145,33 +194,42 @@ describe('SQLite extensions', function () {
        WHERE nc.root = 2 AND nc.depth = 2
      );
    `)
-    expect(actual.values).to.eql([
-      ['_sql.spec.js'],
-      ['_statements.spec.js'],
-      ['database.spec.js'],
-      ['sqliteExtensions.spec.js'],
-      ['fileIo.spec.js'],
-      ['time.spec.js']
-    ])
+    expect(actual).to.eql({
+      name: [
+        '_sql.spec.js',
+        '_statements.spec.js',
+        'database.spec.js',
+        'sqliteExtensions.spec.js',
+        'fileIo.spec.js',
+        'time.spec.js'
+      ]
+    })
  })

  it('supports UUID functions', async function () {
    const actual = await db.execute(`
      SELECT
-        length(uuid()),
-        uuid_str(uuid_blob('26a8349c8a7f4cbeb519bf792c3d7ac6'))
+        length(uuid()) as length,
+        uuid_str(uuid_blob('26a8349c8a7f4cbeb519bf792c3d7ac6')) as uid
    `)
-    expect(actual.values).to.eql([[36, '26a8349c-8a7f-4cbe-b519-bf792c3d7ac6']])
+    expect(actual).to.eql({
+      length: [36],
+      uid: ['26a8349c-8a7f-4cbe-b519-bf792c3d7ac6']
+    })
  })

  it('supports regexp', async function () {
    const actual = await db.execute(`
      SELECT
-        regexp('=\\s?\\d+',  'const foo = 123; const bar = "bar"'),
-        regexpi('=\\s?\\d+', 'const foo = 123; const bar = "bar"'),
-        'const foo = 123; const bar = "bar"' REGEXP '=\\s?\\d+'
+        regexp('=\\s?\\d+',  'const foo = 123; const bar = "bar"') as one,
+        regexpi('=\\s?\\d+', 'const foo = 123; const bar = "bar"') as two,
+        'const foo = 123; const bar = "bar"' REGEXP '=\\s?\\d+' as three
    `)
-    expect(actual.values).to.eql([[1, 1, 1]])
+    expect(actual).to.eql({
+      one: [1],
+      two: [1],
+      three: [1]
+    })
  })

  it('supports pivot virtual table', async function () {
@@ -202,12 +260,13 @@ describe('SQLite extensions', function () {
      ALTER TABLE surface DROP COLUMN rownum;
      SELECT * FROM surface;
    `)
-    expect(actual.columns).to.eql(['x', 'y', '5.0', '10.0', '15.0'])
-    expect(actual.values).to.eql([
-      [5, 3, 3.2, 4, 4.8],
-      [10, 6, 4.3, 3.8, 4],
-      [15, 9, 5.4, 3.6, 3.5]
-    ])
+    expect(actual).to.eql({
+      x: [5, 10, 15],
+      y: [3, 6, 9],
+      '5.0': [3.2, 4.3, 5.4],
+      '10.0': [4, 3.8, 3.6],
+      '15.0': [4.8, 4, 3.5]
+    })
  })

  it('supports FTS5', async function () {
@@ -233,6 +292,8 @@ describe('SQLite extensions', function () {
      WHERE body MATCH '"full-text" NOT document'
      ORDER BY rank;
    `)
-    expect(actual.values).to.eql([['bar@localhost']])
+    expect(actual).to.eql({
+      sender: ['bar@localhost']
+    })
  })
 })
--- a/tests/lib/storedInquiries/_migrations.spec.js
+++ b/tests/lib/storedInquiries/_migrations.spec.js
@@ -0,0 +1,42 @@
+import { expect } from 'chai'
+import migrations from '@/lib/storedInquiries/_migrations'
+
+describe('_migrations.js', () => {
+  it('migrates from version 1 to the current', () => {
+    const oldInquiries = [
+      {
+        id: '123',
+        name: 'foo',
+        query: 'SELECT * FROM foo',
+        chart: { here_are: 'foo chart settings' },
+        createdAt: '2021-05-06T11:05:50.877Z'
+      },
+      {
+        id: '456',
+        name: 'bar',
+        query: 'SELECT * FROM bar',
+        chart: { here_are: 'bar chart settings' },
+        createdAt: '2021-05-07T11:05:50.877Z'
+      }
+    ]
+
+    expect(migrations._migrate(1, oldInquiries)).to.eql([
+      {
+        id: '123',
+        name: 'foo',
+        query: 'SELECT * FROM foo',
+        viewType: 'chart',
+        viewOptions: { here_are: 'foo chart settings' },
+        createdAt: '2021-05-06T11:05:50.877Z'
+      },
+      {
+        id: '456',
+        name: 'bar',
+        query: 'SELECT * FROM bar',
+        viewType: 'chart',
+        viewOptions: { here_are: 'bar chart settings' },
+        createdAt: '2021-05-07T11:05:50.877Z'
+      }
+    ])
+  })
+})
--- a/tests/lib/storedInquiries/storedInquiries.spec.js
+++ b/tests/lib/storedInquiries/storedInquiries.spec.js
@@ -0,0 +1,432 @@
+import { expect } from 'chai'
+import sinon from 'sinon'
+import storedInquiries from '@/lib/storedInquiries'
+import fu from '@/lib/utils/fileIo'
+
+describe('storedInquiries.js', () => {
+  beforeEach(() => {
+    localStorage.removeItem('myInquiries')
+    localStorage.removeItem('myQueries')
+  })
+
+  afterEach(() => {
+    sinon.restore()
+  })
+
+  it('getStoredInquiries returns emplty array when storage is empty', () => {
+    const inquiries = storedInquiries.getStoredInquiries()
+    expect(inquiries).to.eql([])
+  })
+
+  it('getStoredInquiries migrate and returns inquiries of v1', () => {
+    localStorage.setItem('myQueries', JSON.stringify([
+      {
+        id: '123',
+        name: 'foo',
+        query: 'SELECT * FROM foo',
+        chart: { here_are: 'foo chart settings' }
+      },
+      {
+        id: '456',
+        name: 'bar',
+        query: 'SELECT * FROM bar',
+        chart: { here_are: 'bar chart settings' }
+      }
+    ]))
+    const inquiries = storedInquiries.getStoredInquiries()
+    expect(inquiries).to.eql([
+      {
+        id: '123',
+        name: 'foo',
+        query: 'SELECT * FROM foo',
+        viewType: 'chart',
+        viewOptions: { here_are: 'foo chart settings' }
+      },
+      {
+        id: '456',
+        name: 'bar',
+        query: 'SELECT * FROM bar',
+        viewType: 'chart',
+        viewOptions: { here_are: 'bar chart settings' }
+      }
+    ])
+  })
+
+  it('updateStorage and getStoredInquiries', () => {
+    const data = [
+      { id: 1 },
+      { id: 2 }
+    ]
+    storedInquiries.updateStorage(data)
+    const inquiries = storedInquiries.getStoredInquiries()
+    expect(inquiries).to.eql(data)
+  })
+
+  it('duplicateInquiry', () => {
+    const now = new Date()
+    const nowPlusMinute = new Date(now.getTime() + 60 * 1000)
+    const base = {
+      id: 1,
+      name: 'foo',
+      query: 'SELECT * from foo',
+      viewType: 'chart',
+      viewOptions: [],
+      createdAt: new Date(2021, 0, 1),
+      isPredefined: true
+    }
+
+    const copy = storedInquiries.duplicateInquiry(base)
+    expect(copy).to.have.property('id').which.not.equal(base.id)
+    expect(copy).to.have.property('name').which.equal(base.name + ' Copy')
+    expect(copy).to.have.property('query').which.equal(base.query)
+    expect(copy).to.have.property('viewType').which.equal(base.viewType)
+    expect(copy).to.have.property('viewOptions').which.eql(base.viewOptions)
+    expect(copy).to.have.property('createdAt').which.within(now, nowPlusMinute)
+    expect(copy).to.not.have.property('isPredefined')
+  })
+
+  it('isTabNeedName returns false when the inquiry has a name and is not predefined', () => {
+    const tab = {
+      initName: 'foo'
+    }
+    expect(storedInquiries.isTabNeedName(tab)).to.equal(false)
+  })
+
+  it('isTabNeedName returns true when the inquiry has no name and is not predefined', () => {
+    const tab = {
+      initName: null,
+      tempName: 'Untitled'
+    }
+    expect(storedInquiries.isTabNeedName(tab)).to.equal(true)
+  })
+
+  it('isTabNeedName returns true when the inquiry is predefined', () => {
+    const tab = {
+      initName: 'foo',
+      isPredefined: true
+    }
+
+    expect(storedInquiries.isTabNeedName(tab)).to.equal(true)
+  })
+
+  it('serialiseInquiries', () => {
+    const inquiryList = [
+      {
+        id: 1,
+        name: 'foo',
+        query: 'SELECT from foo',
+        viewType: 'chart',
+        viewOptions: [],
+        createdAt: '2020-11-03T14:17:49.524Z',
+        isPredefined: true
+      },
+      {
+        id: 2,
+        name: 'bar',
+        query: 'SELECT from bar',
+        viewType: 'chart',
+        viewOptions: [],
+        createdAt: '2020-12-03T14:17:49.524Z'
+      }
+    ]
+
+    const str = storedInquiries.serialiseInquiries(inquiryList)
+    const parsedJson = JSON.parse(str)
+
+    expect(parsedJson.version).to.equal(2)
+    expect(parsedJson.inquiries).to.have.lengthOf(2)
+    expect(parsedJson.inquiries[1]).to.eql(inquiryList[1])
+    expect(parsedJson.inquiries[0]).to.eql({
+      id: 1,
+      name: 'foo',
+      query: 'SELECT from foo',
+      viewType: 'chart',
+      viewOptions: [],
+      createdAt: '2020-11-03T14:17:49.524Z'
+    })
+  })
+
+  it('deserialiseInquiries migrates inquiries', () => {
+    const str = `[
+      {
+        "id": 1,
+        "name": "foo",
+        "query": "select * from foo",
+        "chart": [],
+        "createdAt": "2020-11-03T14:17:49.524Z" 
+      },
+      {
+        "id": 2,
+        "name": "bar",
+        "query": "select * from bar",
+        "chart": [],
+        "createdAt": "2020-11-04T14:17:49.524Z" 
+      }
+    ]`
+
+    const inquiry = storedInquiries.deserialiseInquiries(str)
+    expect(inquiry).to.eql([
+      {
+        id: 1,
+        name: 'foo',
+        query: 'select * from foo',
+        viewType: 'chart',
+        viewOptions: [],
+        createdAt: '2020-11-03T14:17:49.524Z'
+      },
+      {
+        id: 2,
+        name: 'bar',
+        query: 'select * from bar',
+        viewType: 'chart',
+        viewOptions: [],
+        createdAt: '2020-11-04T14:17:49.524Z'
+      }
+    ])
+  })
+
+  it('deserialiseInquiries return array for one inquiry of v1', () => {
+    const str = `
+      {
+        "id": 1,
+        "name": "foo",
+        "query": "select * from foo",
+        "chart": [],
+        "createdAt": "2020-11-03T14:17:49.524Z" 
+      }
+    `
+
+    const inquiry = storedInquiries.deserialiseInquiries(str)
+    expect(inquiry).to.eql([{
+      id: 1,
+      name: 'foo',
+      query: 'select * from foo',
+      viewType: 'chart',
+      viewOptions: [],
+      createdAt: '2020-11-03T14:17:49.524Z'
+    }])
+  })
+
+  it('deserialiseInquiries generates new id to avoid duplication', () => {
+    storedInquiries.updateStorage([{ id: 1 }])
+    const str = `{
+      "version": 2,
+      "inquiries": [
+        {
+          "id": 1,
+          "name": "foo",
+          "query": "select * from foo",
+          "viewType": "chart",
+          "viewOptions": [],
+          "createdAt": "2020-11-03T14:17:49.524Z" 
+        },
+        {
+          "id": 2,
+          "name": "bar",
+          "query": "select * from bar",
+          "viewType": "chart",
+          "viewOptions": [],
+          "createdAt": "2020-11-04T14:17:49.524Z" 
+        }
+      ]
+    }`
+
+    const inquiries = storedInquiries.deserialiseInquiries(str)
+    const parsedStr = JSON.parse(str)
+    expect(inquiries[1]).to.eql(parsedStr.inquiries[1])
+    expect(inquiries[0].id).to.not.equal(parsedStr.inquiries[0].id)
+    expect(inquiries[0].id).to.not.equal(parsedStr.inquiries[0].id)
+    expect(inquiries[0].name).to.equal(parsedStr.inquiries[0].name)
+    expect(inquiries[0].query).to.equal(parsedStr.inquiries[0].query)
+    expect(inquiries[0].viewType).to.equal(parsedStr.inquiries[0].viewType)
+    expect(inquiries[0].viewOptions).to.eql(parsedStr.inquiries[0].viewOptions)
+    expect(inquiries[0].createdAt).to.equal(parsedStr.inquiries[0].createdAt)
+  })
+
+  it('importInquiries v1', async () => {
+    const str = `
+      {
+        "id": 1,
+        "name": "foo",
+        "query": "select * from foo",
+        "chart": [],
+        "createdAt": "2020-11-03T14:17:49.524Z" 
+      }
+    `
+    sinon.stub(fu, 'importFile').returns(Promise.resolve(str))
+    const inquiries = await storedInquiries.importInquiries()
+
+    expect(inquiries).to.eql([{
+      id: 1,
+      name: 'foo',
+      query: 'select * from foo',
+      viewType: 'chart',
+      viewOptions: [],
+      createdAt: '2020-11-03T14:17:49.524Z'
+    }])
+  })
+
+  it('importInquiries', async () => {
+    const str = `{
+      "version": 2,
+      "inquiries": [{
+        "id": 1,
+        "name": "foo",
+        "query": "select * from foo",
+        "viewType": "chart",
+        "viewOptions": [],
+        "createdAt": "2020-11-03T14:17:49.524Z" 
+      }]
+    }`
+    sinon.stub(fu, 'importFile').returns(Promise.resolve(str))
+    const inquiries = await storedInquiries.importInquiries()
+
+    expect(inquiries).to.eql([{
+      id: 1,
+      name: 'foo',
+      query: 'select * from foo',
+      viewType: 'chart',
+      viewOptions: [],
+      createdAt: '2020-11-03T14:17:49.524Z'
+    }])
+  })
+
+  it('readPredefinedInquiries old', async () => {
+    const str = `[
+      {
+        "id": 1,
+        "name": "foo",
+        "query": "select * from foo",
+        "chart": [],
+        "createdAt": "2020-11-03T14:17:49.524Z" 
+      }]
+    `
+    sinon.stub(fu, 'readFile').returns(Promise.resolve(new Response(str)))
+    const inquiries = await storedInquiries.readPredefinedInquiries()
+    expect(fu.readFile.calledOnceWith('./inquiries.json')).to.equal(true)
+    expect(inquiries).to.eql([
+      {
+        id: 1,
+        name: 'foo',
+        query: 'select * from foo',
+        viewType: 'chart',
+        viewOptions: [],
+        createdAt: '2020-11-03T14:17:49.524Z'
+      }])
+  })
+
+  it('readPredefinedInquiries', async () => {
+    const str = `{
+      "version": 2,
+      "inquiries": [
+      {
+        "id": 1,
+        "name": "foo",
+        "query": "select * from foo",
+        "viewType": "chart",
+        "viewOptions": [],
+        "createdAt": "2020-11-03T14:17:49.524Z" 
+      }]
+    }
+    `
+    sinon.stub(fu, 'readFile').returns(Promise.resolve(new Response(str)))
+    const inquiries = await storedInquiries.readPredefinedInquiries()
+    expect(fu.readFile.calledOnceWith('./inquiries.json')).to.equal(true)
+    expect(inquiries).to.eql([
+      {
+        id: 1,
+        name: 'foo',
+        query: 'select * from foo',
+        viewType: 'chart',
+        viewOptions: [],
+        createdAt: '2020-11-03T14:17:49.524Z'
+      }])
+  })
+
+  it('save adds new inquiry in the storage', () => {
+    const now = new Date()
+    const nowPlusMinute = new Date(now.getTime() + 60 * 1000)
+    const tab = {
+      id: 1,
+      query: 'select * from foo',
+      viewType: 'chart',
+      viewOptions: [],
+      initName: null,
+      $refs: {
+        dataView: {
+          getOptionsForSave () {
+            return ['chart']
+          }
+        }
+      }
+    }
+    const value = storedInquiries.save(tab, 'foo')
+    expect(value.id).to.equal(tab.id)
+    expect(value.name).to.equal('foo')
+    expect(value.query).to.equal(tab.query)
+    expect(value.viewOptions).to.eql(['chart'])
+    expect(value).to.have.property('createdAt').which.within(now, nowPlusMinute)
+    const inquiries = storedInquiries.getStoredInquiries()
+    expect(JSON.stringify(inquiries)).to.equal(JSON.stringify([value]))
+  })
+
+  it('save updates existing inquiry in the storage', () => {
+    const tab = {
+      id: 1,
+      query: 'select * from foo',
+      viewType: 'chart',
+      viewOptions: [],
+      initName: null,
+      $refs: {
+        dataView: {
+          getOptionsForSave () {
+            return ['chart']
+          }
+        }
+      }
+    }
+
+    const first = storedInquiries.save(tab, 'foo')
+
+    tab.initName = 'foo'
+    tab.query = 'select * from foo'
+    storedInquiries.save(tab)
+    const inquiries = storedInquiries.getStoredInquiries()
+    const second = inquiries[0]
+    expect(inquiries).has.lengthOf(1)
+    expect(second.id).to.equal(first.id)
+    expect(second.name).to.equal(first.name)
+    expect(second.query).to.equal(tab.query)
+    expect(second.viewOptions).to.eql(['chart'])
+    expect(new Date(second.createdAt).getTime()).to.equal(first.createdAt.getTime())
+  })
+
+  it("save adds a new inquiry with new id if it's based on predefined inquiry", () => {
+    const now = new Date()
+    const nowPlusMinute = new Date(now.getTime() + 60 * 1000)
+    const tab = {
+      id: 1,
+      query: 'select * from foo',
+      viewType: 'chart',
+      viewOptions: [],
+      initName: 'foo predefined',
+      $refs: {
+        dataView: {
+          getOptionsForSave () {
+            return ['chart']
+          }
+        }
+      },
+      isPredefined: true
+    }
+    storedInquiries.save(tab, 'foo')
+
+    const inquiries = storedInquiries.getStoredInquiries()
+    expect(inquiries).has.lengthOf(1)
+    expect(inquiries[0]).to.have.property('id').which.not.equal(tab.id)
+    expect(inquiries[0].name).to.equal('foo')
+    expect(inquiries[0].query).to.equal(tab.query)
+    expect(inquiries[0].viewOptions).to.eql(['chart'])
+    expect(new Date(inquiries[0].createdAt)).to.be.within(now, nowPlusMinute)
+  })
+})
--- a/tests/lib/storedQueries.spec.js
+++ b/tests/lib/storedQueries.spec.js
@@ -1,267 +0,0 @@
-import { expect } from 'chai'
-import sinon from 'sinon'
-import storedQueries from '@/lib/storedQueries'
-import fu from '@/lib/utils/fileIo'
-
-describe('storedQueries.js', () => {
-  beforeEach(() => {
-    localStorage.removeItem('myQueries')
-  })
-
-  afterEach(() => {
-    sinon.restore()
-  })
-
-  it('getStoredQueries returns emplty array when storage is empty', () => {
-    const queries = storedQueries.getStoredQueries()
-    expect(queries).to.eql([])
-  })
-
-  it('updateStorage and getStoredQueries', () => {
-    const data = [
-      { id: 1 },
-      { id: 2 }
-    ]
-    storedQueries.updateStorage(data)
-    const queries = storedQueries.getStoredQueries()
-    expect(queries).to.eql(data)
-  })
-
-  it('duplicateQuery', () => {
-    const now = new Date()
-    const nowPlusMinute = new Date(now.getTime() + 60 * 1000)
-    const base = {
-      id: 1,
-      name: 'foo',
-      query: 'SELECT * from foo',
-      chart: [],
-      createdAt: new Date(2021, 0, 1),
-      isPredefined: true
-    }
-
-    const copy = storedQueries.duplicateQuery(base)
-    expect(copy).to.have.property('id').which.not.equal(base.id)
-    expect(copy).to.have.property('name').which.equal(base.name + ' Copy')
-    expect(copy).to.have.property('query').which.equal(base.query)
-    expect(copy).to.have.property('chart').which.eql(base.chart)
-    expect(copy).to.have.property('createdAt').which.within(now, nowPlusMinute)
-    expect(copy).to.not.have.property('isPredefined')
-  })
-
-  it('isTabNeedName returns false when the query has a name and is not predefined', () => {
-    const tab = {
-      initName: 'foo'
-    }
-    expect(storedQueries.isTabNeedName(tab)).to.equal(false)
-  })
-
-  it('isTabNeedName returns true when the query has no name and is not predefined', () => {
-    const tab = {
-      initName: null,
-      tempName: 'Untitled'
-    }
-    expect(storedQueries.isTabNeedName(tab)).to.equal(true)
-  })
-
-  it('isTabNeedName returns true when the qiery is predefined', () => {
-    const tab = {
-      initName: 'foo',
-      isPredefined: true
-    }
-
-    expect(storedQueries.isTabNeedName(tab)).to.equal(true)
-  })
-
-  it('serialiseQueries', () => {
-    const queryList = [
-      {
-        id: 1,
-        name: 'foo',
-        query: 'SELECT from foo',
-        chart: [],
-        createdAt: '2020-11-03T14:17:49.524Z',
-        isPredefined: true
-      },
-      {
-        id: 2,
-        name: 'bar',
-        query: 'SELECT from bar',
-        chart: [],
-        createdAt: '2020-12-03T14:17:49.524Z'
-      }
-    ]
-
-    const str = storedQueries.serialiseQueries(queryList)
-    const parsedJson = JSON.parse(str)
-
-    expect(parsedJson).to.have.lengthOf(2)
-    expect(parsedJson[1]).to.eql(queryList[1])
-    expect(parsedJson[0].id).to.equal(queryList[0].id)
-    expect(parsedJson[0].name).to.equal(queryList[0].name)
-    expect(parsedJson[0].query).to.equal(queryList[0].query)
-    expect(parsedJson[0].chart).to.eql(queryList[0].chart)
-    expect(parsedJson[0].createdAt).to.eql(queryList[0].createdAt)
-    expect(parsedJson[0].chart).to.not.have.property('isPredefined')
-  })
-
-  it('deserialiseQueries return array for one query', () => {
-    const str = `
-      {
-        "id": 1,
-        "name": "foo",
-        "query": "select * from foo",
-        "chart": [],
-        "createdAt": "2020-11-03T14:17:49.524Z" 
-      }
-    `
-    const query = storedQueries.deserialiseQueries(str)
-    expect(query).to.eql([JSON.parse(str)])
-  })
-
-  it('deserialiseQueries generates new id to avoid duplication', () => {
-    storedQueries.updateStorage([{ id: 1 }])
-    const str = `[
-      {
-        "id": 1,
-        "name": "foo",
-        "query": "select * from foo",
-        "chart": [],
-        "createdAt": "2020-11-03T14:17:49.524Z" 
-      },
-      {
-        "id": 2,
-        "name": "bar",
-        "query": "select * from bar",
-        "chart": [],
-        "createdAt": "2020-11-04T14:17:49.524Z" 
-      }
-    ]`
-
-    const queries = storedQueries.deserialiseQueries(str)
-    const parsedStr = JSON.parse(str)
-    expect(queries[1]).to.eql(parsedStr[1])
-    expect(queries[0].id).to.not.equal(parsedStr[0].id)
-    expect(queries[0]).to.have.property('id')
-    expect(queries[0].id).to.not.equal(parsedStr[0].id)
-    expect(queries[0].name).to.equal(parsedStr[0].name)
-    expect(queries[0].query).to.equal(parsedStr[0].query)
-    expect(queries[0].chart).to.eql(parsedStr[0].chart)
-    expect(queries[0].createdAt).to.equal(parsedStr[0].createdAt)
-  })
-
-  it('importQueries', async () => {
-    const str = `
-      {
-        "id": 1,
-        "name": "foo",
-        "query": "select * from foo",
-        "chart": [],
-        "createdAt": "2020-11-03T14:17:49.524Z" 
-      }
-    `
-    sinon.stub(fu, 'importFile').returns(Promise.resolve(str))
-    const queries = await storedQueries.importQueries()
-
-    expect(queries).to.eql([JSON.parse(str)])
-  })
-
-  it('readPredefinedQueries', async () => {
-    const str = `
-      {
-        "id": 1,
-        "name": "foo",
-        "query": "select * from foo",
-        "chart": [],
-        "createdAt": "2020-11-03T14:17:49.524Z" 
-      }
-    `
-    sinon.stub(fu, 'readFile').returns(Promise.resolve(new Response(str)))
-    const queries = await storedQueries.readPredefinedQueries()
-    expect(fu.readFile.calledOnceWith('./queries.json')).to.equal(true)
-    expect(queries).to.eql(JSON.parse(str))
-  })
-
-  it('save adds new query in the storage', () => {
-    const now = new Date()
-    const nowPlusMinute = new Date(now.getTime() + 60 * 1000)
-    const tab = {
-      id: 1,
-      query: 'select * from foo',
-      chart: [],
-      initName: null,
-      $refs: {
-        chart: {
-          getChartStateForSave () {
-            return ['chart']
-          }
-        }
-      }
-    }
-    const value = storedQueries.save(tab, 'foo')
-    expect(value.id).to.equal(tab.id)
-    expect(value.name).to.equal('foo')
-    expect(value.query).to.equal(tab.query)
-    expect(value.chart).to.eql(['chart'])
-    expect(value).to.have.property('createdAt').which.within(now, nowPlusMinute)
-    const queries = storedQueries.getStoredQueries()
-    expect(JSON.stringify(queries)).to.equal(JSON.stringify([value]))
-  })
-
-  it('save updates existing query in the storage', () => {
-    const tab = {
-      id: 1,
-      query: 'select * from foo',
-      chart: [],
-      initName: null,
-      $refs: {
-        chart: {
-          getChartStateForSave () {
-            return ['chart']
-          }
-        }
-      }
-    }
-
-    const first = storedQueries.save(tab, 'foo')
-
-    tab.initName = 'foo'
-    tab.query = 'select * from foo'
-    storedQueries.save(tab)
-    const queries = storedQueries.getStoredQueries()
-    const second = queries[0]
-    expect(queries).has.lengthOf(1)
-    expect(second.id).to.equal(first.id)
-    expect(second.name).to.equal(first.name)
-    expect(second.query).to.equal(tab.query)
-    expect(second.chart).to.eql(['chart'])
-    expect(new Date(second.createdAt).getTime()).to.equal(first.createdAt.getTime())
-  })
-
-  it("save adds a new query with new id if it's based on predefined query", () => {
-    const now = new Date()
-    const nowPlusMinute = new Date(now.getTime() + 60 * 1000)
-    const tab = {
-      id: 1,
-      query: 'select * from foo',
-      chart: [],
-      initName: 'foo predefined',
-      $refs: {
-        chart: {
-          getChartStateForSave () {
-            return ['chart']
-          }
-        }
-      },
-      isPredefined: true
-    }
-    storedQueries.save(tab, 'foo')
-
-    const queries = storedQueries.getStoredQueries()
-    expect(queries).has.lengthOf(1)
-    expect(queries[0]).to.have.property('id').which.not.equal(tab.id)
-    expect(queries[0].name).to.equal('foo')
-    expect(queries[0].query).to.equal(tab.query)
-    expect(queries[0].chart).to.eql(['chart'])
-    expect(new Date(queries[0].createdAt)).to.be.within(now, nowPlusMinute)
-  })
-})
--- a/tests/store/actions.spec.js
+++ b/tests/store/actions.spec.js
@@ -10,15 +10,30 @@ describe('actions', () => {
      untitledLastIndex: 0
    }

-    const id = await addTab({ state })
-    expect(state.tabs[0].id).to.eql(id)
-    expect(state.tabs[0].name).to.eql(null)
-    expect(state.tabs[0].tempName).to.eql('Untitled')
-    expect(state.tabs[0].isUnsaved).to.eql(true)
+    let id = await addTab({ state })
+    expect(state.tabs[0]).to.eql({
+      id: id,
+      name: null,
+      tempName: 'Untitled',
+      viewType: 'chart',
+      viewOptions: undefined,
+      isSaved: false
+    })
    expect(state.untitledLastIndex).to.equal(1)
+
+    id = await addTab({ state })
+    expect(state.tabs[1]).to.eql({
+      id: id,
+      name: null,
+      tempName: 'Untitled 1',
+      viewType: 'chart',
+      viewOptions: undefined,
+      isSaved: false
+    })
+    expect(state.untitledLastIndex).to.equal(2)
  })

-  it('addTab adds tab from saved queries', async () => {
+  it('addTab adds tab from saved inquiries', async () => {
    const state = {
      tabs: [],
      untitledLastIndex: 0
@@ -28,22 +43,24 @@ describe('actions', () => {
      name: 'test',
      tempName: null,
      query: 'SELECT * from foo',
-      chart: {},
-      isUnsaved: false
+      viewType: 'chart',
+      viewOptions: {},
+      isSaved: true
    }
    await addTab({ state }, tab)
    expect(state.tabs[0]).to.eql(tab)
    expect(state.untitledLastIndex).to.equal(0)
  })

-  it("addTab doesn't add anything when the query is already opened", async () => {
+  it("addTab doesn't add anything when the inquiry is already opened", async () => {
    const tab1 = {
      id: 1,
      name: 'test',
      tempName: null,
      query: 'SELECT * from foo',
-      chart: {},
-      isUnsaved: false
+      viewType: 'chart',
+      viewOptions: {},
+      isSaved: true
    }

    const tab2 = {
@@ -51,8 +68,9 @@ describe('actions', () => {
      name: 'bar',
      tempName: null,
      query: 'SELECT * from bar',
-      chart: {},
-      isUnsaved: false
+      viewType: 'chart',
+      viewOptions: {},
+      isSaved: true
    }

    const state = {
--- a/tests/store/mutations.spec.js
+++ b/tests/store/mutations.spec.js
@@ -6,7 +6,7 @@ const {
  deleteTab,
  setCurrentTabId,
  setCurrentTab,
-  updatePredefinedQueries,
+  updatePredefinedInquiries,
  setDb
 } = mutations

@@ -23,14 +23,15 @@ describe('mutations', () => {
    expect(oldDb.shutDown.calledOnce).to.equal(true)
  })

-  it('updateTab (save)', () => {
+  it('updateTab - save', () => {
    const tab = {
      id: 1,
      name: 'test',
      tempName: null,
      query: 'SELECT * from foo',
-      chart: {},
-      isUnsaved: true,
+      viewType: 'chart',
+      viewOptions: { here_are: 'chart settings' },
+      isSaved: false,
      isPredefined: false
    }

@@ -39,7 +40,9 @@ describe('mutations', () => {
      id: 1,
      name: 'new test',
      query: 'SELECT * from bar',
-      isUnsaved: false
+      viewType: 'pivot',
+      viewOptions: { here_are: 'pivot settings' },
+      isSaved: true
    }

    const state = {
@@ -47,21 +50,26 @@ describe('mutations', () => {
    }

    updateTab(state, newTab)
-    expect(state.tabs[0].id).to.equal(1)
-    expect(state.tabs[0].name).to.equal('new test')
-    expect(state.tabs[0].tempName).to.equal(null)
-    expect(state.tabs[0].query).to.equal('SELECT * from bar')
-    expect(state.tabs[0].isUnsaved).to.equal(false)
+    expect(state.tabs[0]).to.eql({
+      id: 1,
+      name: 'new test',
+      tempName: null,
+      query: 'SELECT * from bar',
+      viewType: 'pivot',
+      viewOptions: { here_are: 'pivot settings' },
+      isSaved: true
+    })
  })

-  it('updateTab (save predefined)', () => {
+  it('updateTab - save predefined', () => {
    const tab = {
      id: 1,
      name: 'test',
      tempName: null,
      query: 'SELECT * from foo',
-      chart: {},
-      isUnsaved: true,
+      viewType: 'chart',
+      viewOptions: {},
+      isSaved: false,
      isPredefined: true
    }

@@ -70,8 +78,9 @@ describe('mutations', () => {
      id: 2,
      name: 'new test',
      query: 'SELECT * from bar',
-      chart: {},
-      isUnsaved: false
+      viewType: 'chart',
+      viewOptions: {},
+      isSaved: true
    }

    const state = {
@@ -85,18 +94,19 @@ describe('mutations', () => {
    expect(state.tabs[0].id).to.equal(2)
    expect(state.tabs[0].name).to.equal('new test')
    expect(state.tabs[0].query).to.equal('SELECT * from bar')
-    expect(state.tabs[0].isUnsaved).to.equal(false)
+    expect(state.tabs[0].isSaved).to.equal(true)
    expect(state.tabs[0].isPredefined).to.equal(undefined)
  })

-  it('updateTab (rename)', () => {
+  it('updateTab - rename', () => {
    const tab = {
      id: 1,
      name: 'test',
      tempName: null,
      query: 'SELECT * from foo',
-      chart: {},
-      isUnsaved: true
+      viewType: 'chart',
+      viewOptions: {},
+      isSaved: false
    }

    const newTab = {
@@ -114,23 +124,24 @@ describe('mutations', () => {
    expect(state.tabs[0].id).to.equal(1)
    expect(state.tabs[0].name).to.equal('new test')
    expect(state.tabs[0].query).to.equal('SELECT * from foo')
-    expect(state.tabs[0].isUnsaved).to.equal(true)
+    expect(state.tabs[0].isSaved).to.equal(false)
  })

-  it('updateTab (changes detected)', () => {
+  it('updateTab - changes detected', () => {
    const tab = {
      id: 1,
      name: 'test',
      tempName: null,
      query: 'SELECT * from foo',
-      chart: {},
-      isUnsaved: false,
+      viewType: 'chart',
+      viewOptions: {},
+      isSaved: true,
      isPredefined: true
    }

    const newTab = {
      index: 0,
-      isUnsaved: true
+      isSaved: false
    }

    const state = {
@@ -142,17 +153,18 @@ describe('mutations', () => {
    expect(state.tabs[0].id).to.equal(1)
    expect(state.tabs[0].name).to.equal('test')
    expect(state.tabs[0].query).to.equal('SELECT * from foo')
-    expect(state.tabs[0].isUnsaved).to.equal(true)
+    expect(state.tabs[0].isSaved).to.equal(false)
  })

-  it('deleteTab (opened, first)', () => {
+  it('deleteTab - opened, first', () => {
    const tab1 = {
      id: 1,
      name: 'foo',
      tempName: null,
      query: 'SELECT * from foo',
-      chart: {},
-      isUnsaved: false
+      viewType: 'chart',
+      viewOptions: {},
+      isSaved: true
    }

    const tab2 = {
@@ -160,8 +172,9 @@ describe('mutations', () => {
      name: 'bar',
      tempName: null,
      query: 'SELECT * from bar',
-      chart: {},
-      isUnsaved: false
+      viewType: 'chart',
+      viewOptions: {},
+      isSaved: true
    }

    const state = {
@@ -175,14 +188,15 @@ describe('mutations', () => {
    expect(state.currentTabId).to.equal(2)
  })

-  it('deleteTab (opened, last)', () => {
+  it('deleteTab - opened, last', () => {
    const tab1 = {
      id: 1,
      name: 'foo',
      tempName: null,
      query: 'SELECT * from foo',
-      chart: {},
-      isUnsaved: false
+      viewType: 'chart',
+      viewOptions: {},
+      isSaved: true
    }

    const tab2 = {
@@ -190,8 +204,9 @@ describe('mutations', () => {
      name: 'bar',
      tempName: null,
      query: 'SELECT * from bar',
-      chart: {},
-      isUnsaved: false
+      viewType: 'chart',
+      viewOptions: {},
+      isSaved: true
    }

    const state = {
@@ -205,14 +220,15 @@ describe('mutations', () => {
    expect(state.currentTabId).to.equal(1)
  })

-  it('deleteTab (opened, in the middle)', () => {
+  it('deleteTab - opened, in the middle', () => {
    const tab1 = {
      id: 1,
      name: 'foo',
      tempName: null,
      query: 'SELECT * from foo',
-      chart: {},
-      isUnsaved: false
+      viewType: 'chart',
+      viewOptions: {},
+      isSaved: true
    }

    const tab2 = {
@@ -220,8 +236,9 @@ describe('mutations', () => {
      name: 'bar',
      tempName: null,
      query: 'SELECT * from bar',
-      chart: {},
-      isUnsaved: false
+      viewType: 'chart',
+      viewOptions: {},
+      isSaved: true
    }

    const tab3 = {
@@ -229,8 +246,9 @@ describe('mutations', () => {
      name: 'foobar',
      tempName: null,
      query: 'SELECT * from foobar',
-      chart: {},
-      isUnsaved: false
+      viewType: 'chart',
+      viewOptions: {},
+      isSaved: true
    }

    const state = {
@@ -245,14 +263,15 @@ describe('mutations', () => {
    expect(state.currentTabId).to.equal(3)
  })

-  it('deleteTab (opened, single)', () => {
+  it('deleteTab - opened, single', () => {
    const tab1 = {
      id: 1,
      name: 'foo',
      tempName: null,
      query: 'SELECT * from foo',
-      chart: {},
-      isUnsaved: false
+      viewType: 'chart',
+      viewOptions: {},
+      isSaved: true
    }

    const state = {
@@ -265,14 +284,15 @@ describe('mutations', () => {
    expect(state.currentTabId).to.equal(null)
  })

-  it('deleteTab (not opened)', () => {
+  it('deleteTab - not opened', () => {
    const tab1 = {
      id: 1,
      name: 'foo',
      tempName: null,
      query: 'SELECT * from foo',
-      chart: {},
-      isUnsaved: false
+      viewType: 'chart',
+      viewOptions: {},
+      isSaved: true
    }

    const tab2 = {
@@ -280,8 +300,9 @@ describe('mutations', () => {
      name: 'bar',
      tempName: null,
      query: 'SELECT * from bar',
-      chart: {},
-      isUnsaved: false
+      viewType: 'chart',
+      viewOptions: {},
+      isSaved: true
    }

    const state = {
@@ -313,44 +334,47 @@ describe('mutations', () => {
    expect(state.currentTab).to.eql({ id: 2 })
  })

-  it('updatePredefinedQueries (single)', () => {
-    const query = {
+  it('updatePredefinedInquiries - single', () => {
+    const inquiry = {
      id: 1,
      name: 'foo',
      query: 'SELECT * FROM foo',
-      chart: {},
+      viewType: 'chart',
+      viewOptions: {},
      createdAt: '2020-11-07T20:57:04.492Z'
    }

    const state = {
-      predefinedQueries: []
+      predefinedInquiries: []
    }

-    updatePredefinedQueries(state, query)
-    expect(state.predefinedQueries).to.eql([query])
+    updatePredefinedInquiries(state, inquiry)
+    expect(state.predefinedInquiries).to.eql([inquiry])
  })

-  it('updatePredefinedQueries (array)', () => {
-    const queries = [{
+  it('updatePredefinedInquiries - array', () => {
+    const inquiries = [{
      id: 1,
      name: 'foo',
      query: 'SELECT * FROM foo',
-      chart: {},
+      viewType: 'chart',
+      viewOptions: {},
      createdAt: '2020-11-07T20:57:04.492Z'
    },
    {
      id: 2,
      name: 'bar',
      query: 'SELECT * FROM bar',
-      chart: {},
+      viewType: 'chart',
+      viewOptions: {},
      createdAt: '2020-11-07T20:57:04.492Z'
    }]

    const state = {
-      predefinedQueries: []
+      predefinedInquiries: []
    }

-    updatePredefinedQueries(state, queries)
-    expect(state.predefinedQueries).to.eql(queries)
+    updatePredefinedInquiries(state, inquiries)
+    expect(state.predefinedInquiries).to.eql(inquiries)
  })
 })
--- a/tests/tooltipMixin.spec.js
+++ b/tests/tooltipMixin.spec.js
@@ -3,6 +3,16 @@ import { mount } from '@vue/test-utils'
 import tooltipMixin from '@/tooltipMixin'

 describe('tooltipMixin.js', () => {
+  let container
+  beforeEach(() => {
+    container = document.createElement('div')
+    document.body.appendChild(container)
+  })
+
+  afterEach(() => {
+    container.remove()
+  })
+
  it('tooltip is hidden in initial', () => {
    const component = {
      template: '<div :style="tooltipStyle"></div>',
@@ -12,13 +22,16 @@ describe('tooltipMixin.js', () => {
    expect(wrapper.find('div').isVisible()).to.equal(false)
  })

-  it('tooltipStyle is correct when showTooltip', async () => {
+  it('tooltipStyle is correct when showTooltip: top-right', async () => {
    const component = {
-      template: '<div :style="tooltipStyle"></div>',
+      template: '<div :style="{...tooltipStyle, width: \'100px\'}" ref="tooltip"></div>',
      mixins: [tooltipMixin]
    }
-    const wrapper = mount(component)
-    await wrapper.vm.showTooltip(new MouseEvent('mouseover', {
+
+    const wrapper = mount(component, { attachTo: container })
+
+    // by default top-right
+    await wrapper.vm.showTooltip(new MouseEvent('mouseenter', {
      clientX: 10,
      clientY: 20
    }))
@@ -30,13 +43,73 @@ describe('tooltipMixin.js', () => {
    expect(wrapper.find('div').isVisible()).to.equal(true)
  })

+  it('tooltipStyle is correct when showTooltip: top-left', async () => {
+    const component = {
+      template: '<div :style="{...tooltipStyle, width: \'100px\'}" ref="tooltip"></div>',
+      mixins: [tooltipMixin]
+    }
+    const wrapper = mount(component, { attachTo: container })
+
+    await wrapper.vm.showTooltip(new MouseEvent('mouseenter', {
+      clientX: 212,
+      clientY: 20
+    }), 'top-left')
+
+    expect(wrapper.vm.tooltipStyle).to.eql({
+      visibility: 'visible',
+      top: '8px',
+      left: '100px'
+    })
+
+    expect(wrapper.find('div').isVisible()).to.equal(true)
+  })
+
+  it('tooltipStyle is correct when showTooltip: bottom-right', async () => {
+    const component = {
+      template: '<div :style="{...tooltipStyle, width: \'100px\'}" ref="tooltip"></div>',
+      mixins: [tooltipMixin]
+    }
+    const wrapper = mount(component, { attachTo: container })
+
+    await wrapper.vm.showTooltip(new MouseEvent('mouseenter', {
+      clientX: 10,
+      clientY: 20
+    }), 'bottom-right')
+    expect(wrapper.vm.tooltipStyle).to.eql({
+      visibility: 'visible',
+      top: '32px',
+      left: '22px'
+    })
+    expect(wrapper.find('div').isVisible()).to.equal(true)
+  })
+
+  it('tooltipStyle is correct when showTooltip: bottom-left', async () => {
+    const component = {
+      template: '<div :style="{...tooltipStyle, width: \'100px\'}" ref="tooltip"></div>',
+      mixins: [tooltipMixin]
+    }
+    const wrapper = mount(component, { attachTo: container })
+
+    await wrapper.vm.showTooltip(new MouseEvent('mouseenter', {
+      clientX: 212,
+      clientY: 20
+    }), 'bottom-left')
+
+    expect(wrapper.vm.tooltipStyle).to.eql({
+      visibility: 'visible',
+      top: '32px',
+      left: '100px'
+    })
+    expect(wrapper.find('div').isVisible()).to.equal(true)
+  })
+
  it('tooltip is not visible after hideTooltip', async () => {
    const component = {
      template: '<div :style="tooltipStyle"></div>',
      mixins: [tooltipMixin]
    }
    const wrapper = mount(component)
-    await wrapper.vm.showTooltip(new MouseEvent('mouseover', {
+    await wrapper.vm.showTooltip(new MouseEvent('mouseenter', {
      clientX: 10,
      clientY: 20
    }))
--- a/tests/views/MainView/MyQueries/MyQueries.spec.js
+++ b/tests/views/MainView/MyQueries/MyQueries.spec.js
--- a/tests/views/MainView/MainMenu.spec.js
+++ b/tests/views/MainView/MainMenu.spec.js
@@ -3,7 +3,7 @@ import sinon from 'sinon'
 import { mount, shallowMount, createWrapper } from '@vue/test-utils'
 import Vuex from 'vuex'
 import MainMenu from '@/views/Main/MainMenu'
-import storedQueries from '@/lib/storedQueries'
+import storedInquiries from '@/lib/storedInquiries'

 let wrapper = null

@@ -16,91 +16,63 @@ describe('MainMenu.vue', () => {
    wrapper.destroy()
  })

-  it('Run and Save are visible only on /editor page', async () => {
+  it('Create and Save are visible only on /workspace page', async () => {
    const state = {
      currentTab: { query: '', execute: sinon.stub() },
      tabs: [{}],
      db: {}
    }
    const store = new Vuex.Store({ state })
-    const $route = { path: '/editor' }
+    const $route = { path: '/workspace' }
    // mount the component
    wrapper = shallowMount(MainMenu, {
      store,
      mocks: { $route },
      stubs: ['router-link']
    })
-    expect(wrapper.find('#run-btn').exists()).to.equal(true)
-    expect(wrapper.find('#run-btn').isVisible()).to.equal(true)
    expect(wrapper.find('#save-btn').exists()).to.equal(true)
    expect(wrapper.find('#save-btn').isVisible()).to.equal(true)
    expect(wrapper.find('#create-btn').exists()).to.equal(true)
    expect(wrapper.find('#create-btn').isVisible()).to.equal(true)

-    await wrapper.vm.$set(wrapper.vm.$route, 'path', '/my-queries')
-    expect(wrapper.find('#run-btn').exists()).to.equal(false)
+    await wrapper.vm.$set(wrapper.vm.$route, 'path', '/inquiries')
    expect(wrapper.find('#save-btn').exists()).to.equal(true)
    expect(wrapper.find('#save-btn').isVisible()).to.equal(false)
    expect(wrapper.find('#create-btn').exists()).to.equal(true)
    expect(wrapper.find('#create-btn').isVisible()).to.equal(true)
  })

-  it('Run and Save are not visible if there is no tabs', () => {
+  it('Save is not visible if there is no tabs', () => {
    const state = {
      currentTab: null,
      tabs: [{}],
      db: {}
    }
    const store = new Vuex.Store({ state })
-    const $route = { path: '/editor' }
+    const $route = { path: '/workspace' }
    wrapper = shallowMount(MainMenu, {
      store,
      mocks: { $route },
      stubs: ['router-link']
    })
-    expect(wrapper.find('#run-btn').exists()).to.equal(false)
    expect(wrapper.find('#save-btn').exists()).to.equal(true)
    expect(wrapper.find('#save-btn').isVisible()).to.equal(false)
    expect(wrapper.find('#create-btn').exists()).to.equal(true)
    expect(wrapper.find('#create-btn').isVisible()).to.equal(true)
  })

-  it('Run is disabled if there is no db or no query', async () => {
-    const state = {
-      currentTab: { query: 'SELECT * FROM foo', execute: sinon.stub() },
-      tabs: [{}],
-      db: null
-    }
-    const store = new Vuex.Store({ state })
-    const $route = { path: '/editor' }
-
-    wrapper = shallowMount(MainMenu, {
-      store,
-      mocks: { $route },
-      stubs: ['router-link']
-    })
-    const vm = wrapper.vm
-    expect(wrapper.find('#run-btn').element.disabled).to.equal(true)
-
-    await vm.$set(state, 'db', {})
-    expect(wrapper.find('#run-btn').element.disabled).to.equal(false)
-
-    await vm.$set(state.currentTab, 'query', '')
-    expect(wrapper.find('#run-btn').element.disabled).to.equal(true)
-  })
-
-  it('Save is disabled if current tab.isUnsaved is false', async () => {
+  it('Save is disabled if current tab.isSaved is true', async () => {
    const state = {
      currentTab: {
        query: 'SELECT * FROM foo',
        execute: sinon.stub(),
        tabIndex: 0
      },
-      tabs: [{ isUnsaved: true }],
+      tabs: [{ isSaved: false }],
      db: {}
    }
    const store = new Vuex.Store({ state })
-    const $route = { path: '/editor' }
+    const $route = { path: '/workspace' }

    wrapper = shallowMount(MainMenu, {
      store,
@@ -110,7 +82,7 @@ describe('MainMenu.vue', () => {
    const vm = wrapper.vm
    expect(wrapper.find('#save-btn').element.disabled).to.equal(false)

-    await vm.$set(state.tabs[0], 'isUnsaved', false)
+    await vm.$set(state.tabs[0], 'isSaved', true)
    expect(wrapper.find('#save-btn').element.disabled).to.equal(true)
  })

@@ -121,18 +93,18 @@ describe('MainMenu.vue', () => {
        execute: sinon.stub(),
        tabIndex: 0
      },
-      tabs: [{ isUnsaved: true }],
+      tabs: [{ isSaved: false }],
      db: {}
    }
-    const newQueryId = 1
+    const newInquiryId = 1
    const actions = {
-      addTab: sinon.stub().resolves(newQueryId)
+      addTab: sinon.stub().resolves(newInquiryId)
    }
    const mutations = {
      setCurrentTabId: sinon.stub()
    }
    const store = new Vuex.Store({ state, mutations, actions })
-    const $route = { path: '/editor' }
+    const $route = { path: '/workspace' }
    const $router = { push: sinon.stub() }

    wrapper = shallowMount(MainMenu, {
@@ -144,29 +116,29 @@ describe('MainMenu.vue', () => {
    await wrapper.find('#create-btn').trigger('click')
    expect(actions.addTab.calledOnce).to.equal(true)
    await actions.addTab.returnValues[0]
-    expect(mutations.setCurrentTabId.calledOnceWith(state, newQueryId)).to.equal(true)
+    expect(mutations.setCurrentTabId.calledOnceWith(state, newInquiryId)).to.equal(true)
    expect($router.push.calledOnce).to.equal(false)
  })

-  it('Creates a tab and redirects to editor', async () => {
+  it('Creates a tab and redirects to workspace', async () => {
    const state = {
      currentTab: {
        query: 'SELECT * FROM foo',
        execute: sinon.stub(),
        tabIndex: 0
      },
-      tabs: [{ isUnsaved: true }],
+      tabs: [{ isSaved: false }],
      db: {}
    }
-    const newQueryId = 1
+    const newInquiryId = 1
    const actions = {
-      addTab: sinon.stub().resolves(newQueryId)
+      addTab: sinon.stub().resolves(newInquiryId)
    }
    const mutations = {
      setCurrentTabId: sinon.stub()
    }
    const store = new Vuex.Store({ state, mutations, actions })
-    const $route = { path: '/my-queries' }
+    const $route = { path: '/inquiries' }
    const $router = { push: sinon.stub() }

    wrapper = shallowMount(MainMenu, {
@@ -178,11 +150,11 @@ describe('MainMenu.vue', () => {
    await wrapper.find('#create-btn').trigger('click')
    expect(actions.addTab.calledOnce).to.equal(true)
    await actions.addTab.returnValues[0]
-    expect(mutations.setCurrentTabId.calledOnceWith(state, newQueryId)).to.equal(true)
+    expect(mutations.setCurrentTabId.calledOnceWith(state, newInquiryId)).to.equal(true)
    expect($router.push.calledOnce).to.equal(true)
  })

-  it('Ctrl R calls currentTab.execute if running is enabled and route.path is "/editor"',
+  it('Ctrl R calls currentTab.execute if running is enabled and route.path is "/workspace"',
    async () => {
      const state = {
        currentTab: {
@@ -190,11 +162,11 @@ describe('MainMenu.vue', () => {
          execute: sinon.stub(),
          tabIndex: 0
        },
-        tabs: [{ isUnsaved: true }],
+        tabs: [{ isSaved: false }],
        db: {}
      }
      const store = new Vuex.Store({ state })
-      const $route = { path: '/editor' }
+      const $route = { path: '/workspace' }
      const $router = { push: sinon.stub() }

      wrapper = shallowMount(MainMenu, {
@@ -205,29 +177,29 @@ describe('MainMenu.vue', () => {

      const ctrlR = new KeyboardEvent('keydown', { key: 'r', ctrlKey: true })
      const metaR = new KeyboardEvent('keydown', { key: 'r', metaKey: true })
-      // Running is enabled and route path is editor
+      // Running is enabled and route path is workspace
      document.dispatchEvent(ctrlR)
      expect(state.currentTab.execute.calledOnce).to.equal(true)
      document.dispatchEvent(metaR)
      expect(state.currentTab.execute.calledTwice).to.equal(true)

-      // Running is disabled and route path is editor
+      // Running is disabled and route path is workspace
      await wrapper.vm.$set(state, 'db', null)
      document.dispatchEvent(ctrlR)
      expect(state.currentTab.execute.calledTwice).to.equal(true)
      document.dispatchEvent(metaR)
      expect(state.currentTab.execute.calledTwice).to.equal(true)

-      // Running is enabled and route path is not editor
+      // Running is enabled and route path is not workspace
      await wrapper.vm.$set(state, 'db', {})
-      await wrapper.vm.$set($route, 'path', '/my-queries')
+      await wrapper.vm.$set($route, 'path', '/inquiries')
      document.dispatchEvent(ctrlR)
      expect(state.currentTab.execute.calledTwice).to.equal(true)
      document.dispatchEvent(metaR)
      expect(state.currentTab.execute.calledTwice).to.equal(true)
    })

-  it('Ctrl Enter calls currentTab.execute if running is enabled and route.path is "/editor"',
+  it('Ctrl Enter calls currentTab.execute if running is enabled and route.path is "/workspace"',
    async () => {
      const state = {
        currentTab: {
@@ -235,11 +207,11 @@ describe('MainMenu.vue', () => {
          execute: sinon.stub(),
          tabIndex: 0
        },
-        tabs: [{ isUnsaved: true }],
+        tabs: [{ isSaved: false }],
        db: {}
      }
      const store = new Vuex.Store({ state })
-      const $route = { path: '/editor' }
+      const $route = { path: '/workspace' }
      const $router = { push: sinon.stub() }

      wrapper = shallowMount(MainMenu, {
@@ -250,63 +222,63 @@ describe('MainMenu.vue', () => {

      const ctrlEnter = new KeyboardEvent('keydown', { key: 'Enter', ctrlKey: true })
      const metaEnter = new KeyboardEvent('keydown', { key: 'Enter', metaKey: true })
-      // Running is enabled and route path is editor
+      // Running is enabled and route path is workspace
      document.dispatchEvent(ctrlEnter)
      expect(state.currentTab.execute.calledOnce).to.equal(true)
      document.dispatchEvent(metaEnter)
      expect(state.currentTab.execute.calledTwice).to.equal(true)

-      // Running is disabled and route path is editor
+      // Running is disabled and route path is workspace
      await wrapper.vm.$set(state, 'db', null)
      document.dispatchEvent(ctrlEnter)
      expect(state.currentTab.execute.calledTwice).to.equal(true)
      document.dispatchEvent(metaEnter)
      expect(state.currentTab.execute.calledTwice).to.equal(true)

-      // Running is enabled and route path is not editor
+      // Running is enabled and route path is not workspace
      await wrapper.vm.$set(state, 'db', {})
-      await wrapper.vm.$set($route, 'path', '/my-queries')
+      await wrapper.vm.$set($route, 'path', '/inquiries')
      document.dispatchEvent(ctrlEnter)
      expect(state.currentTab.execute.calledTwice).to.equal(true)
      document.dispatchEvent(metaEnter)
      expect(state.currentTab.execute.calledTwice).to.equal(true)
    })

-  it('Ctrl B calls createNewQuery', async () => {
+  it('Ctrl B calls createNewInquiry', async () => {
    const state = {
      currentTab: {
        query: 'SELECT * FROM foo',
        execute: sinon.stub(),
        tabIndex: 0
      },
-      tabs: [{ isUnsaved: true }],
+      tabs: [{ isSaved: false }],
      db: {}
    }
    const store = new Vuex.Store({ state })
-    const $route = { path: '/editor' }
+    const $route = { path: '/workspace' }

    wrapper = shallowMount(MainMenu, {
      store,
      mocks: { $route },
      stubs: ['router-link']
    })
-    sinon.stub(wrapper.vm, 'createNewQuery')
+    sinon.stub(wrapper.vm, 'createNewInquiry')

    const ctrlB = new KeyboardEvent('keydown', { key: 'b', ctrlKey: true })
    const metaB = new KeyboardEvent('keydown', { key: 'b', metaKey: true })
    document.dispatchEvent(ctrlB)
-    expect(wrapper.vm.createNewQuery.calledOnce).to.equal(true)
+    expect(wrapper.vm.createNewInquiry.calledOnce).to.equal(true)
    document.dispatchEvent(metaB)
-    expect(wrapper.vm.createNewQuery.calledTwice).to.equal(true)
+    expect(wrapper.vm.createNewInquiry.calledTwice).to.equal(true)

-    await wrapper.vm.$set($route, 'path', '/my-queries')
+    await wrapper.vm.$set($route, 'path', '/inquiries')
    document.dispatchEvent(ctrlB)
-    expect(wrapper.vm.createNewQuery.calledThrice).to.equal(true)
+    expect(wrapper.vm.createNewInquiry.calledThrice).to.equal(true)
    document.dispatchEvent(metaB)
-    expect(wrapper.vm.createNewQuery.callCount).to.equal(4)
+    expect(wrapper.vm.createNewInquiry.callCount).to.equal(4)
  })

-  it('Ctrl S calls checkQueryBeforeSave if the tab is unsaved and route path is /editor',
+  it('Ctrl S calls checkInquiryBeforeSave if the tab is unsaved and route path is /workspace',
    async () => {
      const state = {
        currentTab: {
@@ -314,44 +286,44 @@ describe('MainMenu.vue', () => {
          execute: sinon.stub(),
          tabIndex: 0
        },
-        tabs: [{ isUnsaved: true }],
+        tabs: [{ isSaved: false }],
        db: {}
      }
      const store = new Vuex.Store({ state })
-      const $route = { path: '/editor' }
+      const $route = { path: '/workspace' }

      wrapper = shallowMount(MainMenu, {
        store,
        mocks: { $route },
        stubs: ['router-link']
      })
-      sinon.stub(wrapper.vm, 'checkQueryBeforeSave')
+      sinon.stub(wrapper.vm, 'checkInquiryBeforeSave')

      const ctrlS = new KeyboardEvent('keydown', { key: 's', ctrlKey: true })
      const metaS = new KeyboardEvent('keydown', { key: 's', metaKey: true })
-      // tab is unsaved and route is /editor
+      // tab is unsaved and route is /workspace
      document.dispatchEvent(ctrlS)
-      expect(wrapper.vm.checkQueryBeforeSave.calledOnce).to.equal(true)
+      expect(wrapper.vm.checkInquiryBeforeSave.calledOnce).to.equal(true)
      document.dispatchEvent(metaS)
-      expect(wrapper.vm.checkQueryBeforeSave.calledTwice).to.equal(true)
+      expect(wrapper.vm.checkInquiryBeforeSave.calledTwice).to.equal(true)

-      // tab is saved and route is /editor
-      await wrapper.vm.$set(state.tabs[0], 'isUnsaved', false)
+      // tab is saved and route is /workspace
+      await wrapper.vm.$set(state.tabs[0], 'isSaved', true)
      document.dispatchEvent(ctrlS)
-      expect(wrapper.vm.checkQueryBeforeSave.calledTwice).to.equal(true)
+      expect(wrapper.vm.checkInquiryBeforeSave.calledTwice).to.equal(true)
      document.dispatchEvent(metaS)
-      expect(wrapper.vm.checkQueryBeforeSave.calledTwice).to.equal(true)
+      expect(wrapper.vm.checkInquiryBeforeSave.calledTwice).to.equal(true)

-      // tab is unsaved and route is not /editor
-      await wrapper.vm.$set($route, 'path', '/my-queries')
-      await wrapper.vm.$set(state.tabs[0], 'isUnsaved', true)
+      // tab is unsaved and route is not /workspace
+      await wrapper.vm.$set($route, 'path', '/inquiries')
+      await wrapper.vm.$set(state.tabs[0], 'isSaved', false)
      document.dispatchEvent(ctrlS)
-      expect(wrapper.vm.checkQueryBeforeSave.calledTwice).to.equal(true)
+      expect(wrapper.vm.checkInquiryBeforeSave.calledTwice).to.equal(true)
      document.dispatchEvent(metaS)
-      expect(wrapper.vm.checkQueryBeforeSave.calledTwice).to.equal(true)
+      expect(wrapper.vm.checkInquiryBeforeSave.calledTwice).to.equal(true)
    })

-  it('Saves the query when no need the new name',
+  it('Saves the inquiry when no need the new name',
    async () => {
      const state = {
        currentTab: {
@@ -359,20 +331,21 @@ describe('MainMenu.vue', () => {
          execute: sinon.stub(),
          tabIndex: 0
        },
-        tabs: [{ id: 1, name: 'foo', isUnsaved: true }],
+        tabs: [{ id: 1, name: 'foo', isSaved: false }],
        db: {}
      }
      const mutations = {
        updateTab: sinon.stub()
      }
      const store = new Vuex.Store({ state, mutations })
-      const $route = { path: '/editor' }
-      sinon.stub(storedQueries, 'isTabNeedName').returns(false)
-      sinon.stub(storedQueries, 'save').returns({
+      const $route = { path: '/workspace' }
+      sinon.stub(storedInquiries, 'isTabNeedName').returns(false)
+      sinon.stub(storedInquiries, 'save').returns({
        name: 'foo',
        id: 1,
        query: 'SELECT * FROM foo',
-        chart: []
+        viewType: 'chart',
+        viewOptions: []
      })

      wrapper = mount(MainMenu, {
@@ -386,8 +359,8 @@ describe('MainMenu.vue', () => {
      // check that the dialog is closed
      expect(wrapper.find('[data-modal="save"]').exists()).to.equal(false)

-      // check that the query was saved via storedQueries.save (newName='')
-      expect(storedQueries.save.calledOnceWith(state.currentTab, '')).to.equal(true)
+      // check that the inquiry was saved via storedInquiries.save (newName='')
+      expect(storedInquiries.save.calledOnceWith(state.currentTab, '')).to.equal(true)

      // check that the tab was updated
      expect(mutations.updateTab.calledOnceWith(state, sinon.match({
@@ -395,12 +368,13 @@ describe('MainMenu.vue', () => {
        name: 'foo',
        id: 1,
        query: 'SELECT * FROM foo',
-        chart: [],
-        isUnsaved: false
+        viewType: 'chart',
+        viewOptions: [],
+        isSaved: true
      }))).to.equal(true)

-      // check that 'querySaved' event was triggered on $root
-      expect(createWrapper(wrapper.vm.$root).emitted('querySaved')).to.have.lengthOf(1)
+      // check that 'inquirySaved' event was triggered on $root
+      expect(createWrapper(wrapper.vm.$root).emitted('inquirySaved')).to.have.lengthOf(1)
    })

  it('Shows en error when the new name is needed but not specifyied', async () => {
@@ -410,20 +384,21 @@ describe('MainMenu.vue', () => {
        execute: sinon.stub(),
        tabIndex: 0
      },
-      tabs: [{ id: 1, name: null, tempName: 'Untitled', isUnsaved: true }],
+      tabs: [{ id: 1, name: null, tempName: 'Untitled', isSaved: false }],
      db: {}
    }
    const mutations = {
      updateTab: sinon.stub()
    }
    const store = new Vuex.Store({ state, mutations })
-    const $route = { path: '/editor' }
-    sinon.stub(storedQueries, 'isTabNeedName').returns(true)
-    sinon.stub(storedQueries, 'save').returns({
+    const $route = { path: '/workspace' }
+    sinon.stub(storedInquiries, 'isTabNeedName').returns(true)
+    sinon.stub(storedInquiries, 'save').returns({
      name: 'foo',
      id: 1,
      query: 'SELECT * FROM foo',
-      chart: []
+      viewType: 'chart',
+      viewOptions: []
    })

    wrapper = mount(MainMenu, {
@@ -444,31 +419,32 @@ describe('MainMenu.vue', () => {
      .trigger('click')

    // check that we have an error message and dialog is still open
-    expect(wrapper.find('.text-field-error').text()).to.equal('Query name can\'t be empty')
+    expect(wrapper.find('.text-field-error').text()).to.equal('Inquiry name can\'t be empty')
    expect(wrapper.find('[data-modal="save"]').exists()).to.equal(true)
  })

-  it('Saves the query with a new name', async () => {
+  it('Saves the inquiry with a new name', async () => {
    const state = {
      currentTab: {
        query: 'SELECT * FROM foo',
        execute: sinon.stub(),
        tabIndex: 0
      },
-      tabs: [{ id: 1, name: null, tempName: 'Untitled', isUnsaved: true }],
+      tabs: [{ id: 1, name: null, tempName: 'Untitled', isSaved: false }],
      db: {}
    }
    const mutations = {
      updateTab: sinon.stub()
    }
    const store = new Vuex.Store({ state, mutations })
-    const $route = { path: '/editor' }
-    sinon.stub(storedQueries, 'isTabNeedName').returns(true)
-    sinon.stub(storedQueries, 'save').returns({
+    const $route = { path: '/workspace' }
+    sinon.stub(storedInquiries, 'isTabNeedName').returns(true)
+    sinon.stub(storedInquiries, 'save').returns({
      name: 'foo',
      id: 1,
      query: 'SELECT * FROM foo',
-      chart: []
+      viewType: 'chart',
+      viewOptions: []
    })

    wrapper = mount(MainMenu, {
@@ -494,8 +470,8 @@ describe('MainMenu.vue', () => {
    // check that the dialog is closed
    expect(wrapper.find('[data-modal="save"]').exists()).to.equal(false)

-    // check that the query was saved via storedQueries.save (newName='foo')
-    expect(storedQueries.save.calledOnceWith(state.currentTab, 'foo')).to.equal(true)
+    // check that the inquiry was saved via storedInquiries.save (newName='foo')
+    expect(storedInquiries.save.calledOnceWith(state.currentTab, 'foo')).to.equal(true)

    // check that the tab was updated
    expect(mutations.updateTab.calledOnceWith(state, sinon.match({
@@ -503,15 +479,16 @@ describe('MainMenu.vue', () => {
      name: 'foo',
      id: 1,
      query: 'SELECT * FROM foo',
-      chart: [],
-      isUnsaved: false
+      viewType: 'chart',
+      viewOptions: [],
+      isSaved: true
    }))).to.equal(true)

-    // check that 'querySaved' event was triggered on $root
-    expect(createWrapper(wrapper.vm.$root).emitted('querySaved')).to.have.lengthOf(1)
+    // check that 'inquirySaved' event was triggered on $root
+    expect(createWrapper(wrapper.vm.$root).emitted('inquirySaved')).to.have.lengthOf(1)
  })

-  it('Saves a predefined query with a new name', async () => {
+  it('Saves a predefined inquiry with a new name', async () => {
    const state = {
      currentTab: {
        query: 'SELECT * FROM foo',
@@ -525,22 +502,24 @@ describe('MainMenu.vue', () => {
            [2, 'Drako Malfoy']
          ]
        },
-        view: 'chart'
+        viewType: 'chart',
+        viewOptions: []
      },
-      tabs: [{ id: 1, name: 'foo', isUnsaved: true, isPredefined: true }],
+      tabs: [{ id: 1, name: 'foo', isSaved: false, isPredefined: true }],
      db: {}
    }
    const mutations = {
      updateTab: sinon.stub()
    }
    const store = new Vuex.Store({ state, mutations })
-    const $route = { path: '/editor' }
-    sinon.stub(storedQueries, 'isTabNeedName').returns(true)
-    sinon.stub(storedQueries, 'save').returns({
+    const $route = { path: '/workspace' }
+    sinon.stub(storedInquiries, 'isTabNeedName').returns(true)
+    sinon.stub(storedInquiries, 'save').returns({
      name: 'bar',
      id: 2,
      query: 'SELECT * FROM foo',
-      chart: []
+      viewType: 'chart',
+      viewOptions: []
    })

    wrapper = mount(MainMenu, {
@@ -569,8 +548,8 @@ describe('MainMenu.vue', () => {
    // check that the dialog is closed
    expect(wrapper.find('[data-modal="save"]').exists()).to.equal(false)

-    // check that the query was saved via storedQueries.save (newName='bar')
-    expect(storedQueries.save.calledOnceWith(state.currentTab, 'bar')).to.equal(true)
+    // check that the inquiry was saved via storedInquiries.save (newName='bar')
+    expect(storedInquiries.save.calledOnceWith(state.currentTab, 'bar')).to.equal(true)

    // check that the tab was updated
    expect(mutations.updateTab.calledOnceWith(state, sinon.match({
@@ -578,18 +557,19 @@ describe('MainMenu.vue', () => {
      name: 'bar',
      id: 2,
      query: 'SELECT * FROM foo',
-      chart: [],
-      isUnsaved: false
+      viewType: 'chart',
+      viewOptions: [],
+      isSaved: true
    }))).to.equal(true)

-    // check that 'querySaved' event was triggered on $root
-    expect(createWrapper(wrapper.vm.$root).emitted('querySaved')).to.have.lengthOf(1)
+    // check that 'inquirySaved' event was triggered on $root
+    expect(createWrapper(wrapper.vm.$root).emitted('inquirySaved')).to.have.lengthOf(1)

-    // We saved predefined query, so the tab will be created again
+    // We saved predefined inquiry, so the tab will be created again
    // (because of new id) and it will be without sql result and has default view - table.
    // That's why we need to restore data and view.
    // Check that result and view are preserved in the currentTab:
-    expect(state.currentTab.view).to.equal('chart')
+    expect(state.currentTab.viewType).to.equal('chart')
    expect(state.currentTab.result).to.eql({
      columns: ['id', 'name'],
      values: [
@@ -606,16 +586,16 @@ describe('MainMenu.vue', () => {
        execute: sinon.stub(),
        tabIndex: 0
      },
-      tabs: [{ id: 1, name: null, tempName: 'Untitled', isUnsaved: true }],
+      tabs: [{ id: 1, name: null, tempName: 'Untitled', isSaved: false }],
      db: {}
    }
    const mutations = {
      updateTab: sinon.stub()
    }
    const store = new Vuex.Store({ state, mutations })
-    const $route = { path: '/editor' }
-    sinon.stub(storedQueries, 'isTabNeedName').returns(true)
-    sinon.stub(storedQueries, 'save').returns({
+    const $route = { path: '/workspace' }
+    sinon.stub(storedInquiries, 'isTabNeedName').returns(true)
+    sinon.stub(storedInquiries, 'save').returns({
      name: 'bar',
      id: 2,
      query: 'SELECT * FROM foo',
@@ -642,13 +622,13 @@ describe('MainMenu.vue', () => {
    // check that the dialog is closed
    expect(wrapper.find('[data-modal="save"]').exists()).to.equal(false)

-    // check that the query was not saved via storedQueries.save
-    expect(storedQueries.save.called).to.equal(false)
+    // check that the inquiry was not saved via storedInquiries.save
+    expect(storedInquiries.save.called).to.equal(false)

    // check that the tab was not updated
    expect(mutations.updateTab.called).to.equal(false)

-    // check that 'querySaved' event is not listened on $root
-    expect(wrapper.vm.$root.$listeners).to.not.have.property('querySaved')
+    // check that 'inquirySaved' event is not listened on $root
+    expect(wrapper.vm.$root.$listeners).to.not.have.property('inquirySaved')
  })
 })
--- a/tests/views/Main/Workspace/Editor.spec.js
+++ b/tests/views/Main/Workspace/Editor.spec.js
@@ -0,0 +1,23 @@
+import { expect } from 'chai'
+import { mount } from '@vue/test-utils'
+import actions from '@/store/actions'
+import Vuex from 'vuex'
+import Workspace from '@/views/Main/Workspace'
+
+describe('Workspace.vue', () => {
+  it('Creates a tab with example if schema is empty', () => {
+    const state = {
+      db: {},
+      tabs: []
+    }
+    const store = new Vuex.Store({ state, actions })
+    mount(Workspace, { store })
+
+    expect(state.tabs[0].query).to.include('Your database is empty.')
+    expect(state.tabs[0].tempName).to.equal('Untitled')
+    expect(state.tabs[0].name).to.equal(null)
+    expect(state.tabs[0].viewType).to.equal('chart')
+    expect(state.tabs[0].viewOptions).to.equal(undefined)
+    expect(state.tabs[0].isSaved).to.equal(false)
+  })
+})
--- a/tests/views/MainView/Editor/Schema/Schema.spec.js
+++ b/tests/views/MainView/Editor/Schema/Schema.spec.js
@@ -2,8 +2,8 @@ import { expect } from 'chai'
 import sinon from 'sinon'
 import { mount, createLocalVue } from '@vue/test-utils'
 import Vuex from 'vuex'
-import Schema from '@/views/Main/Editor/Schema'
-import TableDescription from '@/views/Main/Editor/Schema/TableDescription'
+import Schema from '@/views/Main/Workspace/Schema'
+import TableDescription from '@/views/Main/Workspace/Schema/TableDescription'
 import database from '@/lib/database'
 import fIo from '@/lib/utils/fileIo'
 import csv from '@/components/CsvImport/csv'
@@ -129,10 +129,8 @@ describe('Schema.vue', () => {
    sinon.stub(csv, 'parse').resolves({
      delimiter: '|',
      data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo']
-        ]
+        col1: [1],
+        col2: ['foo']
      },
      hasErrors: false,
      messages: []
@@ -171,8 +169,8 @@ describe('Schema.vue', () => {

    const res = await wrapper.vm.$store.state.db.execute('select * from test')
    expect(res).to.eql({
-      columns: ['col1', 'col2'],
-      values: [[1, 'foo']]
+      col1: [1],
+      col2: ['foo']
    })
  })
 })
--- a/tests/views/MainView/Editor/Schema/TableDescription.spec.js
+++ b/tests/views/MainView/Editor/Schema/TableDescription.spec.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import { shallowMount } from '@vue/test-utils'
-import TableDescription from '@/views/Main/Editor/Schema/TableDescription'
+import TableDescription from '@/views/Main/Workspace/Schema/TableDescription'

 describe('TableDescription.vue', () => {
  it('Initially the columns are hidden and table name is rendered', () => {
--- a/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/Chart.spec.js
+++ b/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/Chart.spec.js
@@ -0,0 +1,50 @@
+import { expect } from 'chai'
+import sinon from 'sinon'
+import { mount, shallowMount } from '@vue/test-utils'
+import Chart from '@/views/Main/Workspace/Tabs/Tab/DataView/Chart'
+import chartHelper from '@/views/Main/Workspace/Tabs/Tab/DataView/Chart/chartHelper'
+import * as dereference from 'react-chart-editor/lib/lib/dereference'
+
+describe('Chart.vue', () => {
+  afterEach(() => {
+    sinon.restore()
+  })
+
+  it('getOptionsForSave called with proper arguments', () => {
+    // mount the component
+    const wrapper = shallowMount(Chart)
+    const vm = wrapper.vm
+    const stub = sinon.stub(chartHelper, 'getOptionsForSave').returns('result')
+    const chartData = vm.getOptionsForSave()
+    expect(stub.calledOnceWith(vm.state, vm.dataSources)).to.equal(true)
+    expect(chartData).to.equal('result')
+  })
+
+  it('emits update when plotly updates', async () => {
+    // mount the component
+    const wrapper = mount(Chart)
+    wrapper.findComponent({ ref: 'plotlyEditor' }).vm.$emit('onUpdate')
+    expect(wrapper.emitted('update')).to.have.lengthOf(1)
+  })
+
+  it('calls dereference when sqlResult is changed', async () => {
+    sinon.stub(dereference, 'default')
+    const dataSources = {
+      id: [1],
+      name: ['foo']
+    }
+
+    // mount the component
+    const wrapper = shallowMount(Chart, {
+      propsData: { dataSources }
+    })
+
+    const newDataSources = {
+      id: [2],
+      name: ['bar']
+    }
+
+    await wrapper.setProps({ dataSources: newDataSources })
+    expect(dereference.default.called).to.equal(true)
+  })
+})
--- a/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/DataView.spec.js
+++ b/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/DataView.spec.js
@@ -0,0 +1,32 @@
+import { expect } from 'chai'
+import { mount, createWrapper } from '@vue/test-utils'
+import DataView from '@/views/Main/Workspace/Tabs/Tab/DataView'
+import sinon from 'sinon'
+
+describe('DataView.vue', () => {
+  it('emits update on mode changing', async () => {
+    const wrapper = mount(DataView)
+
+    const pivotBtn = createWrapper(wrapper.findComponent({ name: 'pivotIcon' }).vm.$parent)
+    await pivotBtn.trigger('click')
+
+    expect(wrapper.emitted('update')).to.have.lengthOf(1)
+  })
+
+  it('method getOptionsForSave call the same method of the current view component', async () => {
+    const wrapper = mount(DataView)
+
+    const chart = wrapper.findComponent({ name: 'Chart' }).vm
+    sinon.stub(chart, 'getOptionsForSave').returns({ here_are: 'chart_settings' })
+
+    expect(wrapper.vm.getOptionsForSave()).to.eql({ here_are: 'chart_settings' })
+
+    const pivotBtn = createWrapper(wrapper.findComponent({ name: 'pivotIcon' }).vm.$parent)
+    await pivotBtn.trigger('click')
+
+    const pivot = wrapper.findComponent({ name: 'pivot' }).vm
+    sinon.stub(pivot, 'getOptionsForSave').returns({ here_are: 'pivot_settings' })
+
+    expect(wrapper.vm.getOptionsForSave()).to.eql({ here_are: 'pivot_settings' })
+  })
+})
--- a/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/Pivot/Pivot.spec.js
+++ b/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/Pivot/Pivot.spec.js
@@ -0,0 +1,214 @@
+import { expect } from 'chai'
+import { mount } from '@vue/test-utils'
+import Pivot from '@/views/Main/Workspace/Tabs/Tab/DataView/Pivot'
+import $ from 'jquery'
+
+describe('Pivot.vue', () => {
+  it('renders pivot table', () => {
+    const wrapper = mount(Pivot, {
+      propsData: {
+        dataSources: {
+          item: ['foo', 'bar', 'bar', 'bar'],
+          year: [2021, 2021, 2020, 2020]
+        },
+        initOptions: {
+          rows: ['item'],
+          cols: ['year'],
+          colOrder: 'key_a_to_z',
+          rowOrder: 'key_a_to_z',
+          aggregatorName: 'Count',
+          vals: [],
+          rendererName: 'Table'
+        }
+      }
+    })
+    const colLabels = wrapper.findAll('.pivot-output thead th.pvtColLabel')
+    expect(colLabels.at(0).text()).to.equal('2020')
+    expect(colLabels.at(1).text()).to.equal('2021')
+    const rows = wrapper.findAll('.pivot-output tbody tr')
+    // row0: bar - 2 - 1
+    expect(rows.at(0).find('th').text()).to.equal('bar')
+    expect(rows.at(0).find('td.col0').text()).to.equal('2')
+    expect(rows.at(0).find('td.col1').text()).to.equal('1')
+    expect(rows.at(0).find('td.rowTotal').text()).to.equal('3')
+
+    // row1: foo -  - 2
+    expect(rows.at(1).find('th').text()).to.equal('foo')
+    expect(rows.at(1).find('td.col0').text()).to.equal('')
+    expect(rows.at(1).find('td.col1').text()).to.equal('1')
+    expect(rows.at(1).find('td.rowTotal').text()).to.equal('1')
+  })
+
+  it('updates when dataSource changes', async () => {
+    const wrapper = mount(Pivot, {
+      propsData: {
+        dataSources: {
+          item: ['foo', 'bar', 'bar', 'bar'],
+          year: [2021, 2021, 2020, 2020]
+        },
+        initOptions: {
+          rows: ['item'],
+          cols: ['year'],
+          colOrder: 'key_a_to_z',
+          rowOrder: 'key_a_to_z',
+          aggregatorName: 'Count',
+          vals: [],
+          rendererName: 'Table'
+        }
+      }
+    })
+
+    await wrapper.setProps({
+      dataSources: {
+        item: ['foo', 'bar', 'bar', 'bar', 'foo', 'baz'],
+        year: [2021, 2021, 2020, 2020, 2021, 2020]
+      }
+    })
+
+    const colLabels = wrapper.findAll('.pivot-output thead th.pvtColLabel')
+    expect(colLabels.at(0).text()).to.equal('2020')
+    expect(colLabels.at(1).text()).to.equal('2021')
+    const rows = wrapper.findAll('.pivot-output tbody tr')
+    // row0: bar - 2 - 1
+    expect(rows.at(0).find('th').text()).to.equal('bar')
+    expect(rows.at(0).find('td.col0').text()).to.equal('2')
+    expect(rows.at(0).find('td.col1').text()).to.equal('1')
+    expect(rows.at(0).find('td.rowTotal').text()).to.equal('3')
+
+    // row1: baz - 1 -
+    expect(rows.at(1).find('th').text()).to.equal('baz')
+    expect(rows.at(1).find('td.col0').text()).to.equal('1')
+    expect(rows.at(1).find('td.col1').text()).to.equal('')
+    expect(rows.at(1).find('td.rowTotal').text()).to.equal('1')
+
+    // row2: foo -  - 2
+    expect(rows.at(2).find('th').text()).to.equal('foo')
+    expect(rows.at(2).find('td.col0').text()).to.equal('')
+    expect(rows.at(2).find('td.col1').text()).to.equal('2')
+    expect(rows.at(2).find('td.rowTotal').text()).to.equal('2')
+  })
+
+  it('updates when pivot settings changes', async () => {
+    const wrapper = mount(Pivot, {
+      propsData: {
+        dataSources: {
+          item: ['foo', 'bar', 'bar', 'bar'],
+          year: [2021, 2021, 2020, 2020]
+        },
+        initOptions: {
+          rows: ['item'],
+          cols: ['year'],
+          colOrder: 'key_a_to_z',
+          rowOrder: 'key_a_to_z',
+          aggregatorName: 'Count',
+          vals: [],
+          rendererName: 'Table'
+        }
+      }
+    })
+
+    await wrapper.findComponent({ name: 'pivotUi' }).vm.$emit('input', {
+      rows: ['year'],
+      cols: ['item'],
+      colOrder: 'key_a_to_z',
+      rowOrder: 'key_a_to_z',
+      aggregator: $.pivotUtilities.aggregators.Count(),
+      aggregatorName: 'Count',
+      renderer: $.pivotUtilities.renderers.Table,
+      rendererName: 'Table',
+      rendererOptions: undefined,
+      vals: []
+    })
+
+    const colLabels = wrapper.findAll('.pivot-output thead th.pvtColLabel')
+    expect(colLabels.at(0).text()).to.equal('bar')
+    expect(colLabels.at(1).text()).to.equal('foo')
+    const rows = wrapper.findAll('.pivot-output tbody tr')
+    // row0: 2020 - 2 -
+    expect(rows.at(0).find('th').text()).to.equal('2020')
+    expect(rows.at(0).find('td.col0').text()).to.equal('2')
+    expect(rows.at(0).find('td.col1').text()).to.equal('')
+    expect(rows.at(0).find('td.rowTotal').text()).to.equal('2')
+
+    // row1: 2021 - 1 - 1
+    expect(rows.at(1).find('th').text()).to.equal('2021')
+    expect(rows.at(1).find('td.col0').text()).to.equal('1')
+    expect(rows.at(1).find('td.col1').text()).to.equal('1')
+    expect(rows.at(1).find('td.rowTotal').text()).to.equal('2')
+  })
+
+  it('returns options for save', async () => {
+    const wrapper = mount(Pivot, {
+      propsData: {
+        dataSources: {
+          item: ['foo', 'bar', 'bar', 'bar'],
+          year: [2021, 2021, 2020, 2020]
+        },
+        initOptions: {
+          rows: ['item'],
+          cols: ['year'],
+          colOrder: 'key_a_to_z',
+          rowOrder: 'key_a_to_z',
+          aggregatorName: 'Count',
+          vals: [],
+          rendererName: 'Table'
+        }
+      }
+    })
+
+    await wrapper.findComponent({ name: 'pivotUi' }).vm.$emit('input', {
+      rows: ['year'],
+      cols: ['item'],
+      colOrder: 'value_a_to_z',
+      rowOrder: 'value_z_to_a',
+      aggregator: $.pivotUtilities.aggregators.Count(),
+      aggregatorName: 'Count',
+      renderer: $.pivotUtilities.renderers.Table,
+      rendererName: 'Table',
+      rendererOptions: undefined,
+      vals: []
+    })
+
+    let optionsForSave = wrapper.vm.getOptionsForSave()
+
+    expect(optionsForSave.rows).to.eql(['year'])
+    expect(optionsForSave.cols).to.eql(['item'])
+    expect(optionsForSave.colOrder).to.equal('value_a_to_z')
+    expect(optionsForSave.rowOrder).to.equal('value_z_to_a')
+    expect(optionsForSave.aggregatorName).to.equal('Count')
+    expect(optionsForSave.rendererName).to.equal('Table')
+    expect(optionsForSave.rendererOptions).to.equal(undefined)
+    expect(optionsForSave.vals).to.eql([])
+
+    await wrapper.findComponent({ name: 'pivotUi' }).vm.$emit('input', {
+      rows: ['item'],
+      cols: ['year'],
+      colOrder: 'value_a_to_z',
+      rowOrder: 'value_z_to_a',
+      aggregator: $.pivotUtilities.aggregators.Count(),
+      aggregatorName: 'Count',
+      renderer: $.pivotUtilities.renderers['Custom chart'],
+      rendererName: 'Custom chart',
+      rendererOptions: {
+        customChartComponent: {
+          getOptionsForSave () {
+            return { here_are: 'custom chart settings' }
+          }
+        }
+      },
+      vals: []
+    })
+
+    optionsForSave = wrapper.vm.getOptionsForSave()
+    expect(optionsForSave.rows).to.eql(['item'])
+    expect(optionsForSave.cols).to.eql(['year'])
+    expect(optionsForSave.colOrder).to.equal('value_a_to_z')
+    expect(optionsForSave.rowOrder).to.equal('value_z_to_a')
+    expect(optionsForSave.aggregatorName).to.equal('Count')
+    expect(optionsForSave.rendererName).to.equal('Custom chart')
+    expect(optionsForSave.rendererOptions).to.eql({
+      customChartOptions: { here_are: 'custom chart settings' }
+    })
+    expect(optionsForSave.vals).to.eql([])
+  })
+})
--- a/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/Pivot/PivotUi/PivotSortBtn.spec.js
+++ b/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/Pivot/PivotUi/PivotSortBtn.spec.js
@@ -0,0 +1,21 @@
+import { expect } from 'chai'
+import { shallowMount } from '@vue/test-utils'
+import PivotSortBtn from '@/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotSortBtn'
+
+describe('PivotSortBtn.vue', () => {
+  it('switches order', async () => {
+    const wrapper = shallowMount(PivotSortBtn, { propsData: { value: 'key_a_to_z' } })
+
+    expect(wrapper.vm.value).to.equal('key_a_to_z')
+    await wrapper.find('.pivot-sort-btn').trigger('click')
+    expect(wrapper.emitted('input')[0]).to.eql(['value_a_to_z'])
+
+    await wrapper.setProps({ value: 'value_a_to_z' })
+    await wrapper.find('.pivot-sort-btn').trigger('click')
+    expect(wrapper.emitted('input')[1]).to.eql(['value_z_to_a'])
+
+    await wrapper.setProps({ value: 'value_z_to_a' })
+    await wrapper.find('.pivot-sort-btn').trigger('click')
+    expect(wrapper.emitted('input')[2]).to.eql(['key_a_to_z'])
+  })
+})
--- a/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/Pivot/PivotUi/PivotUi.spec.js
+++ b/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/Pivot/PivotUi/PivotUi.spec.js
@@ -0,0 +1,143 @@
+import { expect } from 'chai'
+import { mount } from '@vue/test-utils'
+import PivotUi from '@/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi'
+
+describe('PivotUi.vue', () => {
+  it('returns value when settings changed', async () => {
+    const wrapper = mount(PivotUi, {
+      propsData: {
+        keyNames: ['foo', 'bar']
+      }
+    })
+
+    // choose columns
+    await wrapper.findAll('.sqliteviz-select.cols .multiselect__element > span').at(0)
+      .trigger('click')
+
+    expect(wrapper.emitted().update.length).to.equal(1)
+    expect(wrapper.emitted().input[0][0].rows).to.eql([])
+    expect(wrapper.emitted().input[0][0].cols).to.eql(['foo'])
+    expect(wrapper.emitted().input[0][0].colOrder).to.equal('key_a_to_z')
+    expect(wrapper.emitted().input[0][0].rowOrder).to.equal('key_a_to_z')
+    expect(wrapper.emitted().input[0][0].aggregatorName).to.equal('Count')
+    expect(wrapper.emitted().input[0][0].rendererName).to.equal('Table')
+    expect(wrapper.emitted().input[0][0].rendererOptions).to.equal(undefined)
+    expect(wrapper.emitted().input[0][0].vals).to.eql([])
+
+    // choose rows
+    await wrapper.findAll('.sqliteviz-select.rows .multiselect__element > span').at(0)
+      .trigger('click')
+
+    expect(wrapper.emitted().update.length).to.equal(2)
+    expect(wrapper.emitted().input[1][0].rows).to.eql(['bar'])
+    expect(wrapper.emitted().input[1][0].cols).to.eql(['foo'])
+    expect(wrapper.emitted().input[1][0].colOrder).to.equal('key_a_to_z')
+    expect(wrapper.emitted().input[1][0].rowOrder).to.equal('key_a_to_z')
+    expect(wrapper.emitted().input[1][0].aggregatorName).to.equal('Count')
+    expect(wrapper.emitted().input[1][0].rendererName).to.equal('Table')
+    expect(wrapper.emitted().input[1][0].rendererOptions).to.equal(undefined)
+    expect(wrapper.emitted().input[1][0].vals).to.eql([])
+
+    // change column order
+    await wrapper.find('.pivot-sort-btn.col').trigger('click')
+
+    expect(wrapper.emitted().update.length).to.equal(3)
+    expect(wrapper.emitted().input[2][0].rows).to.eql(['bar'])
+    expect(wrapper.emitted().input[2][0].cols).to.eql(['foo'])
+    expect(wrapper.emitted().input[2][0].colOrder).to.equal('value_a_to_z')
+    expect(wrapper.emitted().input[2][0].rowOrder).to.equal('key_a_to_z')
+    expect(wrapper.emitted().input[2][0].aggregatorName).to.equal('Count')
+    expect(wrapper.emitted().input[2][0].rendererName).to.equal('Table')
+    expect(wrapper.emitted().input[2][0].rendererOptions).to.equal(undefined)
+    expect(wrapper.emitted().input[2][0].vals).to.eql([])
+
+    // change row order
+    await wrapper.find('.pivot-sort-btn.row').trigger('click')
+
+    expect(wrapper.emitted().update.length).to.equal(4)
+    expect(wrapper.emitted().input[3][0].rows).to.eql(['bar'])
+    expect(wrapper.emitted().input[3][0].cols).to.eql(['foo'])
+    expect(wrapper.emitted().input[3][0].colOrder).to.equal('value_a_to_z')
+    expect(wrapper.emitted().input[3][0].rowOrder).to.equal('value_a_to_z')
+    expect(wrapper.emitted().input[3][0].aggregatorName).to.equal('Count')
+    expect(wrapper.emitted().input[3][0].rendererName).to.equal('Table')
+    expect(wrapper.emitted().input[3][0].rendererOptions).to.equal(undefined)
+    expect(wrapper.emitted().input[3][0].vals).to.eql([])
+
+    // change aggregator
+    await wrapper.findAll('.sqliteviz-select.aggregator .multiselect__element > span').at(12)
+      .trigger('click')
+
+    expect(wrapper.emitted().update.length).to.equal(5)
+    expect(wrapper.emitted().input[4][0].rows).to.eql(['bar'])
+    expect(wrapper.emitted().input[4][0].cols).to.eql(['foo'])
+    expect(wrapper.emitted().input[4][0].colOrder).to.equal('value_a_to_z')
+    expect(wrapper.emitted().input[4][0].rowOrder).to.equal('value_a_to_z')
+    expect(wrapper.emitted().input[4][0].aggregatorName).to.equal('Sum over Sum')
+    expect(wrapper.emitted().input[4][0].rendererName).to.equal('Table')
+    expect(wrapper.emitted().input[4][0].rendererOptions).to.equal(undefined)
+    expect(wrapper.emitted().input[4][0].vals).to.eql(['', ''])
+
+    // set first aggregator argument
+    await wrapper
+      .findAll('.sqliteviz-select.aggr-arg').at(0)
+      .findAll('.multiselect__element > span').at(0)
+      .trigger('click')
+
+    expect(wrapper.emitted().update.length).to.equal(6)
+    expect(wrapper.emitted().input[5][0].rows).to.eql(['bar'])
+    expect(wrapper.emitted().input[5][0].cols).to.eql(['foo'])
+    expect(wrapper.emitted().input[5][0].colOrder).to.equal('value_a_to_z')
+    expect(wrapper.emitted().input[5][0].rowOrder).to.equal('value_a_to_z')
+    expect(wrapper.emitted().input[5][0].aggregatorName).to.equal('Sum over Sum')
+    expect(wrapper.emitted().input[5][0].rendererName).to.equal('Table')
+    expect(wrapper.emitted().input[5][0].rendererOptions).to.equal(undefined)
+    expect(wrapper.emitted().input[5][0].vals).to.eql(['foo', ''])
+
+    // set second aggregator argument
+    await wrapper
+      .findAll('.sqliteviz-select.aggr-arg').at(1)
+      .findAll('.multiselect__element > span').at(1)
+      .trigger('click')
+
+    expect(wrapper.emitted().update.length).to.equal(7)
+    expect(wrapper.emitted().input[6][0].rows).to.eql(['bar'])
+    expect(wrapper.emitted().input[6][0].cols).to.eql(['foo'])
+    expect(wrapper.emitted().input[6][0].colOrder).to.equal('value_a_to_z')
+    expect(wrapper.emitted().input[6][0].rowOrder).to.equal('value_a_to_z')
+    expect(wrapper.emitted().input[6][0].aggregatorName).to.equal('Sum over Sum')
+    expect(wrapper.emitted().input[6][0].rendererName).to.equal('Table')
+    expect(wrapper.emitted().input[6][0].rendererOptions).to.equal(undefined)
+    expect(wrapper.emitted().input[6][0].vals).to.eql(['foo', 'bar'])
+
+    // change renderer
+    await wrapper.findAll('.sqliteviz-select.renderer .multiselect__element > span').at(13)
+      .trigger('click')
+
+    expect(wrapper.emitted().update.length).to.equal(8)
+    expect(wrapper.emitted().input[7][0].rows).to.eql(['bar'])
+    expect(wrapper.emitted().input[7][0].cols).to.eql(['foo'])
+    expect(wrapper.emitted().input[7][0].colOrder).to.equal('value_a_to_z')
+    expect(wrapper.emitted().input[7][0].rowOrder).to.equal('value_a_to_z')
+    expect(wrapper.emitted().input[7][0].aggregatorName).to.equal('Sum over Sum')
+    expect(wrapper.emitted().input[7][0].rendererName).to.equal('Custom chart')
+    expect(wrapper.emitted().input[7][0].rendererOptions.customChartComponent)
+      .to.not.equal(undefined)
+    expect(wrapper.emitted().input[7][0].vals).to.eql(['foo', 'bar'])
+
+    // change aggregator again
+    await wrapper.findAll('.sqliteviz-select.aggregator .multiselect__element > span').at(3)
+      .trigger('click')
+
+    expect(wrapper.emitted().update.length).to.equal(9)
+    expect(wrapper.emitted().input[8][0].rows).to.eql(['bar'])
+    expect(wrapper.emitted().input[8][0].cols).to.eql(['foo'])
+    expect(wrapper.emitted().input[8][0].colOrder).to.equal('value_a_to_z')
+    expect(wrapper.emitted().input[8][0].rowOrder).to.equal('value_a_to_z')
+    expect(wrapper.emitted().input[8][0].aggregatorName).to.equal('Sum')
+    expect(wrapper.emitted().input[8][0].rendererName).to.equal('Custom chart')
+    expect(wrapper.emitted().input[8][0].rendererOptions.customChartComponent)
+      .to.not.equal(undefined)
+    expect(wrapper.emitted().input[8][0].vals).to.eql(['foo'])
+  })
+})
--- a/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/Pivot/PivotUi/pivotHelper.spec.js
+++ b/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/Pivot/PivotUi/pivotHelper.spec.js
@@ -0,0 +1,56 @@
+import { expect } from 'chai'
+import { _getDataSources } from '@/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/pivotHelper'
+
+describe('pivotHelper.js', () => {
+  it('_getDataSources returns data sources', () => {
+    /*
+      +---+---+---------+---------+
+      |   | x |    5    |    10   |
+      |   +---+----+----+----+----+
+      |   | z |  2 |  3 |  1 |  6 |
+      +---+---+    |    |    |    |
+      | y |   |    |    |    |    |
+      +---+---+----+----+----+----+
+      |   3   |  5 |  6 |  4 |  9 |
+      +-------+----+----+----+----+
+      |   6   |  8 |  9 |  7 | 12 |
+      +-------+----+----+----+----+
+      |   9   | 11 | 12 | 10 | 15 |
+      +-------+----+----+----+----+
+    */
+    const pivotData = {
+      rowAttrs: ['y'],
+      colAttrs: ['x', 'z'],
+      getRowKeys () {
+        return [[3], [6], [9]]
+      },
+      getColKeys () {
+        return [
+          [5, 2],
+          [5, 3],
+          [10, 1],
+          [10, 6]
+        ]
+      },
+      getAggregator (row, col) {
+        return {
+          value () {
+            return +row + +col[1]
+          }
+        }
+      }
+    }
+
+    expect(_getDataSources(pivotData)).to.eql({
+      'Column keys': ['5-2', '5-3', '10-1', '10-6'],
+      'Row keys': ['3', '6', '9'],
+      'x-z:5-2': [5, 8, 11],
+      'x-z:5-3': [6, 9, 12],
+      'x-z:10-1': [4, 7, 10],
+      'x-z:10-6': [9, 12, 15],
+      'y:3': [5, 6, 4, 9],
+      'y:6': [8, 9, 7, 12],
+      'y:9': [11, 12, 10, 15]
+    })
+  })
+})
--- a/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/chartHelper.spec.js
+++ b/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/chartHelper.spec.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import sinon from 'sinon'
-import * as chartHelper from '@/views/Main/Editor/Tabs/Tab/Chart/chartHelper'
+import * as chartHelper from '@/views/Main/Workspace/Tabs/Tab/DataView/Chart/chartHelper'
 import * as dereference from 'react-chart-editor/lib/lib/dereference'

 describe('chartHelper.js', () => {
@@ -8,22 +8,6 @@ describe('chartHelper.js', () => {
    sinon.restore()
  })

-  it('getDataSourcesFromSqlResult', () => {
-    const sqlResult = {
-      columns: ['id', 'name'],
-      values: [
-        [1, 'foo'],
-        [2, 'bar']
-      ]
-    }
-
-    const ds = chartHelper.getDataSourcesFromSqlResult(sqlResult)
-    expect(ds).to.eql({
-      id: [1, 2],
-      name: ['foo', 'bar']
-    })
-  })
-
  it('getOptionsFromDataSources', () => {
    const dataSources = {
      id: [1, 2],
@@ -37,7 +21,7 @@ describe('chartHelper.js', () => {
    ])
  })

-  it('getChartStateForSave', () => {
+  it('getOptionsForSave', () => {
    const state = {
      data: {
        foo: {},
@@ -53,7 +37,7 @@ describe('chartHelper.js', () => {
    sinon.stub(dereference, 'default')
    sinon.spy(JSON, 'parse')

-    const ds = chartHelper.getChartStateForSave(state, dataSources)
+    const ds = chartHelper.getOptionsForSave(state, dataSources)

    expect(dereference.default.calledOnce).to.equal(true)

--- a/tests/views/Main/Workspace/Tabs/Tab/SqlEditor/SqlEditor.spec.js
+++ b/tests/views/Main/Workspace/Tabs/Tab/SqlEditor/SqlEditor.spec.js
@@ -0,0 +1,44 @@
+import { expect } from 'chai'
+import { mount } from '@vue/test-utils'
+import Vuex from 'vuex'
+import SqlEditor from '@/views/Main/Workspace/Tabs/Tab/SqlEditor'
+
+describe('SqlEditor.vue', () => {
+  it('Emits input event when a query is changed', async () => {
+    // mock store state
+    const state = {
+      db: {}
+    }
+
+    const store = new Vuex.Store({ state })
+
+    const wrapper = mount(SqlEditor, { store })
+    await wrapper.findComponent({ name: 'codemirror' }).vm.$emit('input', 'SELECT * FROM foo')
+    expect(wrapper.emitted('input')[0]).to.eql(['SELECT * FROM foo'])
+  })
+
+  it('Run is disabled if there is no db or no query or is getting result set', async () => {
+    const state = {
+      db: null
+    }
+    const store = new Vuex.Store({ state })
+
+    const wrapper = mount(SqlEditor, { store, propsData: { isGettingResults: false } })
+    await wrapper.findComponent({ name: 'codemirror' }).vm.$emit('input', 'SELECT * FROM foo')
+    const runButton = wrapper.findComponent({ name: 'RunIcon' }).vm.$parent
+
+    expect(runButton.disabled).to.equal(true)
+
+    await wrapper.vm.$set(store.state, 'db', {})
+    expect(runButton.disabled).to.equal(false)
+
+    await wrapper.findComponent({ name: 'codemirror' }).vm.$emit('input', '')
+    expect(runButton.disabled).to.equal(true)
+
+    await wrapper.findComponent({ name: 'codemirror' }).vm.$emit('input', 'SELECT * FROM foo')
+    expect(runButton.disabled).to.equal(false)
+
+    await wrapper.setProps({ isGettingResults: true })
+    expect(runButton.disabled).to.equal(true)
+  })
+})
--- a/tests/views/MainView/Editor/Tabs/Tab/SqlEditor/hint.spec.js
+++ b/tests/views/MainView/Editor/Tabs/Tab/SqlEditor/hint.spec.js
@@ -1,7 +1,7 @@
 import { expect } from 'chai'
 import sinon from 'sinon'
 import state from '@/store/state'
-import showHint, { getHints } from '@/views/Main/Editor/Tabs/Tab/SqlEditor/hint'
+import showHint, { getHints } from '@/views/Main/Workspace/Tabs/Tab/SqlEditor/hint'
 import CM from 'codemirror'

 describe('hint.js', () => {
--- a/Show More
+++ b/Show More