chore(release): 0.3.6

feat: processes list exportation
feat: copy cell/row or kill connections on context menu from processes list
2025-06-05 21:59:22 +02:00 · 2021-09-26 11:39:19 +02:00 · 2021-09-26 11:36:42 +02:00 · 2021-09-26 11:19:48 +02:00 · 2021-09-21 11:16:07 +02:00 · 2021-09-21 10:03:35 +02:00
100 changed files with 7046 additions and 4281 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,6 @@ node_modules/
 thumbs.db
 .idea/
 .vscode
-TODO.md
+NOTES.md
 *.txt
 package-lock.json
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,151 @@

 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

+### [0.3.6](https://github.com/Fabio286/antares/compare/v0.3.5...v0.3.6) (2021-09-26)
+
+
+### Features
+
+* copy cell/row or kill connections on context menu from processes list ([85f625d](https://github.com/Fabio286/antares/commit/85f625daf7026815dac6223a29c5a6479830edbb))
+* processes list exportation ([13aa47c](https://github.com/Fabio286/antares/commit/13aa47cd4441aa47c93038dbd91d6a0e54f6a60c))
+* workspace query history ([3959333](https://github.com/Fabio286/antares/commit/39593336626e6d9f3d3b65d2a4081388900e37d6))
+
+
+### Bug Fixes
+
+* adding a connection default values not change when switching clients, closes [#101](https://github.com/Fabio286/antares/issues/101) ([d4888ad](https://github.com/Fabio286/antares/commit/d4888ad8fba3c8e8ec2d6b6d9a78bb212d83eeed))
+
+
+### Improvements
+
+* **core:** better communication of internal exceptions ([abd46aa](https://github.com/Fabio286/antares/commit/abd46aa32256f822e52eaac2fc698da378b8163f))
+
+### [0.3.5](https://github.com/Fabio286/antares/compare/v0.3.4...v0.3.5) (2021-09-13)
+
+
+### Bug Fixes
+
+* **MySQL:** connections stuck at startup if 5 or more tabs are restored ([95b60df](https://github.com/Fabio286/antares/commit/95b60df8fc634b96a4c2c5c48dc6b10848888978))
+
+### [0.3.4](https://github.com/Fabio286/antares/compare/v0.3.3...v0.3.4) (2021-09-12)
+
+
+### Features
+
+* new create function tabs ([0203f69](https://github.com/Fabio286/antares/commit/0203f69e95093d25a7ef3e66df1c70f76edcedf2))
+* new create routine tabs ([3fd26a0](https://github.com/Fabio286/antares/commit/3fd26a05238368ae375197c79d42162a5910bb07))
+* new create scheduler tabs ([3c5a69a](https://github.com/Fabio286/antares/commit/3c5a69adc9cecdc4b8f46097676005f2a60f06cf))
+* new create trigger function tabs ([09c07ac](https://github.com/Fabio286/antares/commit/09c07acd5c2a6ed2b75640dbb83e782ed432bc30))
+* new create trigger tabs ([e217d51](https://github.com/Fabio286/antares/commit/e217d5181b37ec6304151120b4a2aba9455c6a84))
+* start search when typing with focus on the left bar ([265ed66](https://github.com/Fabio286/antares/commit/265ed66d25d35be99ed0a6b1668dab9f246ed71e))
+
+
+### Bug Fixes
+
+* **UI:** context menu of tables cut if close to bottom edge ([21e3e79](https://github.com/Fabio286/antares/commit/21e3e79ddf9e292bcfc5881b8fa76a1dc58b207c))
+
+### [0.3.3](https://github.com/Fabio286/antares/compare/v0.3.2...v0.3.3) (2021-08-22)
+
+
+### Features
+
+* new create table tabs ([c9fa941](https://github.com/Fabio286/antares/commit/c9fa9415787c3953043db5876a99b3664c69c071))
+* new create view tabs ([8b93c49](https://github.com/Fabio286/antares/commit/8b93c497784ea431f9747c5afb53f6ef075ea9d6))
+* new table empty state ([0842e00](https://github.com/Fabio286/antares/commit/0842e00098ba420412937aa52276ee33bda53693))
+
+
+### Bug Fixes
+
+* **MySQL:** editing a view causes error for missing database in some conditions ([4048df3](https://github.com/Fabio286/antares/commit/4048df3c7bc2d42a60f7a57c9a4b8b5b445fcd43))
+* table options not loaded on restored setting tabs at startup ([622b519](https://github.com/Fabio286/antares/commit/622b519cbb5fbe4e38a4baffb8eab169b21eed21))
+* **UI:** multiple temp tabs opened switching to tables from other elements ([b35fc5b](https://github.com/Fabio286/antares/commit/b35fc5b78bdbeff1422ef088441b17c8b0df663c))
+* **UI:** no round borders on left of file upload inputs ([d5b2bde](https://github.com/Fabio286/antares/commit/d5b2bde2eaf8ff3e14f49cc26acdcb201b4cb15c))
+
+
+### Improvements
+
+* **UI:** element options in setting tabs accessible directly ([71e2c91](https://github.com/Fabio286/antares/commit/71e2c911ae23e86543b2af1fa885981ff271777d))
+* **UI:** improved view setting tab ([1983686](https://github.com/Fabio286/antares/commit/198368605b084bd58fd6f7ca0b19895ba23a45e6))
+* **UI:** primary app color on selected text backgrouns ([756d49b](https://github.com/Fabio286/antares/commit/756d49b2596dea58376c6afa8e0bad0cd62b146c))
+* **UI:** visual improvements of tables ([bc82289](https://github.com/Fabio286/antares/commit/bc82289d54550a93300fe66d7a660aa70db2fd23))
+
+### [0.3.2](https://github.com/Fabio286/antares/compare/v0.3.1...v0.3.2) (2021-08-06)
+
+
+### Features
+
+* contextual menu option to duplicate table fields ([3abff36](https://github.com/Fabio286/antares/commit/3abff3613618ddc86e1d6c898f83bcb360e8e5d9))
+* **UI:** automatic scroll on selected tab ([e834fe3](https://github.com/Fabio286/antares/commit/e834fe31ac8b73f249e3ad8654e97da834b28cfe))
+* **UI:** automatic scroll to selected tab element in left bar ([04fc1bb](https://github.com/Fabio286/antares/commit/04fc1bbee0cdc3b02288ff5d3b2c402633cae1f1))
+* **UI:** button to clear sidebar search input ([1573de5](https://github.com/Fabio286/antares/commit/1573de5b1f545328523aaaaac541f5a8046617be))
+* **UI:** query tab name based on content ([065de3a](https://github.com/Fabio286/antares/commit/065de3a0a28a9e6667df4e41ac1c5fa5561d2171))
+* **UI:** shortcuts info on empty query tab ([70354aa](https://github.com/Fabio286/antares/commit/70354aa828121004f70e91d65cb9f0a4811dce57))
+
+
+### Bug Fixes
+
+* tab selected when clicking closing cross ([07ee1ae](https://github.com/Fabio286/antares/commit/07ee1ae828bb5f9971a263f2e39e73c760fed50a))
+
+
+### Improvements
+
+* approximate table total updated on table refresh ([dea3780](https://github.com/Fabio286/antares/commit/dea378014dd45bf90f51a599b4a801e0bc22059f))
+* **UI:** loading animation on tables and table context menu improvements ([372049a](https://github.com/Fabio286/antares/commit/372049ae64232e8e61a974edc8be5b319c5c0811))
+* update italian translation ([cbe0e29](https://github.com/Fabio286/antares/commit/cbe0e2980a9d4562941aec37a57cc936a46f41d8))
+
+### [0.3.1](https://github.com/Fabio286/antares/compare/v0.3.0...v0.3.1) (2021-07-27)
+
+
+### Bug Fixes
+
+* **UI:** tabs or explorebar elements selected with mouse wheel or right button ([a8a47ed](https://github.com/Fabio286/antares/commit/a8a47ed5f7d5d8cbbdd6c33ef8307d9dce5b193b))
+
+## [0.3.0](https://github.com/Fabio286/antares/compare/v0.2.1...v0.3.0) (2021-07-23)
+
+
+### Features
+
+* close tabs if element deleted ([320aa8b](https://github.com/Fabio286/antares/commit/320aa8ba04d464f628b938b812165cd1ec786492))
+* new data tabs ([ab382df](https://github.com/Fabio286/antares/commit/ab382dfbcd89f8ab38a8cbdb4d87e1705618fd0d))
+* new function, procedure and scheduler tabs ([0a9983d](https://github.com/Fabio286/antares/commit/0a9983d30d6aeb9aee1c68b31a31f8c605deea45))
+* new trigger function tabs ([58b91eb](https://github.com/Fabio286/antares/commit/58b91ebfe0ab200d76d4cfd442b9f2970ae97384))
+* new trigger setting tabs ([f6faad9](https://github.com/Fabio286/antares/commit/f6faad98f88222500dfb7265b74c1be914b894cd))
+* new unsaved change reminder ([f7a74df](https://github.com/Fabio286/antares/commit/f7a74df0097867a82a2a2d8b3c278a81897d7898))
+* new view setting tabs ([003c02b](https://github.com/Fabio286/antares/commit/003c02b1fbe5aba7f53f3faa5610b0c2f7706793))
+* option to restore session on startup ([adc5477](https://github.com/Fabio286/antares/commit/adc5477673603cd63fabf77a53db5397e3774e0e))
+* option to select schema in query tabs ([a73a2f4](https://github.com/Fabio286/antares/commit/a73a2f483ef6927def4ba635e306277c34ae4b53))
+* **UI:** empty workspace view ([e1855a2](https://github.com/Fabio286/antares/commit/e1855a262dc24363fc143a38a70154938308bd71))
+* rename tabs if element is renamed ([ef21ea7](https://github.com/Fabio286/antares/commit/ef21ea74481839ba67ca79d40d5f47e1c12aebc0))
+* **MySQL:** improved schema detection for queries ([5bb4e49](https://github.com/Fabio286/antares/commit/5bb4e496f289f3ae8a46f24d1a2fbb896d9da86e))
+* **UI:** close temp data tabs ([88c4cdc](https://github.com/Fabio286/antares/commit/88c4cdc8e2a60ffbe26b0f831184c3a6dd9a1637))
+* **UI:** display schema in data tabs ([0105733](https://github.com/Fabio286/antares/commit/01057332b090997c107bf395bb1fc3b9195e8218))
+* **UI:** new table settings tabs ([7845e3e](https://github.com/Fabio286/antares/commit/7845e3e501bb7f890d07b42d4f3eb5f9f4bc8586))
+* **UI:** sortable tabs ([d38097d](https://github.com/Fabio286/antares/commit/d38097d0567020b5265b5a0b347f5e1f38e0b1d4))
+* **UI:** temporary table data tabs ([a87079c](https://github.com/Fabio286/antares/commit/a87079cd179033cebb6fd228ad7f1b991f3b6c46))
+
+
+### Bug Fixes
+
+* clear empty indexes and foreign keys on confirm respective modals ([04fa320](https://github.com/Fabio286/antares/commit/04fa320820df1f70a4ef05e4a6e4cbcd4081d047))
+* enabled copy context on non editable rows ([525c964](https://github.com/Fabio286/antares/commit/525c964c623e7574f6abe732a2b315b8805d5eee))
+* issues with trigger temp tabs ([6b725b1](https://github.com/Fabio286/antares/commit/6b725b1d40753ad89bfad6f1df57c6fb737e5262))
+* manual page input not disabled when only one page is available ([62f7e57](https://github.com/Fabio286/antares/commit/62f7e57d0ccf6041b5469bec6a1864aa5b045609))
+* new field default value unknown instead 'noval' ([77c5d28](https://github.com/Fabio286/antares/commit/77c5d280325792e20befc845f3a6834837131e39))
+* reload twice after element rename ([1e543aa](https://github.com/Fabio286/antares/commit/1e543aa6b0b63e9134bf544682a26bd98573b794))
+* solved a vulnerability in table names ([5c855a5](https://github.com/Fabio286/antares/commit/5c855a520a6bc66cc00b0b8afc6d2c03c75c0fab))
+* sort order of tables is lost switching pages ([14577d1](https://github.com/Fabio286/antares/commit/14577d14bb337898a1fd0fdee1c3760812b9d21f))
+* wrong editor height with some conditions ([d7fdf53](https://github.com/Fabio286/antares/commit/d7fdf53932a4d0609a88641c40d451c71b12c242))
+* **UI:** multiple trigger tabs open on single click on explore bar ([e78ca24](https://github.com/Fabio286/antares/commit/e78ca2417e8f996fa0507c5a5586a75393dfe8ee))
+* **UI:** not disabled buttons during save table setting tabs ([a0105cf](https://github.com/Fabio286/antares/commit/a0105cf1c37144ea27b212029d39275918f4f95e))
+* tab won't open after table or view creation ([f7c3aa8](https://github.com/Fabio286/antares/commit/f7c3aa883dfcad0a28222c53cf22ab49d381559c))
+* wrong loaded schema change ([c41e059](https://github.com/Fabio286/antares/commit/c41e059b0ba6d8c6d545c3b86a21a9a2abb6f537))
+* **UI:** table icon in view data tabs ([f0fa7c8](https://github.com/Fabio286/antares/commit/f0fa7c81b7aa2a05833ce0b243afed39db98d66b))
+
+
+### Improvements
+
+* **UI:** improvements in setting bar connections sort ([0c29e0d](https://github.com/Fabio286/antares/commit/0c29e0d566c792ffd1b2b7045124e170b9c51985))
+
 ### [0.2.1](https://github.com/Fabio286/antares/compare/v0.2.0...v0.2.1) (2021-07-09)


--- a/README.md
+++ b/README.md
@@ -4,10 +4,10 @@

 # Antares SQL Client

-![GitHub package.json version](https://img.shields.io/github/package-json/v/fabio286/antares) [![Build Status](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2Ffabio286%2Fantares%2Fbadge&style=flat)](https://actions-badge.atrox.dev/fabio286/antares/goto) ![GitHub All Releases](https://img.shields.io/github/downloads/fabio286/antares/total) ![GitHub](https://img.shields.io/github/license/fabio286/antares) [![antares](https://snapcraft.io/antares/badge.svg)](https://snapcraft.io/antares) [![antares](https://snapcraft.io/antares/trending.svg?name=0)](https://snapcraft.io/antares) [![Twitter Follow](https://img.shields.io/twitter/follow/AntaresSQL?style=social)](https://twitter.com/AntaresSQL) [![Plant a Tree](https://raw.githubusercontent.com/Fabio286/treedom-badge/master/svg/plant-a-tree.svg)](https://www.treedom.net/en/user/fabio-di-stasio/event/antares-for-the-planet)
+![GitHub package.json version](https://img.shields.io/github/package-json/v/fabio286/antares) ![GitHub](https://img.shields.io/github/license/fabio286/antares) [![Build Status](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2Ffabio286%2Fantares%2Fbadge&style=flat)](https://actions-badge.atrox.dev/fabio286/antares/goto) [![antares](https://snapcraft.io/antares/badge.svg)](https://snapcraft.io/antares) [![antares](https://snapcraft.io/antares/trending.svg?name=0)](https://snapcraft.io/antares) [![Twitter Follow](https://img.shields.io/twitter/follow/AntaresSQL?style=social)](https://twitter.com/AntaresSQL) [![Plant a Tree](https://raw.githubusercontent.com/Fabio286/treedom-badge/master/svg/plant-a-tree.svg)](https://www.treedom.net/en/user/fabio-di-stasio/event/antares-for-the-planet)

 Antares is an SQL client based on [Electron.js](https://github.com/electron/electron) and [Vue.js](https://github.com/vuejs/vue) that aims to become a useful tool, especially for developers.  
-My target is to support as many databases as possible, and all major operating systems, including the ARM versions.  
+Our target is to support as many databases as possible, and all major operating systems, including the ARM versions.  

 **At the moment this application is in development state, many features will come in future updates**, and supports only MySQL/MariaDB and PostgreSQL.  
 At the moment, however, there are all the features necessary to have a pleasant database management experience, so give it a chance and send us your feedback, we would really appreciate it.  
@@ -17,38 +17,49 @@ We are actively working on it, hoping to provide new cool features, improvements
 👁 To stay tuned for new releases [follow Antares SQL](https://twitter.com/AntaresSQL) on Twitter.  
 🌟 Don't forget to **leave a star** if you appreciate this project.

+## Current key features
+
+- Multiple database connections at same time.
+- Database management (add/edit/delete).
+- Full tables management, including indexes and foreign keys.
+- Views, triggers, stored routines, functions and schedulers management (add/edit/delete).
+- A modern and friendly tab system; keep open every kind of tab you need in your workspace.
+- Fake table data filler to generate tons of data for test purpose.
+- Query suggestions and auto complete.
+- SSH tunnel support.
+- Dark and light theme.
+- Editor themes.
+- Scratchpad.
+- Secure password storage.
+
 ## Philosophy

 Why are we developing an SQL client when there are a lot of them on the market?  
 The main goal is to develop a totally free, full featured, cross platform and open source alternative, empowered by JavaScript's ecosystem.  
 A modern application created with minimalism and semplicity in mind, with features in the right places, not hundreds of tiny buttons, nested tabs or submenu; productivity comes first.  

+## Installation
+
+Based on your operating system you can have one or more distribution formats to choose based on your preferences.  
+Since Antares SQL is a free software we haven't a budget to spend in annual licenses or certificates. This can result that on some platforms you need some additional passages to install this app.
+
+### Linux
+
+On Linux you can simply download and run `.AppImage` distributions, install from Snap Store or from AUR.
+
+### Windows
+
+On Windows you can choose between Microsoft Store and download `.exe` distribution. The latter lacks of a certificate, so to install you need to click on "More info" and then "Run anyway" on SmartScreen prompt.
+
+### MacOS
+
+On macOS you can run `.dmg` distribution following [this guide](https://support.apple.com/guide/mac-help/mh40616/mac) to install apps from unknown developers.
+
 ## Download

 [![Get it from the Snap Store](https://snapcraft.io/static/images/badges/en/snap-store-black.svg)](https://snapcraft.io/antares) [![Get it from AUR](https://raw.githubusercontent.com/Fabio286/antares/3e00c4bae6e036300c752c1a40c5a038fea9c169/docs/aur-badge.svg)](https://aur.archlinux.org/packages/antares-sql/) [![Get it from Microsoft Store](https://raw.githubusercontent.com/Fabio286/antares/gh-pages/src/assets/ms-store.png)](https://www.microsoft.com/p/antares-sql-client/9nhtb9sq51r1?cid=storebadge&ocid=badge&rtc=1&activetab=pivot:overviewtab)  
 🚀 **[Other Downloads](https://github.com/Fabio286/antares/releases/latest)**

-## How to contribute
-
- 🌍 [Translate Antares](https://github.com/Fabio286/antares/wiki/Translate-Antares)
- 📖 [Contributors Guide](https://github.com/Fabio286/antares/wiki/Contributors-Guide)
- 🚧 [Project Board](https://github.com/users/Fabio286/projects/1)
-
-## Current main features
-
- Multiple database connections at same time.
- Database management (add/edit/delete).
- Full tables management, including indexes and foreign keys.
- Views, triggers, stored routines, functions and schedulers management (add/edit/delete).
- Fake table data filler.
- Run queries on multiple tabs.
- Query suggestions and auto complete.
- SSH tunnel support.
- Dark and light theme.
- Scratchpad.
- Multi language.
- Secure password storage.
-
 ## Coming soon

 This is a roadmap with major features will come in near future.
@@ -60,6 +71,7 @@ This is a roadmap with major features will come in near future.
 - More context menu shortcuts.
 - More keyboard shortcuts.
 - Import/export and migration.
+- Apple Silicon distribution

 ## Currently supported

@@ -78,7 +90,7 @@ This is a roadmap with major features will come in near future.

 - [x] Windows
 - [x] Linux
- [x] MacOS (not tested due lack of hardware)
+- [x] MacOS

 #### • ARM

@@ -86,15 +98,17 @@ This is a roadmap with major features will come in near future.
 - [x] Linux
 - [ ] MacOS

+## How to contribute
+
+- 🌍 [Translate Antares](https://github.com/Fabio286/antares/wiki/Translate-Antares)
+- 📖 [Contributors Guide](https://github.com/Fabio286/antares/wiki/Contributors-Guide)
+- 🚧 [Project Board](https://github.com/users/Fabio286/projects/1)
+
 ## Translations

 **Italian Translation** / [Giuseppe Gigliotti](https://github.com/ReverbOD) [[#20](https://github.com/Fabio286/antares/pull/20)]  
-**Arabic Translation** / [Mohd-PH](https://github.com/Mohd-PH) [[#29](https://github.com/Fabio286/antares/pull/29)]  
-**Spanish Translation** / [hongkfui](https://github.com/hongkfui) [[#32](https://github.com/Fabio286/antares/pull/32)]  
-**French Translation** / [MrAnyx](https://github.com/MrAnyx) [[#44](https://github.com/Fabio286/antares/pull/44)]  
+**Arabic Translation** (needs updates) / [Mohd-PH](https://github.com/Mohd-PH) [[#29](https://github.com/Fabio286/antares/pull/29)]  
+**Spanish Translation** (needs updates) / [hongkfui](https://github.com/hongkfui) [[#32](https://github.com/Fabio286/antares/pull/32)]  
+**French Translation** (needs updates) / [MrAnyx](https://github.com/MrAnyx) [[#44](https://github.com/Fabio286/antares/pull/44)]  
 **Portugues (Brasil)** / [Daniel Eduardo](https://github.com/daeleduardo) [[#54](https://github.com/Fabio286/antares/pull/54)]  
 **Deutsch (Deutschland)** / [Christian Ratz](https://github.com/digitalgopnik) [[#74](https://github.com/Fabio286/antares/pull/74)]
-
-## Reviews
-
-<a target="_blank" href="https://www.softx64.com/windows/antares-sql-client.html" title="Antares SQL Client review"><img src="https://www.softx64.com/softx64-review.png" alt="Antares SQL Client review" /></a>
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "antares",
  "productName": "Antares",
-  "version": "0.2.1",
+  "version": "0.3.6",
  "description": "A cross-platform easy to use SQL client.",
  "license": "MIT",
  "repository": "https://github.com/Fabio286/antares.git",
@@ -87,47 +87,47 @@
    }
  },
  "dependencies": {
-    "@electron/remote": "^1.2.0",
-    "@mdi/font": "^5.9.55",
+    "@electron/remote": "^2.0.1",
+    "@mdi/font": "^6.1.95",
    "ace-builds": "^1.4.12",
-    "electron-log": "^4.3.5",
+    "electron-log": "^4.4.1",
    "electron-store": "^8.0.0",
    "electron-updater": "^4.3.9",
    "faker": "^5.5.3",
-    "marked": "^2.1.1",
+    "marked": "^3.0.3",
    "moment": "^2.29.1",
-    "mysql2": "^2.2.5",
-    "pg": "^8.5.1",
+    "mysql2": "^2.3.0",
+    "pg": "^8.7.1",
    "pgsql-ast-parser": "^7.2.1",
-    "source-map-support": "^0.5.16",
+    "source-map-support": "^0.5.20",
    "spectre.css": "^0.5.9",
    "sql-formatter": "^4.0.2",
-    "ssh2-promise": "^0.1.7",
+    "ssh2-promise": "^0.2.0",
    "v-mask": "^2.2.4",
-    "vue-i18n": "^8.24.4",
+    "vue-i18n": "^8.25.1",
    "vuedraggable": "^2.24.3",
    "vuex": "^3.6.2"
  },
  "devDependencies": {
-    "@babel/eslint-parser": "^7.14.5",
+    "@babel/eslint-parser": "^7.15.4",
    "cross-env": "^7.0.2",
-    "electron": "^13.1.2",
+    "electron": "^14.0.1",
    "electron-builder": "^22.11.7",
    "electron-devtools-installer": "^3.2.0",
    "electron-webpack": "^2.8.2",
    "electron-webpack-vue": "^2.4.0",
-    "eslint": "^7.29.0",
+    "eslint": "^7.32.0",
    "eslint-config-standard": "^16.0.3",
-    "eslint-plugin-import": "^2.23.4",
+    "eslint-plugin-import": "^2.24.2",
    "eslint-plugin-node": "^11.1.0",
    "eslint-plugin-promise": "^5.1.0",
-    "eslint-plugin-vue": "^7.11.1",
-    "sass": "^1.35.1",
+    "eslint-plugin-vue": "^7.17.0",
+    "sass": "^1.40.0",
    "sass-loader": "^10.2.0",
-    "standard-version": "^9.3.0",
+    "standard-version": "^9.3.1",
    "stylelint": "^13.13.1",
    "stylelint-config-standard": "^22.0.0",
-    "stylelint-scss": "^3.19.0",
+    "stylelint-scss": "^3.21.0",
    "vue": "^2.6.14",
    "vue-template-compiler": "^2.6.14",
    "webpack": "^4.46.0"
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -4,9 +4,7 @@ summary: Open source SQL client made to be simple and complete.
 description: |
  Antares is an SQL client that aims to become an useful and complete tool, especially for developers.
  The target is to support as many databases as possible, and all major operating systems, including the ARM versions.
-  At the moment this application is an alpha and supports only MySQL and x86 architecture.
-  Most of its current features might be enough for MySQL management, so give it a chance and send us your feedback, we would really appreciate it.
-base: core18
+base: core20

 grade: stable
 confinement: strict
@@ -60,6 +58,7 @@ parts:
      - fcitx-frontend-gtk3
      - libappindicator3-1
      - libasound2
+      - libcurl4
      - libgconf-2-4
      - libgtk-3-0
      - libnotify4
@@ -71,13 +70,59 @@ parts:
      - libsecret-1-0
      - libxtst6
      - libxkbfile1
+      - gcc-10-base
+      - libapparmor1
+      - libblkid1
+      - libbsd0
+      - libcom-err2
+      - libcrypt1
+      - libdb5.3
+      - libdbus-1-3
+      - libexpat1
+      - libffi7
+      - libgcc-s1
+      - libgcrypt20
+      - libglib2.0-0
+      - libgmp10
+      - libgnutls30
+      - libgpg-error0
+      - libgssapi-krb5-2
+      - libhogweed5
+      - libidn2-0
+      - libjson-c4
+      - libk5crypto3
+      - libkeyutils1
+      - libkrb5-3
+      - libkrb5support0
+      - liblz4-1
+      - liblzma5
+      - libmount1
+      - libnettle7
+      - libp11-kit0
+      - libpcre2-8-0
+      - libselinux1
+      - libsqlite3-0
+      - libssl1.1
+      - libstdc++6
+      - libsystemd0
+      - libtasn1-6
+      - libudev1
+      - libunistring2
+      - libuuid1
+      - libwrap0
+      - libzstd1
+      - zlib1g 
+      - libx11-xcb1
+      - libdrm2
+      - libgbm1
+      - libxcb-dri3-0
  cleanup:
    after: [antares]
    plugin: nil
-    build-snaps: [gnome-3-28-1804]
+    build-snaps: [gnome-3-38-2004]
    override-prime: |
      set -eux
-      cd /snap/gnome-3-28-1804/current
+      cd /snap/gnome-3-38-2004/current
      find . -type f,l -exec rm -f $SNAPCRAFT_PRIME/{} \;

  mdns-lookup:
@@ -91,7 +136,7 @@ parts:
      - libnss-mdns
    override-prime: |
      set -eux
-      sed -Ee 's/^\s*hosts:(\s+)files/hosts:\1files mdns4_minimal \[NOTFOUND=return\]/' /snap/core18/current/etc/nsswitch.conf > $SNAPCRAFT_STAGE/etc/nsswitch.conf
+      sed -Ee 's/^\s*hosts:(\s+)files/hosts:\1files mdns4_minimal \[NOTFOUND=return\]/' /snap/core20/current/etc/nsswitch.conf > $SNAPCRAFT_STAGE/etc/nsswitch.conf
      snapcraftctl prime
    prime:
      - lib/$SNAPCRAFT_ARCH_TRIPLET/libnss_mdns4_minimal*
@@ -101,7 +146,7 @@ apps:
  antares:
    command: opt/Antares/antares --no-sandbox
    desktop: usr/share/applications/antares.desktop
-    extensions: [gnome-3-28]
+    extensions: [gnome-3-38]
    environment:
      # Fallback to XWayland if running in a Wayland session.
      DISABLE_WAYLAND: 1
--- a/src/common/customizations/defaults.js
+++ b/src/common/customizations/defaults.js
@@ -44,6 +44,7 @@ module.exports = {
   unsigned: false,
   nullable: false,
   zerofill: false,
+   tableOptions: false,
   autoIncrement: false,
   comment: false,
   collation: false,
--- a/src/common/customizations/mysql.js
+++ b/src/common/customizations/mysql.js
@@ -40,6 +40,7 @@ module.exports = {
   unsigned: true,
   nullable: true,
   zerofill: true,
+   tableOptions: true,
   autoIncrement: true,
   comment: true,
   collation: true,
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -1,11 +1,13 @@
 'use strict';

-import { app, BrowserWindow, /* session, */ nativeImage } from 'electron';
+import { app, BrowserWindow, /* session, */ nativeImage, Menu } from 'electron';
 import * as path from 'path';
 import Store from 'electron-store';
+import * as remoteMain from '@electron/remote/main';

 import ipcHandlers from './ipc-handlers';

+// remoteMain.initialize();
 Store.initRenderer();

 const isDevelopment = process.env.NODE_ENV !== 'production';
@@ -30,13 +32,14 @@ async function createMainWindow () {
         nodeIntegration: true,
         contextIsolation: false,
         'web-security': false,
-         enableRemoteModule: true,
         spellcheck: false
      },
      frame: false,
      backgroundColor: '#1d1d1d'
   });

+   remoteMain.enable(window.webContents);
+
   try {
      if (isDevelopment) { //
         await window.loadURL(`http://localhost:${process.env.ELECTRON_WEBPACK_WDS_PORT}`);
@@ -96,7 +99,17 @@ else {
   // create main BrowserWindow when electron is ready
   app.on('ready', async () => {
      mainWindow = await createMainWindow();
+      Menu.setApplicationMenu(null);
+
      if (isDevelopment)
         mainWindow.webContents.openDevTools();
+
+      process.on('uncaughtException', error => {
+         mainWindow.webContents.send('unhandled-exception', error);
+      });
+
+      process.on('unhandledRejection', error => {
+         mainWindow.webContents.send('unhandled-exception', error);
+      });
   });
 }
--- a/src/main/ipc-handlers/schema.js
+++ b/src/main/ipc-handlers/schema.js
@@ -112,6 +112,17 @@ export default connections => {
      }
   });

+   ipcMain.handle('kill-process', async (event, { uid, pid }) => {
+      try {
+         const result = await connections[uid].killProcess(pid);
+
+         return { status: 'success', response: result };
+      }
+      catch (err) {
+         return { status: 'error', response: err.toString() };
+      }
+   });
+
   ipcMain.handle('use-schema', async (event, { uid, schema }) => {
      if (!schema) return;

@@ -128,7 +139,12 @@ export default connections => {
      if (!query) return;

      try {
-         const result = await connections[uid].raw(query, { nest: true, details: true, schema });
+         const result = await connections[uid].raw(query, {
+            nest: true,
+            details: true,
+            schema,
+            comments: false
+         });

         return { status: 'success', response: result };
      }
--- a/src/main/ipc-handlers/tables.js
+++ b/src/main/ipc-handlers/tables.js
@@ -29,7 +29,7 @@ export default (connections) => {
         if (sortParams && sortParams.field && sortParams.dir)
            query.orderBy({ [sortParams.field]: sortParams.dir.toUpperCase() });

-         const result = await query.run({ details: true });
+         const result = await query.run({ details: true, schema });

         return { status: 'success', response: result };
      }
@@ -38,6 +38,26 @@ export default (connections) => {
      }
   });

+   ipcMain.handle('get-table-count', async (event, params) => {
+      try {
+         const result = await connections[params.uid].getTableApproximateCount(params);
+         return { status: 'success', response: result };
+      }
+      catch (err) {
+         return { status: 'error', response: err.toString() };
+      }
+   });
+
+   ipcMain.handle('get-table-options', async (event, params) => {
+      try {
+         const result = await connections[params.uid].getTableOptions(params);
+         return { status: 'success', response: result };
+      }
+      catch (err) {
+         return { status: 'error', response: err.toString() };
+      }
+   });
+
   ipcMain.handle('get-table-indexes', async (event, params) => {
      try {
         const result = await connections[params.uid].getTableIndexes(params);
--- a/src/main/ipc-handlers/updates.js
+++ b/src/main/ipc-handlers/updates.js
@@ -9,7 +9,7 @@ autoUpdater.allowPrerelease = persistentStore.get('allow_prerelease', true);
 export default () => {
   ipcMain.on('check-for-updates', event => {
      mainWindow = event;
-      if (process.windowsStore)
+      if (process.windowsStore || (process.platform === 'linux' && !process.env.APPIMAGE))
         mainWindow.reply('no-auto-update');
      else {
         autoUpdater.checkForUpdatesAndNotify().catch(() => {
--- a/src/main/libs/ClientsFactory.js
+++ b/src/main/libs/ClientsFactory.js
@@ -2,6 +2,12 @@
 import { MySQLClient } from './clients/MySQLClient';
 import { PostgreSQLClient } from './clients/PostgreSQLClient';

+const queryLogger = sql => {
+   // Remove comments, newlines and multiple spaces
+   const escapedSql = sql.replace(/(\/\*(.|[\r\n])*?\*\/)|(--(.*|[\r\n]))/gm, '').replace(/\s\s+/g, ' ');
+   console.log(escapedSql);
+};
+
 export class ClientsFactory {
   /**
    * Returns a database connection based on received args.
@@ -23,6 +29,8 @@ export class ClientsFactory {
    * @memberof ClientsFactory
    */
   static getConnection (args) {
+      args.logger = queryLogger;
+
      switch (args.client) {
         case 'mysql':
         case 'maria':
--- a/src/main/libs/clients/MySQLClient.js
+++ b/src/main/libs/clients/MySQLClient.js
@@ -335,11 +335,11 @@ export class MySQLClient extends AntaresCore {
         .select('*')
         .schema('information_schema')
         .from('COLUMNS')
-         .where({ TABLE_SCHEMA: `= '${this._schema || schema}'`, TABLE_NAME: `= '${table}'` })
+         .where({ TABLE_SCHEMA: `= '${schema}'`, TABLE_NAME: `= '${table}'` })
         .orderBy({ ORDINAL_POSITION: 'ASC' })
         .run();

-      const { rows: fields } = await this.raw(`SHOW CREATE TABLE \`${this._schema || schema}\`.\`${table}\``);
+      const { rows: fields } = await this.raw(`SHOW CREATE TABLE \`${schema}\`.\`${table}\``);

      const remappedFields = fields.map(row => {
         if (!row['Create Table']) return false;
@@ -363,15 +363,14 @@ export class MySQLClient extends AntaresCore {

                  const details = fieldArr.slice(2).join(' ');
                  let defaultValue = null;
-                  if (details.includes('DEFAULT')) {
+                  if (details.includes('DEFAULT'))
                     defaultValue = details.match(/(?<=DEFAULT ).*?$/gs)[0].split(' COMMENT')[0];
-                     const defaultValueArr = defaultValue.split('');
-                     if (defaultValueArr[0] === '\'') {
-                        defaultValueArr.shift();
-                        defaultValueArr.pop();
-                        defaultValue = defaultValueArr.join('');
-                     }
-                  }
+                     // const defaultValueArr = defaultValue.split('');
+                     // if (defaultValueArr[0] === '\'') {
+                     //    defaultValueArr.shift();
+                     //    defaultValueArr.pop();
+                     //    defaultValue = defaultValueArr.join('');
+                     // }

                  const typeAndLength = nameAndType[1].replace(')', '').split('(');

@@ -425,6 +424,56 @@ export class MySQLClient extends AntaresCore {
      });
   }

+   /**
+    * @param {Object} params
+    * @param {String} params.schema
+    * @param {String} params.table
+    * @returns {Object} table row count
+    * @memberof MySQLClient
+    */
+   async getTableApproximateCount ({ schema, table }) {
+      const { rows } = await this.raw(`SELECT table_rows "count" FROM information_schema.tables WHERE table_name = "${table}" AND table_schema = "${schema}"`);
+
+      return rows.length ? rows[0].count : 0;
+   }
+
+   /**
+    * @param {Object} params
+    * @param {String} params.schema
+    * @param {String} params.table
+    * @returns {Object} table options
+    * @memberof MySQLClient
+    */
+   async getTableOptions ({ schema, table }) {
+      const { rows } = await this.raw(`SHOW TABLE STATUS FROM \`${schema}\` WHERE Name = '${table}'`);
+
+      if (rows.length) {
+         let tableType;
+         switch (rows[0].Comment) {
+            case 'VIEW':
+               tableType = 'view';
+               break;
+            default:
+               tableType = 'table';
+               break;
+         }
+
+         return {
+            name: rows[0].Name,
+            type: tableType,
+            rows: rows[0].Rows,
+            created: rows[0].Create_time,
+            updated: rows[0].Update_time,
+            engine: rows[0].Engine,
+            comment: rows[0].Comment,
+            size: rows[0].Data_length + rows[0].Index_length,
+            autoIncrement: rows[0].Auto_increment,
+            collation: rows[0].Collation
+         };
+      };
+      return {};
+   }
+
   /**
    * @param {Object} params
    * @param {String} params.schema
@@ -574,7 +623,7 @@ export class MySQLClient extends AntaresCore {
    * @memberof MySQLClient
    */
   async dropView (params) {
-      const sql = `DROP VIEW \`${this._schema}\`.\`${params.view}\``;
+      const sql = `DROP VIEW \`${params.schema}\`.\`${params.view}\``;
      return await this.raw(sql);
   }

@@ -586,10 +635,15 @@ export class MySQLClient extends AntaresCore {
    */
   async alterView (params) {
      const { view } = params;
-      let sql = `ALTER ALGORITHM = ${view.algorithm}${view.definer ? ` DEFINER=${view.definer}` : ''} SQL SECURITY ${view.security} VIEW \`${this._schema}\`.\`${view.oldName}\` AS ${view.sql} ${view.updateOption ? `WITH ${view.updateOption} CHECK OPTION` : ''}`;
+      let sql = `
+         USE \`${view.schema}\`; 
+         ALTER ALGORITHM = ${view.algorithm}${view.definer ? ` DEFINER=${view.definer}` : ''} 
+         SQL SECURITY ${view.security} 
+         VIEW \`${view.schema}\`.\`${view.oldName}\` AS ${view.sql} ${view.updateOption ? `WITH ${view.updateOption} CHECK OPTION` : ''}
+      `;

      if (view.name !== view.oldName)
-         sql += `; RENAME TABLE \`${this._schema}\`.\`${view.oldName}\` TO \`${this._schema}\`.\`${view.name}\``;
+         sql += `; RENAME TABLE \`${view.schema}\`.\`${view.oldName}\` TO \`${view.schema}\`.\`${view.name}\``;

      return await this.raw(sql);
   }
@@ -600,8 +654,8 @@ export class MySQLClient extends AntaresCore {
    * @returns {Array.<Object>} parameters
    * @memberof MySQLClient
    */
-   async createView (view) {
-      const sql = `CREATE ALGORITHM = ${view.algorithm} ${view.definer ? `DEFINER=${view.definer} ` : ''}SQL SECURITY ${view.security} VIEW \`${this._schema}\`.\`${view.name}\` AS ${view.sql} ${view.updateOption ? `WITH ${view.updateOption} CHECK OPTION` : ''}`;
+   async createView (params) {
+      const sql = `CREATE ALGORITHM = ${params.algorithm} ${params.definer ? `DEFINER=${params.definer} ` : ''}SQL SECURITY ${params.security} VIEW \`${params.schema}\`.\`${params.name}\` AS ${params.sql} ${params.updateOption ? `WITH ${params.updateOption} CHECK OPTION` : ''}`;
      return await this.raw(sql);
   }

@@ -634,7 +688,7 @@ export class MySQLClient extends AntaresCore {
    * @memberof MySQLClient
    */
   async dropTrigger (params) {
-      const sql = `DROP TRIGGER \`${this._schema}\`.\`${params.trigger}\``;
+      const sql = `DROP TRIGGER \`${params.schema}\`.\`${params.trigger}\``;
      return await this.raw(sql);
   }

@@ -651,8 +705,8 @@ export class MySQLClient extends AntaresCore {

      try {
         await this.createTrigger(tempTrigger);
-         await this.dropTrigger({ trigger: tempTrigger.name });
-         await this.dropTrigger({ trigger: trigger.oldName });
+         await this.dropTrigger({ schema: trigger.schema, trigger: tempTrigger.name });
+         await this.dropTrigger({ schema: trigger.schema, trigger: trigger.oldName });
         await this.createTrigger(trigger);
      }
      catch (err) {
@@ -666,8 +720,8 @@ export class MySQLClient extends AntaresCore {
    * @returns {Array.<Object>} parameters
    * @memberof MySQLClient
    */
-   async createTrigger (trigger) {
-      const sql = `CREATE ${trigger.definer ? `DEFINER=${trigger.definer} ` : ''}TRIGGER \`${this._schema}\`.\`${trigger.name}\` ${trigger.activation} ${trigger.event} ON \`${trigger.table}\` FOR EACH ROW ${trigger.sql}`;
+   async createTrigger (params) {
+      const sql = `CREATE ${params.definer ? `DEFINER=${params.definer} ` : ''}TRIGGER \`${params.schema}\`.\`${params.name}\` ${params.activation} ${params.event} ON \`${params.table}\` FOR EACH ROW ${params.sql}`;
      return await this.raw(sql, { split: false });
   }

@@ -741,7 +795,7 @@ export class MySQLClient extends AntaresCore {
    * @memberof MySQLClient
    */
   async dropRoutine (params) {
-      const sql = `DROP PROCEDURE \`${this._schema}\`.\`${params.routine}\``;
+      const sql = `DROP PROCEDURE \`${params.schema}\`.\`${params.routine}\``;
      return await this.raw(sql);
   }

@@ -758,8 +812,8 @@ export class MySQLClient extends AntaresCore {

      try {
         await this.createRoutine(tempProcedure);
-         await this.dropRoutine({ routine: tempProcedure.name });
-         await this.dropRoutine({ routine: routine.oldName });
+         await this.dropRoutine({ schema: routine.schema, routine: tempProcedure.name });
+         await this.dropRoutine({ schema: routine.schema, routine: routine.oldName });
         await this.createRoutine(routine);
      }
      catch (err) {
@@ -773,21 +827,21 @@ export class MySQLClient extends AntaresCore {
    * @returns {Array.<Object>} parameters
    * @memberof MySQLClient
    */
-   async createRoutine (routine) {
-      const parameters = 'parameters' in routine
-         ? routine.parameters.reduce((acc, curr) => {
+   async createRoutine (params) {
+      const parameters = 'parameters' in params
+         ? params.parameters.reduce((acc, curr) => {
            acc.push(`${curr.context} \`${curr.name}\` ${curr.type}${curr.length ? `(${curr.length})` : ''}`);
            return acc;
         }, []).join(',')
         : '';

-      const sql = `CREATE ${routine.definer ? `DEFINER=${routine.definer} ` : ''}PROCEDURE \`${this._schema}\`.\`${routine.name}\`(${parameters})
+      const sql = `CREATE ${params.definer ? `DEFINER=${params.definer} ` : ''}PROCEDURE \`${params.schema}\`.\`${params.name}\`(${parameters})
         LANGUAGE SQL
-         ${routine.deterministic ? 'DETERMINISTIC' : 'NOT DETERMINISTIC'}
-         ${routine.dataAccess}
-         SQL SECURITY ${routine.security}
-         COMMENT '${routine.comment}'
-         ${routine.sql}`;
+         ${params.deterministic ? 'DETERMINISTIC' : 'NOT DETERMINISTIC'}
+         ${params.dataAccess}
+         SQL SECURITY ${params.security}
+         COMMENT '${params.comment}'
+         ${params.sql}`;

      return await this.raw(sql, { split: false });
   }
@@ -868,7 +922,7 @@ export class MySQLClient extends AntaresCore {
    * @memberof MySQLClient
    */
   async dropFunction (params) {
-      const sql = `DROP FUNCTION \`${this._schema}\`.\`${params.func}\``;
+      const sql = `DROP FUNCTION \`${params.schema}\`.\`${params.func}\``;
      return await this.raw(sql);
   }

@@ -885,8 +939,8 @@ export class MySQLClient extends AntaresCore {

      try {
         await this.createFunction(tempProcedure);
-         await this.dropFunction({ func: tempProcedure.name });
-         await this.dropFunction({ func: func.oldName });
+         await this.dropFunction({ schema: func.schema, func: tempProcedure.name });
+         await this.dropFunction({ schema: func.schema, func: func.oldName });
         await this.createFunction(func);
      }
      catch (err) {
@@ -900,20 +954,22 @@ export class MySQLClient extends AntaresCore {
    * @returns {Array.<Object>} parameters
    * @memberof MySQLClient
    */
-   async createFunction (func) {
-      const parameters = func.parameters.reduce((acc, curr) => {
-         acc.push(`\`${curr.name}\` ${curr.type}${curr.length ? `(${curr.length})` : ''}`);
-         return acc;
-      }, []).join(',');
+   async createFunction (params) {
+      const parameters = 'parameters' in params
+         ? params.parameters.reduce((acc, curr) => {
+            acc.push(`\`${curr.name}\` ${curr.type}${curr.length ? `(${curr.length})` : ''}`);
+            return acc;
+         }, []).join(',')
+         : '';

-      const body = func.returns ? func.sql : 'BEGIN\n  RETURN 0;\nEND';
+      const body = params.returns ? params.sql : 'BEGIN\n  RETURN 0;\nEND';

-      const sql = `CREATE ${func.definer ? `DEFINER=${func.definer} ` : ''}FUNCTION \`${this._schema}\`.\`${func.name}\`(${parameters}) RETURNS ${func.returns || 'SMALLINT'}${func.returnsLength ? `(${func.returnsLength})` : ''}
+      const sql = `CREATE ${params.definer ? `DEFINER=${params.definer} ` : ''}FUNCTION \`${params.schema}\`.\`${params.name}\`(${parameters}) RETURNS ${params.returns || 'SMALLINT'}${params.returnsLength ? `(${params.returnsLength})` : ''}
         LANGUAGE SQL
-         ${func.deterministic ? 'DETERMINISTIC' : 'NOT DETERMINISTIC'}
-         ${func.dataAccess}
-         SQL SECURITY ${func.security}
-         COMMENT '${func.comment}'
+         ${params.deterministic ? 'DETERMINISTIC' : 'NOT DETERMINISTIC'}
+         ${params.dataAccess}
+         SQL SECURITY ${params.security}
+         COMMENT '${params.comment}'
         ${body}`;

      return await this.raw(sql, { split: false });
@@ -960,7 +1016,7 @@ export class MySQLClient extends AntaresCore {
    * @memberof MySQLClient
    */
   async dropEvent (params) {
-      const sql = `DROP EVENT \`${this._schema}\`.\`${params.scheduler}\``;
+      const sql = `DROP EVENT \`${params.schema}\`.\`${params.scheduler}\``;
      return await this.raw(sql);
   }

@@ -976,13 +1032,13 @@ export class MySQLClient extends AntaresCore {
      if (scheduler.execution === 'EVERY' && scheduler.every[0].includes('-'))
         scheduler.every[0] = `'${scheduler.every[0]}'`;

-      const sql = `ALTER ${scheduler.definer ? ` DEFINER=${scheduler.definer}` : ''} EVENT \`${this._schema}\`.\`${scheduler.oldName}\` 
+      const sql = `ALTER ${scheduler.definer ? ` DEFINER=${scheduler.definer}` : ''} EVENT \`${scheduler.schema}\`.\`${scheduler.oldName}\` 
      ON SCHEDULE
         ${scheduler.execution === 'EVERY'
      ? `EVERY ${scheduler.every.join(' ')}${scheduler.starts ? ` STARTS '${scheduler.starts}'` : ''}${scheduler.ends ? ` ENDS '${scheduler.ends}'` : ''}`
      : `AT '${scheduler.at}'`}
      ON COMPLETION${!scheduler.preserve ? ' NOT' : ''} PRESERVE
-      ${scheduler.name !== scheduler.oldName ? `RENAME TO \`${this._schema}\`.\`${scheduler.name}\`` : ''}
+      ${scheduler.name !== scheduler.oldName ? `RENAME TO \`${scheduler.schema}\`.\`${scheduler.name}\`` : ''}
      ${scheduler.state}
      COMMENT '${scheduler.comment}'
      DO ${scheduler.sql}`;
@@ -996,16 +1052,16 @@ export class MySQLClient extends AntaresCore {
    * @returns {Array.<Object>} parameters
    * @memberof MySQLClient
    */
-   async createEvent (scheduler) {
-      const sql = `CREATE ${scheduler.definer ? ` DEFINER=${scheduler.definer}` : ''} EVENT \`${this._schema}\`.\`${scheduler.name}\` 
+   async createEvent (params) {
+      const sql = `CREATE ${params.definer ? ` DEFINER=${params.definer}` : ''} EVENT \`${params.schema}\`.\`${params.name}\` 
      ON SCHEDULE
-         ${scheduler.execution === 'EVERY'
-      ? `EVERY ${scheduler.every.join(' ')}${scheduler.starts ? ` STARTS '${scheduler.starts}'` : ''}${scheduler.ends ? ` ENDS '${scheduler.ends}'` : ''}`
-      : `AT '${scheduler.at}'`}
-      ON COMPLETION${!scheduler.preserve ? ' NOT' : ''} PRESERVE
-      ${scheduler.state}
-      COMMENT '${scheduler.comment}'
-      DO ${scheduler.sql}`;
+         ${params.execution === 'EVERY'
+      ? `EVERY ${params.every.join(' ')}${params.starts ? ` STARTS '${params.starts}'` : ''}${params.ends ? ` ENDS '${params.ends}'` : ''}`
+      : `AT '${params.at}'`}
+      ON COMPLETION${!params.preserve ? ' NOT' : ''} PRESERVE
+      ${params.state}
+      COMMENT '${params.comment}'
+      DO ${params.sql}`;

      return await this.raw(sql, { split: false });
   }
@@ -1120,6 +1176,10 @@ export class MySQLClient extends AntaresCore {
      });
   }

+   async killProcess (id) {
+      return await this.raw(`KILL ${id}`);
+   }
+
   /**
    * CREATE TABLE
    *
@@ -1128,13 +1188,56 @@ export class MySQLClient extends AntaresCore {
    */
   async createTable (params) {
      const {
-         name,
-         collation,
-         comment,
-         engine
+         schema,
+         fields,
+         foreigns,
+         indexes,
+         options
      } = params;
+      const newColumns = [];
+      const newIndexes = [];
+      const newForeigns = [];

-      const sql = `CREATE TABLE \`${this._schema}\`.\`${name}\` (\`${name}_ID\` INT NULL) COMMENT='${comment}', COLLATE='${collation}', ENGINE=${engine}`;
+      let sql = `CREATE TABLE \`${schema}\`.\`${options.name}\``;
+
+      // ADD FIELDS
+      fields.forEach(field => {
+         const typeInfo = this._getTypeInfo(field.type);
+         const length = typeInfo.length ? field.enumValues || field.numLength || field.charLength || field.datePrecision : false;
+
+         newColumns.push(`\`${field.name}\` 
+            ${field.type.toUpperCase()}${length ? `(${length})` : ''} 
+            ${field.unsigned ? 'UNSIGNED' : ''} 
+            ${field.zerofill ? 'ZEROFILL' : ''}
+            ${field.nullable ? 'NULL' : 'NOT NULL'}
+            ${field.autoIncrement ? 'AUTO_INCREMENT' : ''}
+            ${field.default ? `DEFAULT ${field.default}` : ''}
+            ${field.comment ? `COMMENT '${field.comment}'` : ''}
+            ${field.collation ? `COLLATE ${field.collation}` : ''}
+            ${field.onUpdate ? `ON UPDATE ${field.onUpdate}` : ''}`);
+      });
+
+      // ADD INDEX
+      indexes.forEach(index => {
+         const fields = index.fields.map(field => `\`${field}\``).join(',');
+         let type = index.type;
+
+         if (type === 'PRIMARY')
+            newIndexes.push(`PRIMARY KEY (${fields})`);
+         else {
+            if (type === 'UNIQUE')
+               type = 'UNIQUE INDEX';
+
+            newIndexes.push(`${type} \`${index.name}\` (${fields})`);
+         }
+      });
+
+      // ADD FOREIGN KEYS
+      foreigns.forEach(foreign => {
+         newForeigns.push(`CONSTRAINT \`${foreign.constraintName}\` FOREIGN KEY (\`${foreign.field}\`) REFERENCES \`${foreign.refTable}\` (\`${foreign.refField}\`) ON UPDATE ${foreign.onUpdate} ON DELETE ${foreign.onDelete}`);
+      });
+
+      sql = `${sql} (${[...newColumns, ...newIndexes, ...newForeigns].join(', ')}) COMMENT='${options.comment}', COLLATE='${options.collation}', ENGINE=${options.engine}`;

      return await this.raw(sql);
   }
@@ -1148,6 +1251,7 @@ export class MySQLClient extends AntaresCore {
   async alterTable (params) {
      const {
         table,
+         schema,
         additions,
         deletions,
         changes,
@@ -1156,7 +1260,7 @@ export class MySQLClient extends AntaresCore {
         options
      } = params;

-      let sql = `ALTER TABLE \`${this._schema || params.options.schema}\`.\`${table}\` `;
+      let sql = `ALTER TABLE \`${schema}\`.\`${table}\` `;
      const alterColumns = [];

      // OPTIONS
@@ -1268,7 +1372,7 @@ export class MySQLClient extends AntaresCore {
      sql += alterColumns.join(', ');

      // RENAME
-      if (options.name) sql += `; RENAME TABLE \`${this._schema}\`.\`${table}\` TO \`${this._schema}\`.\`${options.name}\``;
+      if (options.name) sql += `; RENAME TABLE \`${schema}\`.\`${table}\` TO \`${schema}\`.\`${options.name}\``;

      return await this.raw(sql);
   }
@@ -1280,7 +1384,7 @@ export class MySQLClient extends AntaresCore {
    * @memberof MySQLClient
    */
   async duplicateTable (params) {
-      const sql = `CREATE TABLE \`${this._schema}\`.\`${params.table}_copy\` LIKE \`${this._schema}\`.\`${params.table}\``;
+      const sql = `CREATE TABLE \`${params.schema}\`.\`${params.table}_copy\` LIKE \`${params.schema}\`.\`${params.table}\``;
      return await this.raw(sql);
   }

@@ -1291,7 +1395,7 @@ export class MySQLClient extends AntaresCore {
    * @memberof MySQLClient
    */
   async truncateTable (params) {
-      const sql = `TRUNCATE TABLE \`${this._schema}\`.\`${params.table}\``;
+      const sql = `TRUNCATE TABLE \`${params.schema}\`.\`${params.table}\``;
      return await this.raw(sql);
   }

@@ -1302,7 +1406,7 @@ export class MySQLClient extends AntaresCore {
    * @memberof MySQLClient
    */
   async dropTable (params) {
-      const sql = `DROP TABLE \`${this._schema}\`.\`${params.table}\``;
+      const sql = `DROP TABLE \`${params.schema}\`.\`${params.table}\``;
      return await this.raw(sql);
   }

@@ -1373,16 +1477,19 @@ export class MySQLClient extends AntaresCore {
    * @memberof MySQLClient
    */
   async raw (sql, args) {
-      sql = sql.replace(/(\/\*(.|[\r\n])*?\*\/)|(--(.*|[\r\n]))/gm, '');
      if (process.env.NODE_ENV === 'development') this._logger(sql);// TODO: replace BLOB content with a placeholder

      args = {
         nest: false,
         details: false,
         split: true,
+         comments: true,
         ...args
      };

+      if (!args.comments)
+         sql = sql.replace(/(\/\*(.|[\r\n])*?\*\/)|(--(.*|[\r\n]))/gm, '');// Remove comments
+
      const nestTables = args.nest ? '.' : false;
      const resultsArr = [];
      let paramsArr = [];
@@ -1419,7 +1526,7 @@ export class MySQLClient extends AntaresCore {
                        name: field.orgName,
                        alias: field.name,
                        orgName: field.orgName,
-                        schema: field.schema,
+                        schema: args.schema || field.schema,
                        table: field.table,
                        tableAlias: field.table,
                        orgTable: field.orgTable,
--- a/src/main/libs/clients/PostgreSQLClient.js
+++ b/src/main/libs/clients/PostgreSQLClient.js
@@ -94,7 +94,7 @@ export class PostgreSQLClient extends AntaresCore {
   }

   /**
-    * Executes an USE query
+    * Executes an "USE" query
    *
    * @param {String} schema
    * @memberof PostgreSQLClient
@@ -293,6 +293,53 @@ export class PostgreSQLClient extends AntaresCore {
      });
   }

+   /**
+    * @param {Object} params
+    * @param {String} params.schema
+    * @param {String} params.table
+    * @returns {Object} table row count
+    * @memberof PostgreSQLClient
+    */
+   async getTableApproximateCount ({ schema, table }) {
+      const { rows } = await this.raw(`SELECT reltuples AS count FROM pg_class WHERE relname = '${table}'`);
+
+      return rows.length ? rows[0].count : 0;
+   }
+
+   /**
+    * @param {Object} params
+    * @param {String} params.schema
+    * @param {String} params.table
+    * @returns {Object} table options
+    * @memberof MySQLClient
+    */
+   async getTableOptions ({ schema, table }) {
+      const { rows } = await this.raw(`
+         SELECT *, 
+            pg_table_size(QUOTE_IDENT(t.TABLE_SCHEMA) || '.' || QUOTE_IDENT(t.TABLE_NAME))::bigint AS data_length, 
+            pg_relation_size(QUOTE_IDENT(t.TABLE_SCHEMA) || '.' || QUOTE_IDENT(t.TABLE_NAME))::bigint AS index_length, 
+            c.reltuples, obj_description(c.oid) AS comment 
+         FROM "information_schema"."tables" AS t 
+         LEFT JOIN "pg_namespace" n ON t.table_schema = n.nspname 
+         LEFT JOIN "pg_class" c ON n.oid = c.relnamespace AND c.relname=t.table_name 
+         WHERE t."table_schema" = '${schema}'
+         AND table_name = '${table}'
+      `);
+
+      if (rows.length) {
+         return {
+            name: rows[0].table_name,
+            type: rows[0].table_type === 'VIEW' ? 'view' : 'table',
+            rows: rows[0].reltuples,
+            size: +rows[0].data_length + +rows[0].index_length,
+            collation: rows[0].Collation,
+            comment: rows[0].comment,
+            engine: ''
+         };
+      };
+      return {};
+   }
+
   /**
    * @param {Object} params
    * @param {String} params.schema
@@ -483,7 +530,7 @@ export class PostgreSQLClient extends AntaresCore {
    * @memberof PostgreSQLClient
    */
   async dropView (params) {
-      const sql = `DROP VIEW ${this._schema}.${params.view}`;
+      const sql = `DROP VIEW ${params.schema}.${params.view}`;
      return await this.raw(sql);
   }

@@ -495,10 +542,10 @@ export class PostgreSQLClient extends AntaresCore {
    */
   async alterView (params) {
      const { view } = params;
-      let sql = `CREATE OR REPLACE VIEW ${this._schema}.${view.oldName} AS ${view.sql}`;
+      let sql = `CREATE OR REPLACE VIEW ${view.schema}.${view.oldName} AS ${view.sql}`;

      if (view.name !== view.oldName)
-         sql += `; ALTER VIEW ${this._schema}.${view.oldName} RENAME TO ${view.name}`;
+         sql += `; ALTER VIEW ${view.schema}.${view.oldName} RENAME TO ${view.name}`;

      return await this.raw(sql);
   }
@@ -509,8 +556,8 @@ export class PostgreSQLClient extends AntaresCore {
    * @returns {Array.<Object>} parameters
    * @memberof PostgreSQLClient
    */
-   async createView (view) {
-      const sql = `CREATE VIEW ${this._schema}.${view.name} AS ${view.sql}`;
+   async createView (params) {
+      const sql = `CREATE VIEW ${params.schema}.${params.name} AS ${params.sql}`;
      return await this.raw(sql);
   }

@@ -560,7 +607,7 @@ export class PostgreSQLClient extends AntaresCore {
    */
   async dropTrigger (params) {
      const triggerParts = params.trigger.split('.');
-      const sql = `DROP TRIGGER "${triggerParts[1]}" ON "${triggerParts[0]}"`;
+      const sql = `DROP TRIGGER "${triggerParts[1]}" ON "${params.schema}"."${triggerParts[0]}"`;
      return await this.raw(sql);
   }

@@ -577,8 +624,8 @@ export class PostgreSQLClient extends AntaresCore {

      try {
         await this.createTrigger(tempTrigger);
-         await this.dropTrigger({ trigger: `${tempTrigger.table}.${tempTrigger.name}` });
-         await this.dropTrigger({ trigger: `${trigger.table}.${trigger.oldName}` });
+         await this.dropTrigger({ schema: trigger.schema, trigger: `${tempTrigger.table}.${tempTrigger.name}` });
+         await this.dropTrigger({ schema: trigger.schema, trigger: `${trigger.table}.${trigger.oldName}` });
         await this.createTrigger(trigger);
      }
      catch (err) {
@@ -592,9 +639,9 @@ export class PostgreSQLClient extends AntaresCore {
    * @returns {Array.<Object>} parameters
    * @memberof PostgreSQLClient
    */
-   async createTrigger (trigger) {
-      const eventsString = Array.isArray(trigger.event) ? trigger.event.join(' OR ') : trigger.event;
-      const sql = `CREATE TRIGGER "${trigger.name}" ${trigger.activation} ${eventsString} ON "${trigger.table}" FOR EACH ROW ${trigger.sql}`;
+   async createTrigger (params) {
+      const eventsString = Array.isArray(params.event) ? params.event.join(' OR ') : params.event;
+      const sql = `CREATE TRIGGER "${params.name}" ${params.activation} ${eventsString} ON "${params.schema}"."${params.table}" FOR EACH ROW ${params.sql}`;
      return await this.raw(sql, { split: false });
   }

@@ -637,6 +684,7 @@ export class PostgreSQLClient extends AntaresCore {
            AND proc.routine_type = 'PROCEDURE'
            AND proc.routine_name = '${routine}'
            AND proc.specific_schema = '${schema}'
+            AND args.data_type != NULL
         ORDER BY procedure_schema,
            specific_name,
            procedure_name,
@@ -675,7 +723,7 @@ export class PostgreSQLClient extends AntaresCore {
    * @memberof PostgreSQLClient
    */
   async dropRoutine (params) {
-      const sql = `DROP PROCEDURE ${this._schema}.${params.routine}`;
+      const sql = `DROP PROCEDURE "${params.schema}"."${params.routine}"`;
      return await this.raw(sql);
   }

@@ -692,8 +740,8 @@ export class PostgreSQLClient extends AntaresCore {

      try {
         await this.createRoutine(tempProcedure);
-         await this.dropRoutine({ routine: tempProcedure.name });
-         await this.dropRoutine({ routine: routine.oldName });
+         await this.dropRoutine({ schema: routine.schema, routine: tempProcedure.name });
+         await this.dropRoutine({ schema: routine.schema, routine: routine.oldName });
         await this.createRoutine(routine);
      }
      catch (err) {
@@ -710,15 +758,15 @@ export class PostgreSQLClient extends AntaresCore {
   async createRoutine (routine) {
      const parameters = 'parameters' in routine
         ? routine.parameters.reduce((acc, curr) => {
-            acc.push(`${curr.context} ${curr.name} ${curr.type}${curr.length ? `(${curr.length})` : ''}`);
+            acc.push(`${curr.context} ${curr.name} ${curr.type}`);
            return acc;
         }, []).join(',')
         : '';

-      if (this._schema !== 'public')
-         await this.use(this._schema);
+      if (routine.schema !== 'public')
+         await this.use(routine.schema);

-      const sql = `CREATE PROCEDURE ${this._schema}.${routine.name}(${parameters})
+      const sql = `CREATE PROCEDURE "${routine.schema}"."${routine.name}"(${parameters})
         LANGUAGE ${routine.language}
         SECURITY ${routine.security}
         AS ${routine.sql}`;
@@ -804,7 +852,7 @@ export class PostgreSQLClient extends AntaresCore {
    * @memberof PostgreSQLClient
    */
   async dropFunction (params) {
-      const sql = `DROP FUNCTION ${this._schema}.${params.func}`;
+      const sql = `DROP FUNCTION "${params.schema}"."${params.func}"`;
      return await this.raw(sql);
   }

@@ -821,8 +869,8 @@ export class PostgreSQLClient extends AntaresCore {

      try {
         await this.createFunction(tempProcedure);
-         await this.dropFunction({ func: tempProcedure.name });
-         await this.dropFunction({ func: func.oldName });
+         await this.dropFunction({ schema: func.schema, func: tempProcedure.name });
+         await this.dropFunction({ schema: func.schema, func: func.oldName });
         await this.createFunction(func);
      }
      catch (err) {
@@ -839,17 +887,17 @@ export class PostgreSQLClient extends AntaresCore {
   async createFunction (func) {
      const parameters = 'parameters' in func
         ? func.parameters.reduce((acc, curr) => {
-            acc.push(`${curr.context} ${curr.name} ${curr.type}${curr.length ? `(${curr.length})` : ''}`);
+            acc.push(`${curr.context} ${curr.name || ''} ${curr.type}`);
            return acc;
         }, []).join(',')
         : '';

-      if (this._schema !== 'public')
-         await this.use(this._schema);
+      if (func.schema !== 'public')
+         await this.use(func.schema);

      const body = func.returns ? func.sql : '$function$\n$function$';

-      const sql = `CREATE FUNCTION ${this._schema}.${func.name}(${parameters})
+      const sql = `CREATE FUNCTION "${func.schema}"."${func.name}" (${parameters})
         RETURNS ${func.returns || 'void'}
         LANGUAGE ${func.language}
         SECURITY ${func.security}
@@ -867,12 +915,12 @@ export class PostgreSQLClient extends AntaresCore {
   async alterTriggerFunction (params) {
      const { func } = params;

-      if (this._schema !== 'public')
-         await this.use(this._schema);
+      if (func.schema !== 'public')
+         await this.use(func.schema);

      const body = func.returns ? func.sql : '$function$\n$function$';

-      const sql = `CREATE OR REPLACE FUNCTION ${this._schema}.${func.name}()
+      const sql = `CREATE OR REPLACE FUNCTION "${func.schema}"."${func.name}" ()
         RETURNS TRIGGER
         LANGUAGE ${func.language}
         AS ${body}`;
@@ -887,12 +935,12 @@ export class PostgreSQLClient extends AntaresCore {
    * @memberof PostgreSQLClient
    */
   async createTriggerFunction (func) {
-      if (this._schema !== 'public')
-         await this.use(this._schema);
+      if (func.schema !== 'public')
+         await this.use(func.schema);

      const body = func.returns ? func.sql : '$function$\r\nBEGIN\r\n\r\nEND\r\n$function$';

-      const sql = `CREATE FUNCTION ${this._schema}.${func.name}()
+      const sql = `CREATE FUNCTION "${func.schema}"."${func.name}" ()
         RETURNS TRIGGER
         LANGUAGE ${func.language}
         AS ${body}`;
@@ -981,6 +1029,10 @@ export class PostgreSQLClient extends AntaresCore {
      });
   }

+   async killProcess (id) {
+      return await this.raw(`SELECT pg_terminate_backend(${id})`);
+   }
+
   /**
    * CREATE TABLE
    *
@@ -989,11 +1041,53 @@ export class PostgreSQLClient extends AntaresCore {
    */
   async createTable (params) {
      const {
-         name
+         schema,
+         fields,
+         foreigns,
+         indexes,
+         options
      } = params;
+      const newColumns = [];
+      const newIndexes = [];
+      const manageIndexes = [];
+      const newForeigns = [];

-      const sql = `CREATE TABLE ${this._schema}.${name} (${name}_id INTEGER NULL); ALTER TABLE ${this._schema}.${name} DROP COLUMN ${name}_id`;
+      let sql = `CREATE TABLE "${schema}"."${options.name}"`;

+      // ADD FIELDS
+      fields.forEach(field => {
+         const typeInfo = this._getTypeInfo(field.type);
+         const length = typeInfo.length ? field.enumValues || field.numLength || field.charLength || field.datePrecision : false;
+
+         newColumns.push(`${field.name} 
+            ${field.type.toUpperCase()}${length ? `(${length})` : ''} 
+            ${field.unsigned ? 'UNSIGNED' : ''} 
+            ${field.zerofill ? 'ZEROFILL' : ''}
+            ${field.nullable ? 'NULL' : 'NOT NULL'}
+            ${field.default ? `DEFAULT ${field.default}` : ''}
+            ${field.onUpdate ? `ON UPDATE ${field.onUpdate}` : ''}`);
+      });
+
+      // ADD INDEX
+      indexes.forEach(index => {
+         const fields = index.fields.map(field => `${field}`).join(',');
+         const type = index.type;
+
+         if (type === 'PRIMARY')
+            newIndexes.push(`PRIMARY KEY (${fields})`);
+         else if (type === 'UNIQUE')
+            newIndexes.push(`CONSTRAINT ${index.name} UNIQUE (${fields})`);
+         else
+            manageIndexes.push(`CREATE INDEX ${index.name} ON "${schema}"."${options.name}" (${fields})`);
+      });
+
+      // ADD FOREIGN KEYS
+      foreigns.forEach(foreign => {
+         newForeigns.push(`CONSTRAINT ${foreign.constraintName} FOREIGN KEY (${foreign.field}) REFERENCES "${schema}"."${foreign.refTable}" (${foreign.refField}) ON UPDATE ${foreign.onUpdate} ON DELETE ${foreign.onDelete}`);
+      });
+
+      sql = `${sql} (${[...newColumns, ...newIndexes, ...newForeigns].join(', ')})`;
+      if (manageIndexes.length) sql = `${sql}; ${manageIndexes.join(';')}`;
      return await this.raw(sql);
   }

@@ -1006,6 +1100,7 @@ export class PostgreSQLClient extends AntaresCore {
   async alterTable (params) {
      const {
         table,
+         schema,
         additions,
         deletions,
         changes,
@@ -1014,8 +1109,8 @@ export class PostgreSQLClient extends AntaresCore {
         options
      } = params;

-      if (this._schema !== 'public')
-         await this.use(this._schema);
+      if (schema !== 'public')
+         await this.use(schema);

      let sql = '';
      const alterColumns = [];
@@ -1023,12 +1118,6 @@ export class PostgreSQLClient extends AntaresCore {
      const createSequences = [];
      const manageIndexes = [];

-      // OPTIONS
-      if ('comment' in options) alterColumns.push(`COMMENT='${options.comment}'`);
-      if ('engine' in options) alterColumns.push(`ENGINE=${options.engine}`);
-      if ('autoIncrement' in options) alterColumns.push(`AUTO_INCREMENT=${+options.autoIncrement}`);
-      if ('collation' in options) alterColumns.push(`COLLATE='${options.collation}'`);
-
      // ADD FIELDS
      additions.forEach(addition => {
         const typeInfo = this._getTypeInfo(addition.type);
@@ -1039,10 +1128,7 @@ export class PostgreSQLClient extends AntaresCore {
            ${addition.unsigned ? 'UNSIGNED' : ''} 
            ${addition.zerofill ? 'ZEROFILL' : ''}
            ${addition.nullable ? 'NULL' : 'NOT NULL'}
-            ${addition.autoIncrement ? 'AUTO_INCREMENT' : ''}
            ${addition.default ? `DEFAULT ${addition.default}` : ''}
-            ${addition.comment ? `COMMENT '${addition.comment}'` : ''}
-            ${addition.collation ? `COLLATE ${addition.collation}` : ''}
            ${addition.onUpdate ? `ON UPDATE ${addition.onUpdate}` : ''}`);
      });

@@ -1056,12 +1142,12 @@ export class PostgreSQLClient extends AntaresCore {
         else if (type === 'UNIQUE')
            alterColumns.push(`ADD CONSTRAINT ${addition.name} UNIQUE (${fields})`);
         else
-            manageIndexes.push(`CREATE INDEX ${addition.name} ON ${this._schema}.${table}(${fields})`);
+            manageIndexes.push(`CREATE INDEX ${addition.name} ON "${schema}"."${table}" (${fields})`);
      });

      // ADD FOREIGN KEYS
      foreignChanges.additions.forEach(addition => {
-         alterColumns.push(`ADD CONSTRAINT ${addition.constraintName} FOREIGN KEY (${addition.field}) REFERENCES ${addition.refTable} (${addition.refField}) ON UPDATE ${addition.onUpdate} ON DELETE ${addition.onDelete}`);
+         alterColumns.push(`ADD CONSTRAINT ${addition.constraintName} FOREIGN KEY (${addition.field}) REFERENCES "${schema}"."${addition.refTable}" (${addition.refField}) ON UPDATE ${addition.onUpdate} ON DELETE ${addition.onDelete}`);
      });

      // CHANGE FIELDS
@@ -1094,7 +1180,7 @@ export class PostgreSQLClient extends AntaresCore {
         }

         if (change.orgName !== change.name)
-            renameColumns.push(`ALTER TABLE "${this._schema}"."${table}" RENAME COLUMN "${change.orgName}" TO "${change.name}"`);
+            renameColumns.push(`ALTER TABLE "${schema}"."${table}" RENAME COLUMN "${change.orgName}" TO "${change.name}"`);
      });

      // CHANGE INDEX
@@ -1112,13 +1198,13 @@ export class PostgreSQLClient extends AntaresCore {
         else if (type === 'UNIQUE')
            alterColumns.push(`ADD CONSTRAINT ${change.name} UNIQUE (${fields})`);
         else
-            manageIndexes.push(`CREATE INDEX ${change.name} ON ${this._schema}.${table}(${fields})`);
+            manageIndexes.push(`CREATE INDEX ${change.name} ON "${schema}"."${table}" (${fields})`);
      });

      // CHANGE FOREIGN KEYS
      foreignChanges.changes.forEach(change => {
         alterColumns.push(`DROP CONSTRAINT ${change.oldName}`);
-         alterColumns.push(`ADD CONSTRAINT ${change.constraintName} FOREIGN KEY (${change.field}) REFERENCES ${change.refTable} (${change.refField}) ON UPDATE ${change.onUpdate} ON DELETE ${change.onDelete}`);
+         alterColumns.push(`ADD CONSTRAINT ${change.constraintName} FOREIGN KEY (${change.field}) REFERENCES "${schema}"."${change.refTable}" (${change.refField}) ON UPDATE ${change.onUpdate} ON DELETE ${change.onDelete}`);
      });

      // DROP FIELDS
@@ -1139,10 +1225,10 @@ export class PostgreSQLClient extends AntaresCore {
         alterColumns.push(`DROP CONSTRAINT ${deletion.constraintName}`);
      });

-      if (alterColumns.length) sql += `ALTER TABLE "${this._schema}"."${table}" ${alterColumns.join(', ')}; `;
+      if (alterColumns.length) sql += `ALTER TABLE "${schema}"."${table}" ${alterColumns.join(', ')}; `;
      if (createSequences.length) sql = `${createSequences.join(';')}; ${sql}`;
      if (manageIndexes.length) sql = `${manageIndexes.join(';')}; ${sql}`;
-      if (options.name) sql += `ALTER TABLE "${this._schema}"."${table}" RENAME TO "${options.name}"; `;
+      if (options.name) sql += `ALTER TABLE "${schema}"."${table}" RENAME TO "${options.name}"; `;

      // RENAME
      if (renameColumns.length) sql = `${renameColumns.join(';')}; ${sql}`;
@@ -1157,7 +1243,7 @@ export class PostgreSQLClient extends AntaresCore {
    * @memberof PostgreSQLClient
    */
   async duplicateTable (params) {
-      const sql = `CREATE TABLE ${this._schema}.${params.table}_copy (LIKE ${this._schema}.${params.table} INCLUDING ALL)`;
+      const sql = `CREATE TABLE ${params.schema}.${params.table}_copy (LIKE ${params.schema}.${params.table} INCLUDING ALL)`;
      return await this.raw(sql);
   }

@@ -1168,7 +1254,7 @@ export class PostgreSQLClient extends AntaresCore {
    * @memberof PostgreSQLClient
    */
   async truncateTable (params) {
-      const sql = `TRUNCATE TABLE ${this._schema}.${params.table}`;
+      const sql = `TRUNCATE TABLE ${params.schema}.${params.table}`;
      return await this.raw(sql);
   }

@@ -1179,7 +1265,7 @@ export class PostgreSQLClient extends AntaresCore {
    * @memberof PostgreSQLClient
    */
   async dropTable (params) {
-      const sql = `DROP TABLE ${this._schema}.${params.table}`;
+      const sql = `DROP TABLE ${params.schema}.${params.table}`;
      return await this.raw(sql);
   }

@@ -1250,18 +1336,20 @@ export class PostgreSQLClient extends AntaresCore {
    * @memberof PostgreSQLClient
    */
   async raw (sql, args) {
-      sql = sql.replace(/(\/\*(.|[\r\n])*?\*\/)|(--(.*|[\r\n]))/gm, '');
-
      args = {
         nest: false,
         details: false,
         split: true,
+         comments: true,
         ...args
      };

      if (args.schema && args.schema !== 'public')
         await this.use(args.schema);

+      if (!args.comments)
+         sql = sql.replace(/(\/\*(.|[\r\n])*?\*\/)|(--(.*|[\r\n]))/gm, '');// Remove comments
+
      const resultsArr = [];
      let paramsArr = [];
      const queries = args.split
--- a/src/renderer/App.vue
+++ b/src/renderer/App.vue
@@ -16,7 +16,6 @@
            <TheNotificationsBoard />
            <TheScratchpad v-if="isScratchpad" />
            <ModalSettings v-if="isSettingModal" />
-            <ModalDiscardChanges v-if="isUnsavedDiscardModal" />
            <BaseTextEditor class="d-none" value="" />
         </div>
      </div>
@@ -39,7 +38,6 @@ export default {
      WorkspaceAddConnectionPanel: () => import(/* webpackChunkName: "WorkspaceAddConnectionPanel" */'@/components/WorkspaceAddConnectionPanel'),
      ModalSettings: () => import(/* webpackChunkName: "ModalSettings" */'@/components/ModalSettings'),
      TheScratchpad: () => import(/* webpackChunkName: "TheScratchpad" */'@/components/TheScratchpad'),
-      ModalDiscardChanges: () => import(/* webpackChunkName: "ModalDiscardChanges" */'@/components/ModalDiscardChanges'),
      BaseTextEditor: () => import(/* webpackChunkName: "BaseTextEditor" */'@/components/BaseTextEditor')
   },
   data () {
--- a/src/renderer/components/BaseContextMenu.vue
+++ b/src/renderer/components/BaseContextMenu.vue
@@ -29,18 +29,23 @@ export default {
   },
   computed: {
      position () {
-         const { clientY, clientX } = this.contextEvent;
-         let topCord = `${clientY + 2}px`;
-         let leftCord = `${clientX + 5}px`;
+         let topCord = 0;
+         let leftCord = 0;

-         if (this.contextSize) {
-            if (clientY + (this.contextSize.height < 200 ? 200 : this.contextSize.height) + 5 >= window.innerHeight) {
-               topCord = `${clientY + 3 - this.contextSize.height}px`;
-               this.isBottom = true;
+         if (this.contextEvent) {
+            const { clientY, clientX } = this.contextEvent;
+            topCord = `${clientY + 2}px`;
+            leftCord = `${clientX + 5}px`;
+
+            if (this.contextSize) {
+               if (clientY + (this.contextSize.height < 200 ? 200 : this.contextSize.height) + 5 >= window.innerHeight) {
+                  topCord = `${clientY + 3 - this.contextSize.height}px`;
+                  this.isBottom = true;
+               }
+
+               if (clientX + this.contextSize.width + 5 >= window.innerWidth)
+                  leftCord = `${clientX - this.contextSize.width}px`;
            }
-
-            if (clientX + this.contextSize.width + 5 >= window.innerWidth)
-               leftCord = `${clientX - this.contextSize.width}px`;
         }

         return {
@@ -53,7 +58,8 @@ export default {
      window.addEventListener('keydown', this.onKey);
   },
   mounted () {
-      this.contextSize = this.$refs.contextContent.getBoundingClientRect();
+      if (this.$refs.contextContent)
+         this.contextSize = this.$refs.contextContent.getBoundingClientRect();
   },
   beforeDestroy () {
      window.removeEventListener('keydown', this.onKey);
--- a/src/renderer/components/BaseUploadInput.vue
+++ b/src/renderer/components/BaseUploadInput.vue
@@ -78,6 +78,7 @@ export default {

  .file-uploader-message {
    display: flex;
+    border-radius: $border-radius 0 0 $border-radius;
  }

  .file-uploader-input {
--- a/src/renderer/components/ModalAskCredentials.vue
+++ b/src/renderer/components/ModalAskCredentials.vue
@@ -41,7 +41,7 @@
               </form>
            </div>
         </div>
-         <div class="modal-footer text-light">
+         <div class="modal-footer">
            <button class="btn btn-primary mr-2" @click.stop="sendCredentials">
               {{ $t('word.send') }}
            </button>
--- a/src/renderer/components/ModalAskParameters.vue
+++ b/src/renderer/components/ModalAskParameters.vue
@@ -31,7 +31,11 @@
                           class="form-input"
                           type="text"
                        >
-                        <span class="input-group-addon field-type" :class="typeClass(parameter.type)">
+                        <span
+                           :title="`${parameter.type} ${parameter.length}`"
+                           class="input-group-addon field-type cut-text"
+                           :class="typeClass(parameter.type)"
+                        >
                           {{ parameter.type }} {{ parameter.length | wrapNumber }}
                        </span>
                     </div>
@@ -127,4 +131,8 @@ export default {
  .field-type {
    font-size: 0.6rem;
  }
+
+  .input-group-addon {
+    max-width: 100px;
+  }
 </style>
--- a/src/renderer/components/ModalDiscardChanges.vue
+++ b/src/renderer/components/ModalDiscardChanges.vue
@@ -2,8 +2,8 @@
   <ConfirmModal
      :confirm-text="$t('word.discard')"
      :cancel-text="$t('word.stay')"
-      @confirm="discardUnsavedChanges"
-      @hide="closeUnsavedChangesModal"
+      @confirm="$emit('confirm')"
+      @hide="$emit('close')"
   >
      <template slot="header">
         <div class="d-flex">
@@ -19,7 +19,6 @@
 </template>

 <script>
-import { mapActions } from 'vuex';
 import ConfirmModal from '@/components/BaseConfirmModal';

 export default {
@@ -34,13 +33,6 @@ export default {
      window.removeEventListener('keydown', this.onKey);
   },
   methods: {
-      ...mapActions({
-         discardUnsavedChanges: 'workspaces/discardUnsavedChanges',
-         closeUnsavedChangesModal: 'workspaces/closeUnsavedChangesModal'
-      }),
-      closeModal () {
-         this.$emit('close');
-      },
      onKey (e) {
         e.stopPropagation();
         if (e.key === 'Escape')
--- a/src/renderer/components/ModalEditSchema.vue
+++ b/src/renderer/components/ModalEditSchema.vue
@@ -53,7 +53,7 @@
               </form>
            </div>
         </div>
-         <div class="modal-footer text-light">
+         <div class="modal-footer">
            <button class="btn btn-primary mr-2" @click.stop="updateSchema">
               {{ $t('word.update') }}
            </button>
@@ -72,7 +72,7 @@ import Schema from '@/ipc-api/Schema';
 export default {
   name: 'ModalEditSchema',
   props: {
-      selectedDatabase: String
+      selectedSchema: String
   },
   data () {
      return {
@@ -99,7 +99,7 @@ export default {
   async created () {
      let actualCollation;
      try {
-         const { status, response } = await Schema.getDatabaseCollation({ uid: this.selectedWorkspace, database: this.selectedDatabase });
+         const { status, response } = await Schema.getDatabaseCollation({ uid: this.selectedWorkspace, database: this.selectedSchema });

         if (status === 'success')
            actualCollation = response;
@@ -112,8 +112,8 @@ export default {
      }

      this.database = {
-         name: this.selectedDatabase,
-         prevName: this.selectedDatabase,
+         name: this.selectedSchema,
+         prevName: this.selectedSchema,
         collation: actualCollation || this.defaultCollation,
         prevCollation: actualCollation || this.defaultCollation
      };
--- a/src/renderer/components/ModalFakerRows.vue
+++ b/src/renderer/components/ModalFakerRows.vue
@@ -52,7 +52,7 @@
               </form>
            </div>
         </div>
-         <div class="modal-footer text-light columns">
+         <div class="modal-footer columns">
            <div class="column d-flex" :class="hasFakes ? 'col-4' : 'col-2'">
               <div class="input-group tooltip tooltip-right" :data-tooltip="$t('message.numberOfInserts')">
                  <input
@@ -251,7 +251,7 @@ export default {
         if (field.default === 'NULL') fieldDefault = null;
         else {
            if ([...NUMBER, ...FLOAT].includes(field.type))
-               fieldDefault = Number.isNaN(+field.default) ? null : +field.default;
+               fieldDefault = !field.default || Number.isNaN(+field.default.replaceAll('\'', '')) ? null : +field.default.replaceAll('\'', '');
            else if ([...TEXT, ...LONG_TEXT].includes(field.type)) {
               fieldDefault = field.default
                  ? field.default.includes('\'')
--- a/src/renderer/components/ModalHistory.vue
+++ b/src/renderer/components/ModalHistory.vue
@@ -0,0 +1,282 @@
+<template>
+   <div class="modal active">
+      <a class="modal-overlay" @click.stop="closeModal" />
+      <div class="modal-container p-0 pb-4">
+         <div class="modal-header pl-2">
+            <div class="modal-title h6">
+               <div class="d-flex">
+                  <i class="mdi mdi-24px mdi-history mr-1" />
+                  <span class="cut-text">{{ $t('word.history') }}: {{ connectionName }}</span>
+               </div>
+            </div>
+            <a class="btn btn-clear c-hand" @click.stop="closeModal" />
+         </div>
+         <div class="modal-body p-0 workspace-query-results">
+            <div
+               v-if="history.length"
+               ref="searchForm"
+               class="form-group has-icon-right p-2 m-0"
+            >
+               <input
+                  v-model="searchTerm"
+                  class="form-input"
+                  type="text"
+                  :placeholder="$t('message.searchForQueries')"
+               >
+               <i v-if="!searchTerm" class="form-icon mdi mdi-magnify mdi-18px pr-4" />
+               <i
+                  v-else
+                  class="form-icon c-hand mdi mdi-backspace mdi-18px pr-4"
+                  @click="searchTerm = ''"
+               />
+            </div>
+            <div
+               v-if="history.length"
+               ref="tableWrapper"
+               class="vscroll px-1 "
+               :style="{'height': resultsSize+'px'}"
+            >
+               <div ref="table">
+                  <BaseVirtualScroll
+                     ref="resultTable"
+                     :items="filteredHistory"
+                     :item-height="66"
+                     :visible-height="resultsSize"
+                     :scroll-element="scrollElement"
+                  >
+                     <template slot-scope="{ items }">
+                        <div
+                           v-for="query in items"
+                           :key="query.uid"
+                           class="tile my-2"
+                           tabindex="0"
+                        >
+                           <div class="tile-icon">
+                              <i class="mdi mdi-code-tags pr-1" />
+                           </div>
+                           <div class="tile-content">
+                              <div class="tile-title">
+                                 <code
+                                    class="cut-text"
+                                    :title="query.sql"
+                                    v-html="highlightWord(query.sql)"
+                                 />
+                              </div>
+                              <div class="tile-bottom-content">
+                                 <small class="tile-subtitle">{{ query.schema }} · {{ formatDate(query.date) }}</small>
+                                 <div class="tile-history-buttons">
+                                    <button class="btn btn-link pl-1" @click.stop="$emit('select-query', query.sql)">
+                                       <i class="mdi mdi-open-in-app pr-1" /> {{ $t('word.select') }}
+                                    </button>
+                                    <button class="btn btn-link pl-1" @click="copyQuery(query.sql)">
+                                       <i class="mdi mdi-content-copy pr-1" /> {{ $t('word.copy') }}
+                                    </button>
+                                    <button class="btn btn-link pl-1" @click="deleteQuery(query)">
+                                       <i class="mdi mdi-delete-forever pr-1" /> {{ $t('word.delete') }}
+                                    </button>
+                                 </div>
+                              </div>
+                           </div>
+                        </div>
+                     </template>
+                  </BaseVirtualScroll>
+               </div>
+            </div>
+            <div v-else class="empty">
+               <div class="empty-icon">
+                  <i class="mdi mdi-history mdi-48px" />
+               </div>
+               <p class="empty-title h5">
+                  {{ $t('message.thereIsNoQueriesYet') }}
+               </p>
+            </div>
+         </div>
+      </div>
+   </div>
+</template>
+
+<script>
+import moment from 'moment';
+import { mapGetters, mapActions } from 'vuex';
+import BaseVirtualScroll from '@/components/BaseVirtualScroll';
+
+export default {
+   name: 'ModalHistory',
+   components: {
+      BaseVirtualScroll
+   },
+   props: {
+      connection: Object
+   },
+   data () {
+      return {
+         resultsSize: 1000,
+         isQuering: false,
+         scrollElement: null,
+         searchTermInterval: null,
+         searchTerm: '',
+         localSearchTerm: ''
+      };
+   },
+   computed: {
+      ...mapGetters({
+         getConnectionName: 'connections/getConnectionName',
+         getHistoryByWorkspace: 'history/getHistoryByWorkspace'
+      }),
+      connectionName () {
+         return this.getConnectionName(this.connection.uid);
+      },
+      history () {
+         return this.getHistoryByWorkspace(this.connection.uid) || [];
+      },
+      filteredHistory () {
+         return this.history.filter(q => q.sql.toLowerCase().search(this.searchTerm.toLowerCase()) >= 0);
+      }
+   },
+   watch: {
+      searchTerm () {
+         clearTimeout(this.searchTermInterval);
+
+         this.searchTermInterval = setTimeout(() => {
+            this.localSearchTerm = this.searchTerm;
+         }, 200);
+      }
+   },
+   created () {
+      window.addEventListener('keydown', this.onKey, { capture: true });
+   },
+   updated () {
+      if (this.$refs.table)
+         this.refreshScroller();
+
+      if (this.$refs.tableWrapper)
+         this.scrollElement = this.$refs.tableWrapper;
+   },
+   mounted () {
+      this.resizeResults();
+      window.addEventListener('resize', this.resizeResults);
+   },
+   beforeDestroy () {
+      window.removeEventListener('keydown', this.onKey, { capture: true });
+      window.removeEventListener('resize', this.resizeResults);
+      clearInterval(this.refreshInterval);
+   },
+   methods: {
+      ...mapActions({
+         addNotification: 'notifications/addNotification',
+         deleteQueryFromHistory: 'history/deleteQueryFromHistory'
+      }),
+      copyQuery (sql) {
+         navigator.clipboard.writeText(sql);
+      },
+      deleteQuery (query) {
+         this.deleteQueryFromHistory({
+            workspace: this.connection.uid,
+            ...query
+         });
+      },
+      resizeResults () {
+         if (this.$refs.resultTable) {
+            const el = this.$refs.tableWrapper.parentElement;
+
+            if (el)
+               this.resultsSize = el.offsetHeight - this.$refs.searchForm.offsetHeight;
+
+            this.$refs.resultTable.updateWindow();
+         }
+      },
+      formatDate (date) {
+         return moment(date).isValid() ? moment(date).format('HH:mm:ss - YYYY/MM/DD') : date;
+      },
+      refreshScroller () {
+         this.resizeResults();
+      },
+      closeModal () {
+         this.$emit('close');
+      },
+      highlightWord (string) {
+         string = string.replaceAll('<', '&lt;').replaceAll('>', '&gt;');
+
+         if (this.searchTerm) {
+            const regexp = new RegExp(`(${this.searchTerm.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')})`, 'gi');
+            return string.replace(regexp, '<span class="text-primary text-bold">$1</span>');
+         }
+         else
+            return string;
+      },
+      onKey (e) {
+         e.stopPropagation();
+         if (e.key === 'Escape')
+            this.closeModal();
+      }
+   }
+};
+</script>
+
+<style lang="scss" scoped>
+.vscroll {
+  height: 1000px;
+  overflow: auto;
+  overflow-anchor: none;
+}
+
+.tile {
+  border-radius: $border-radius;
+  display: flex;
+  align-items: center;
+
+  &:hover,
+  &:focus {
+    .tile-content {
+      .tile-bottom-content {
+        .tile-history-buttons {
+          opacity: 1;
+        }
+      }
+    }
+  }
+
+  .tile-icon {
+    font-size: 1.2rem;
+    margin-left: 0.3rem;
+    width: 28px;
+  }
+
+  .tile-content {
+    padding: 0.3rem;
+    padding-left: 0.1rem;
+    max-width: calc(100% - 30px);
+
+    code {
+      max-width: 100%;
+      display: inline-block;
+      font-size: 100%;
+      // color: $primary-color;
+      opacity: 0.8;
+    }
+
+    .tile-subtitle {
+      opacity: 0.8;
+    }
+
+    .tile-bottom-content {
+      display: flex;
+      justify-content: space-between;
+
+      .tile-history-buttons {
+        opacity: 0;
+        transition: opacity 0.2s;
+
+        button {
+          font-size: 0.7rem;
+          height: 1rem;
+          line-height: 1rem;
+          display: inline-flex;
+          align-items: center;
+          justify-content: center;
+        }
+      }
+    }
+  }
+}
+</style>
--- a/src/renderer/components/ModalNewFunction.vue
+++ b/src/renderer/components/ModalNewFunction.vue
@@ -1,170 +0,0 @@
-<template>
-   <ConfirmModal
-      :confirm-text="$t('word.confirm')"
-      size="400"
-      @confirm="confirmNewFunction"
-      @hide="$emit('close')"
-   >
-      <template :slot="'header'">
-         <div class="d-flex">
-            <i class="mdi mdi-24px mdi-plus mr-1" /> {{ $t('message.createNewFunction') }}
-         </div>
-      </template>
-      <div :slot="'body'">
-         <form class="form-horizontal">
-            <div class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.name') }}
-               </label>
-               <div class="column">
-                  <input
-                     ref="firstInput"
-                     v-model="localFunction.name"
-                     class="form-input"
-                     type="text"
-                  >
-               </div>
-            </div>
-            <div v-if="customizations.languages" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.language') }}
-               </label>
-               <div class="column">
-                  <select v-model="localFunction.language" class="form-select">
-                     <option v-for="language in customizations.languages" :key="language">
-                        {{ language }}
-                     </option>
-                  </select>
-               </div>
-            </div>
-            <div v-if="customizations.definer" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.definer') }}
-               </label>
-               <div class="column">
-                  <select
-                     v-if="workspace.users.length"
-                     v-model="localFunction.definer"
-                     class="form-select"
-                  >
-                     <option value="">
-                        {{ $t('message.currentUser') }}
-                     </option>
-                     <option
-                        v-for="user in workspace.users"
-                        :key="`${user.name}@${user.host}`"
-                        :value="`\`${user.name}\`@\`${user.host}\``"
-                     >
-                        {{ user.name }}@{{ user.host }}
-                     </option>
-                  </select>
-                  <select v-if="!workspace.users.length" class="form-select">
-                     <option value="">
-                        {{ $t('message.currentUser') }}
-                     </option>
-                  </select>
-               </div>
-            </div>
-            <div v-if="customizations.comment" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.comment') }}
-               </label>
-               <div class="column">
-                  <input
-                     v-model="localFunction.comment"
-                     class="form-input"
-                     type="text"
-                  >
-               </div>
-            </div>
-            <div class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('message.sqlSecurity') }}
-               </label>
-               <div class="column">
-                  <select v-model="localFunction.security" class="form-select">
-                     <option>DEFINER</option>
-                     <option>INVOKER</option>
-                  </select>
-               </div>
-            </div>
-            <div v-if="customizations.functionDataAccess" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('message.dataAccess') }}
-               </label>
-               <div class="column">
-                  <select v-model="localFunction.dataAccess" class="form-select">
-                     <option>CONTAINS SQL</option>
-                     <option>NO SQL</option>
-                     <option>READS SQL DATA</option>
-                     <option>MODIFIES SQL DATA</option>
-                  </select>
-               </div>
-            </div>
-            <div v-if="customizations.functionDeterministic" class="form-group">
-               <div class="col-4" />
-               <div class="column">
-                  <label class="form-checkbox form-inline">
-                     <input v-model="localFunction.deterministic" type="checkbox"><i class="form-icon" /> {{ $t('word.deterministic') }}
-                  </label>
-               </div>
-            </div>
-         </form>
-      </div>
-   </ConfirmModal>
-</template>
-
-<script>
-import ConfirmModal from '@/components/BaseConfirmModal';
-
-export default {
-   name: 'ModalNewFunction',
-   components: {
-      ConfirmModal
-   },
-   props: {
-      workspace: Object
-   },
-   data () {
-      return {
-         localFunction: {
-            definer: '',
-            sql: '',
-            parameters: [],
-            name: '',
-            comment: '',
-            language: null,
-            returns: null,
-            returnsLength: 10,
-            security: 'DEFINER',
-            deterministic: false,
-            dataAccess: 'CONTAINS SQL'
-         },
-         isOptionsChanging: false
-      };
-   },
-   computed: {
-      schema () {
-         return this.workspace.breadcrumbs.schema;
-      },
-      customizations () {
-         return this.workspace.customizations;
-      }
-   },
-   mounted () {
-      if (this.customizations.languages)
-         this.localFunction.language = this.customizations.languages[0];
-
-      if (this.customizations.functionSql)
-         this.localFunction.sql = this.customizations.functionSql;
-      setTimeout(() => {
-         this.$refs.firstInput.focus();
-      }, 20);
-   },
-   methods: {
-      confirmNewFunction () {
-         this.$emit('open-create-function-editor', this.localFunction);
-      }
-   }
-};
-</script>
--- a/src/renderer/components/ModalNewRoutine.vue
+++ b/src/renderer/components/ModalNewRoutine.vue
@@ -1,168 +0,0 @@
-<template>
-   <ConfirmModal
-      :confirm-text="$t('word.confirm')"
-      size="400"
-      @confirm="confirmNewRoutine"
-      @hide="$emit('close')"
-   >
-      <template :slot="'header'">
-         <div class="d-flex">
-            <i class="mdi mdi-24px mdi-plus mr-1" /> {{ $t('message.createNewRoutine') }}
-         </div>
-      </template>
-      <div :slot="'body'">
-         <form class="form-horizontal">
-            <div class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.name') }}
-               </label>
-               <div class="column">
-                  <input
-                     ref="firstInput"
-                     v-model="localRoutine.name"
-                     class="form-input"
-                     type="text"
-                  >
-               </div>
-            </div>
-            <div v-if="customizations.languages" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.language') }}
-               </label>
-               <div class="column">
-                  <select v-model="localRoutine.language" class="form-select">
-                     <option v-for="language in customizations.languages" :key="language">
-                        {{ language }}
-                     </option>
-                  </select>
-               </div>
-            </div>
-            <div v-if="customizations.definer" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.definer') }}
-               </label>
-               <div class="column">
-                  <select
-                     v-if="workspace.users.length"
-                     v-model="localRoutine.definer"
-                     class="form-select"
-                  >
-                     <option value="">
-                        {{ $t('message.currentUser') }}
-                     </option>
-                     <option
-                        v-for="user in workspace.users"
-                        :key="`${user.name}@${user.host}`"
-                        :value="`\`${user.name}\`@\`${user.host}\``"
-                     >
-                        {{ user.name }}@{{ user.host }}
-                     </option>
-                  </select>
-                  <select v-if="!workspace.users.length" class="form-select">
-                     <option value="">
-                        {{ $t('message.currentUser') }}
-                     </option>
-                  </select>
-               </div>
-            </div>
-            <div v-if="customizations.comment" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.comment') }}
-               </label>
-               <div class="column">
-                  <input
-                     v-model="localRoutine.comment"
-                     class="form-input"
-                     type="text"
-                  >
-               </div>
-            </div>
-            <div class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('message.sqlSecurity') }}
-               </label>
-               <div class="column">
-                  <select v-model="localRoutine.security" class="form-select">
-                     <option>DEFINER</option>
-                     <option>INVOKER</option>
-                  </select>
-               </div>
-            </div>
-            <div v-if="customizations.comment" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('message.dataAccess') }}
-               </label>
-               <div class="column">
-                  <select v-model="localRoutine.dataAccess" class="form-select">
-                     <option>CONTAINS SQL</option>
-                     <option>NO SQL</option>
-                     <option>READS SQL DATA</option>
-                     <option>MODIFIES SQL DATA</option>
-                  </select>
-               </div>
-            </div>
-            <div v-if="customizations.procedureDeterministic" class="form-group">
-               <div class="col-4" />
-               <div class="column">
-                  <label class="form-checkbox form-inline">
-                     <input v-model="localRoutine.deterministic" type="checkbox"><i class="form-icon" /> {{ $t('word.deterministic') }}
-                  </label>
-               </div>
-            </div>
-         </form>
-      </div>
-   </ConfirmModal>
-</template>
-
-<script>
-import ConfirmModal from '@/components/BaseConfirmModal';
-
-export default {
-   name: 'ModalNewRoutine',
-   components: {
-      ConfirmModal
-   },
-   props: {
-      workspace: Object
-   },
-   data () {
-      return {
-         localRoutine: {
-            definer: '',
-            sql: '',
-            parameters: [],
-            name: '',
-            comment: '',
-            language: null,
-            security: 'DEFINER',
-            deterministic: false,
-            dataAccess: 'CONTAINS SQL'
-         },
-         isOptionsChanging: false
-      };
-   },
-   computed: {
-      schema () {
-         return this.workspace.breadcrumbs.schema;
-      },
-      customizations () {
-         return this.workspace.customizations;
-      }
-   },
-   mounted () {
-      if (this.customizations.languages)
-         this.localRoutine.language = this.customizations.languages[0];
-
-      if (this.customizations.procedureSql)
-         this.localRoutine.sql = this.customizations.procedureSql;
-      setTimeout(() => {
-         this.$refs.firstInput.focus();
-      }, 20);
-   },
-   methods: {
-      confirmNewRoutine () {
-         this.$emit('open-create-routine-editor', this.localRoutine);
-      }
-   }
-};
-</script>
--- a/src/renderer/components/ModalNewScheduler.vue
+++ b/src/renderer/components/ModalNewScheduler.vue
@@ -1,109 +0,0 @@
-<template>
-   <ConfirmModal
-      :confirm-text="$t('word.confirm')"
-      size="400"
-      @confirm="confirmNewTrigger"
-      @hide="$emit('close')"
-   >
-      <template :slot="'header'">
-         <div class="d-flex">
-            <i class="mdi mdi-24px mdi-plus mr-1" /> {{ $t('message.createNewScheduler') }}
-         </div>
-      </template>
-      <div :slot="'body'">
-         <form class="form-horizontal">
-            <div class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.name') }}
-               </label>
-               <div class="column">
-                  <input
-                     ref="firstInput"
-                     v-model="localScheduler.name"
-                     class="form-input"
-                     type="text"
-                  >
-               </div>
-            </div>
-            <div class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.definer') }}
-               </label>
-               <div class="column">
-                  <select
-                     v-if="workspace.users.length"
-                     v-model="localScheduler.definer"
-                     class="form-select"
-                  >
-                     <option value="">
-                        {{ $t('message.currentUser') }}
-                     </option>
-                     <option
-                        v-for="user in workspace.users"
-                        :key="`${user.name}@${user.host}`"
-                        :value="`\`${user.name}\`@\`${user.host}\``"
-                     >
-                        {{ user.name }}@{{ user.host }}
-                     </option>
-                  </select>
-                  <select v-if="!workspace.users.length" class="form-select">
-                     <option value="">
-                        {{ $t('message.currentUser') }}
-                     </option>
-                  </select>
-               </div>
-            </div>
-            <div class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.comment') }}
-               </label>
-               <div class="column">
-                  <input
-                     v-model="localScheduler.comment"
-                     class="form-input"
-                     type="text"
-                  >
-               </div>
-            </div>
-         </form>
-      </div>
-   </ConfirmModal>
-</template>
-
-<script>
-import ConfirmModal from '@/components/BaseConfirmModal';
-
-export default {
-   name: 'ModalNewScheduler',
-   components: {
-      ConfirmModal
-   },
-   props: {
-      workspace: Object
-   },
-   data () {
-      return {
-         localScheduler: {
-            definer: '',
-            sql: 'BEGIN\r\n\r\nEND',
-            name: '',
-            comment: '',
-            execution: 'EVERY',
-            every: ['1', 'DAY'],
-            preserve: true,
-            state: 'DISABLE'
-         }
-      };
-   },
-   mounted () {
-      setTimeout(() => {
-         this.$refs.firstInput.focus();
-      }, 20);
-   },
-   methods: {
-      confirmNewTrigger () {
-         this.$emit('open-create-scheduler-editor', this.localScheduler);
-      }
-   }
-};
-</script>
--- a/src/renderer/components/ModalNewSchema.vue
+++ b/src/renderer/components/ModalNewSchema.vue
@@ -49,7 +49,7 @@
               </form>
            </div>
         </div>
-         <div class="modal-footer text-light">
+         <div class="modal-footer">
            <button
               class="btn btn-primary mr-2"
               :class="{'loading': isLoading}"
--- a/src/renderer/components/ModalNewTable.vue
+++ b/src/renderer/components/ModalNewTable.vue
@@ -1,130 +0,0 @@
-<template>
-   <ConfirmModal
-      :confirm-text="$t('word.confirm')"
-      size="400"
-      @confirm="confirmOptionsChange"
-      @hide="$emit('close')"
-   >
-      <template :slot="'header'">
-         <div class="d-flex">
-            <i class="mdi mdi-24px mdi-table-plus mr-1" /> {{ $t('message.createNewTable') }}
-         </div>
-      </template>
-      <div :slot="'body'">
-         <form class="form-horizontal">
-            <div class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.name') }}
-               </label>
-               <div class="column">
-                  <input
-                     ref="firstInput"
-                     v-model="localOptions.name"
-                     class="form-input"
-                     type="text"
-                  >
-               </div>
-            </div>
-            <div v-if="workspace.customizations.comment" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.comment') }}
-               </label>
-               <div class="column">
-                  <input
-                     v-model="localOptions.comment"
-                     class="form-input"
-                     type="text"
-                  >
-               </div>
-            </div>
-            <div v-if="workspace.customizations.collations" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.collation') }}
-               </label>
-               <div class="column">
-                  <select v-model="localOptions.collation" class="form-select">
-                     <option
-                        v-for="collation in workspace.collations"
-                        :key="collation.id"
-                        :value="collation.collation"
-                     >
-                        {{ collation.collation }}
-                     </option>
-                  </select>
-               </div>
-            </div>
-            <div v-if="workspace.customizations.engines" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.engine') }}
-               </label>
-               <div class="column">
-                  <select v-model="localOptions.engine" class="form-select">
-                     <option
-                        v-for="engine in workspace.engines"
-                        :key="engine.name"
-                        :value="engine.name"
-                     >
-                        {{ engine.name }}
-                     </option>
-                  </select>
-               </div>
-            </div>
-         </form>
-      </div>
-   </ConfirmModal>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import ConfirmModal from '@/components/BaseConfirmModal';
-
-export default {
-   name: 'ModalNewTable',
-   components: {
-      ConfirmModal
-   },
-   props: {
-      workspace: Object
-   },
-   data () {
-      return {
-         localOptions: {
-            name: '',
-            comment: '',
-            collation: '',
-            engine: ''
-         },
-         isOptionsChanging: false
-      };
-   },
-   computed: {
-      ...mapGetters({
-         selectedWorkspace: 'workspaces/getSelected',
-         getDatabaseVariable: 'workspaces/getDatabaseVariable'
-      }),
-      defaultCollation () {
-         if (this.workspace.customizations.collations)
-            return this.getDatabaseVariable(this.selectedWorkspace, 'collation_server').value || '';
-         return '';
-      },
-      defaultEngine () {
-         if (this.workspace.customizations.engines)
-            return this.workspace.engines.find(engine => engine.isDefault).name;
-         return '';
-      }
-   },
-   mounted () {
-      this.localOptions.collation = this.defaultCollation;
-      this.localOptions.engine = this.defaultEngine;
-
-      setTimeout(() => {
-         this.$refs.firstInput.focus();
-      }, 20);
-   },
-   methods: {
-      confirmOptionsChange () {
-         this.$emit('open-create-table-editor', this.localOptions);
-      }
-   }
-};
-</script>
--- a/src/renderer/components/ModalNewTableRow.vue
+++ b/src/renderer/components/ModalNewTableRow.vue
@@ -86,7 +86,7 @@
               </form>
            </div>
         </div>
-         <div class="modal-footer text-light">
+         <div class="modal-footer">
            <div class="input-group col-3 tooltip tooltip-right" :data-tooltip="$t('message.numberOfInserts')">
               <input
                  v-model="nInserts"
--- a/src/renderer/components/ModalNewTrigger.vue
+++ b/src/renderer/components/ModalNewTrigger.vue
@@ -1,183 +0,0 @@
-<template>
-   <ConfirmModal
-      :confirm-text="$t('word.confirm')"
-      size="400"
-      @confirm="confirmNewTrigger"
-      @hide="$emit('close')"
-   >
-      <template :slot="'header'">
-         <div class="d-flex">
-            <i class="mdi mdi-24px mdi-plus mr-1" /> {{ $t('message.createNewTrigger') }}
-         </div>
-      </template>
-      <div :slot="'body'">
-         <form class="form-horizontal">
-            <div class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.name') }}
-               </label>
-               <div class="column">
-                  <input
-                     ref="firstInput"
-                     v-model="localTrigger.name"
-                     class="form-input"
-                     type="text"
-                  >
-               </div>
-            </div>
-            <div v-if="customizations.definer" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.definer') }}
-               </label>
-               <div class="column">
-                  <select
-                     v-if="workspace.users.length"
-                     v-model="localTrigger.definer"
-                     class="form-select"
-                  >
-                     <option value="">
-                        {{ $t('message.currentUser') }}
-                     </option>
-                     <option
-                        v-for="user in workspace.users"
-                        :key="`${user.name}@${user.host}`"
-                        :value="`\`${user.name}\`@\`${user.host}\``"
-                     >
-                        {{ user.name }}@{{ user.host }}
-                     </option>
-                  </select>
-                  <select v-if="!workspace.users.length" class="form-select">
-                     <option value="">
-                        {{ $t('message.currentUser') }}
-                     </option>
-                  </select>
-               </div>
-            </div>
-            <div class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.table') }}
-               </label>
-               <div class="column">
-                  <select v-model="localTrigger.table" class="form-select">
-                     <option v-for="table in schemaTables" :key="table.name">
-                        {{ table.name }}
-                     </option>
-                  </select>
-               </div>
-            </div>
-            <div class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.event') }}
-               </label>
-               <div class="column">
-                  <div class="input-group">
-                     <select v-model="localTrigger.activation" class="form-select">
-                        <option>BEFORE</option>
-                        <option>AFTER</option>
-                     </select>
-                     <select
-                        v-if="!customizations.triggerMultipleEvents"
-                        v-model="localTrigger.event"
-                        class="form-select"
-                     >
-                        <option v-for="event in Object.keys(localEvents)" :key="event">
-                           {{ event }}
-                        </option>
-                     </select>
-                     <div v-if="customizations.triggerMultipleEvents" class="px-4">
-                        <label
-                           v-for="event in Object.keys(localEvents)"
-                           :key="event"
-                           class="form-checkbox form-inline"
-                           @change.prevent="changeEvents(event)"
-                        >
-                           <input :checked="localEvents[event]" type="checkbox"><i class="form-icon" /> {{ event }}
-                        </label>
-                     </div>
-                  </div>
-               </div>
-            </div>
-         </form>
-         <div v-if="customizations.triggerStatementInCreation" class="workspace-query-results column col-12 mt-2">
-            <label class="form-label ml-2">{{ $t('message.triggerStatement') }}</label>
-            <QueryEditor
-               ref="queryEditor"
-               :value.sync="localTrigger.sql"
-               :workspace="workspace"
-               :schema="schema"
-               :height="editorHeight"
-            />
-         </div>
-      </div>
-   </ConfirmModal>
-</template>
-
-<script>
-import ConfirmModal from '@/components/BaseConfirmModal';
-import QueryEditor from '@/components/QueryEditor';
-
-export default {
-   name: 'ModalNewTrigger',
-   components: {
-      ConfirmModal,
-      QueryEditor
-   },
-   props: {
-      workspace: Object
-   },
-   data () {
-      return {
-         localTrigger: {
-            definer: '',
-            sql: '',
-            name: '',
-            table: '',
-            activation: 'BEFORE',
-            event: 'INSERT'
-         },
-         isOptionsChanging: false,
-         localEvents: { INSERT: false, UPDATE: false, DELETE: false },
-         editorHeight: 150
-      };
-   },
-   computed: {
-      schema () {
-         return this.workspace.breadcrumbs.schema;
-      },
-      schemaTables () {
-         const schemaTables = this.workspace.structure
-            .filter(schema => schema.name === this.schema)
-            .map(schema => schema.tables);
-
-         return schemaTables.length ? schemaTables[0].filter(table => table.type === 'table') : [];
-      },
-      customizations () {
-         return this.workspace.customizations;
-      }
-   },
-   created () {
-      this.localTrigger.table = this.schemaTables.length ? this.schemaTables[0].name : '';
-      this.localTrigger.sql = this.customizations.triggerSql;
-   },
-   mounted () {
-      setTimeout(() => {
-         this.$refs.firstInput.focus();
-      }, 20);
-   },
-   methods: {
-      confirmNewTrigger () {
-         this.$emit('open-create-trigger-editor', this.localTrigger);
-      },
-      changeEvents (event) {
-         if (this.customizations.triggerMultipleEvents) {
-            this.localEvents[event] = !this.localEvents[event];
-            this.localTrigger.event = [];
-            for (const key in this.localEvents) {
-               if (this.localEvents[key])
-                  this.localTrigger.event.push(key);
-            }
-         }
-      }
-   }
-};
-</script>
--- a/src/renderer/components/ModalNewTriggerFunction.vue
+++ b/src/renderer/components/ModalNewTriggerFunction.vue
@@ -1,132 +0,0 @@
-<template>
-   <ConfirmModal
-      :confirm-text="$t('word.confirm')"
-      size="400"
-      @confirm="confirmNewFunction"
-      @hide="$emit('close')"
-   >
-      <template :slot="'header'">
-         <div class="d-flex">
-            <i class="mdi mdi-24px mdi-plus mr-1" /> {{ $t('message.createNewFunction') }}
-         </div>
-      </template>
-      <div :slot="'body'">
-         <form class="form-horizontal">
-            <div class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.name') }}
-               </label>
-               <div class="column">
-                  <input
-                     ref="firstInput"
-                     v-model="localFunction.name"
-                     class="form-input"
-                     type="text"
-                  >
-               </div>
-            </div>
-            <div v-if="customizations.languages" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.language') }}
-               </label>
-               <div class="column">
-                  <select v-model="localFunction.language" class="form-select">
-                     <option v-for="language in customizations.triggerFunctionlanguages" :key="language">
-                        {{ language }}
-                     </option>
-                  </select>
-               </div>
-            </div>
-            <div v-if="customizations.definer" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.definer') }}
-               </label>
-               <div class="column">
-                  <select
-                     v-if="workspace.users.length"
-                     v-model="localFunction.definer"
-                     class="form-select"
-                  >
-                     <option value="">
-                        {{ $t('message.currentUser') }}
-                     </option>
-                     <option
-                        v-for="user in workspace.users"
-                        :key="`${user.name}@${user.host}`"
-                        :value="`\`${user.name}\`@\`${user.host}\``"
-                     >
-                        {{ user.name }}@{{ user.host }}
-                     </option>
-                  </select>
-                  <select v-if="!workspace.users.length" class="form-select">
-                     <option value="">
-                        {{ $t('message.currentUser') }}
-                     </option>
-                  </select>
-               </div>
-            </div>
-            <div v-if="customizations.comment" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.comment') }}
-               </label>
-               <div class="column">
-                  <input
-                     v-model="localFunction.comment"
-                     class="form-input"
-                     type="text"
-                  >
-               </div>
-            </div>
-         </form>
-      </div>
-   </ConfirmModal>
-</template>
-
-<script>
-import ConfirmModal from '@/components/BaseConfirmModal';
-
-export default {
-   name: 'ModalNewTriggerFunction',
-   components: {
-      ConfirmModal
-   },
-   props: {
-      workspace: Object
-   },
-   data () {
-      return {
-         localFunction: {
-            definer: '',
-            sql: '',
-            name: '',
-            comment: '',
-            language: null
-         },
-         isOptionsChanging: false
-      };
-   },
-   computed: {
-      schema () {
-         return this.workspace.breadcrumbs.schema;
-      },
-      customizations () {
-         return this.workspace.customizations;
-      }
-   },
-   mounted () {
-      if (this.customizations.triggerFunctionlanguages)
-         this.localFunction.language = this.customizations.triggerFunctionlanguages[0];
-
-      if (this.customizations.triggerFunctionSql)
-         this.localFunction.sql = this.customizations.triggerFunctionSql;
-      setTimeout(() => {
-         this.$refs.firstInput.focus();
-      }, 20);
-   },
-   methods: {
-      confirmNewFunction () {
-         this.$emit('open-create-function-editor', this.localFunction);
-      }
-   }
-};
-</script>
--- a/src/renderer/components/ModalNewView.vue
+++ b/src/renderer/components/ModalNewView.vue
@@ -1,192 +0,0 @@
-<template>
-   <ConfirmModal
-      :confirm-text="$t('word.confirm')"
-      size="medium"
-      @confirm="confirmOptionsChange"
-      @hide="$emit('close')"
-   >
-      <template :slot="'header'">
-         <div class="d-flex">
-            <i class="mdi mdi-24px mdi-eye-plus mr-1" /> {{ $t('message.createNewView') }}
-         </div>
-      </template>
-      <div :slot="'body'">
-         <div class="container">
-            <div class="columns mb-4">
-               <div class="column col-6">
-                  <div class="form-group">
-                     <label class="form-label">{{ $t('word.name') }}</label>
-                     <input
-                        ref="firstInput"
-                        v-model="localView.name"
-                        class="form-input"
-                        type="text"
-                     >
-                  </div>
-               </div>
-               <div class="column col-6">
-                  <div v-if="workspace.customizations.definer" class="form-group">
-                     <label class="form-label">{{ $t('word.definer') }}</label>
-                     <select v-model="localView.definer" class="form-select">
-                        <option value="">
-                           {{ $t('message.currentUser') }}
-                        </option>
-                        <option
-                           v-for="user in workspace.users"
-                           :key="`${user.name}@${user.host}`"
-                           :value="`\`${user.name}\`@\`${user.host}\``"
-                        >
-                           {{ user.name }}@{{ user.host }}
-                        </option>
-                     </select>
-                  </div>
-               </div>
-            </div>
-            <div class="columns">
-               <div class="column col-4">
-                  <div v-if="workspace.customizations.viewSqlSecurity" class="form-group">
-                     <label class="form-label">{{ $t('message.sqlSecurity') }}</label>
-                     <label class="form-radio">
-                        <input
-                           v-model="localView.security"
-                           type="radio"
-                           name="security"
-                           value="DEFINER"
-                        >
-                        <i class="form-icon" /> DEFINER
-                     </label>
-                     <label class="form-radio">
-                        <input
-                           v-model="localView.security"
-                           type="radio"
-                           name="security"
-                           value="INVOKER"
-                        >
-                        <i class="form-icon" /> INVOKER
-                     </label>
-                  </div>
-               </div>
-               <div class="column col-4">
-                  <div v-if="workspace.customizations.viewAlgorithm" class="form-group">
-                     <label class="form-label">{{ $t('word.algorithm') }}</label>
-                     <label class="form-radio">
-                        <input
-                           v-model="localView.algorithm"
-                           type="radio"
-                           name="algorithm"
-                           value="UNDEFINED"
-                        >
-                        <i class="form-icon" /> UNDEFINED
-                     </label>
-                     <label class="form-radio">
-                        <input
-                           v-model="localView.algorithm"
-                           type="radio"
-                           value="MERGE"
-                           name="algorithm"
-                        >
-                        <i class="form-icon" /> MERGE
-                     </label>
-                     <label class="form-radio">
-                        <input
-                           v-model="localView.algorithm"
-                           type="radio"
-                           value="TEMPTABLE"
-                           name="algorithm"
-                        >
-                        <i class="form-icon" /> TEMPTABLE
-                     </label>
-                  </div>
-               </div>
-               <div class="column col-4">
-                  <div v-if="workspace.customizations.viewUpdateOption" class="form-group">
-                     <label class="form-label">{{ $t('message.updateOption') }}</label>
-                     <label class="form-radio">
-                        <input
-                           v-model="localView.updateOption"
-                           type="radio"
-                           name="update"
-                           value=""
-                        >
-                        <i class="form-icon" /> None
-                     </label>
-                     <label class="form-radio">
-                        <input
-                           v-model="localView.updateOption"
-                           type="radio"
-                           name="update"
-                           value="CASCADED"
-                        >
-                        <i class="form-icon" /> CASCADED
-                     </label>
-                     <label class="form-radio">
-                        <input
-                           v-model="localView.updateOption"
-                           type="radio"
-                           name="update"
-                           value="LOCAL"
-                        >
-                        <i class="form-icon" /> LOCAL
-                     </label>
-                  </div>
-               </div>
-            </div>
-         </div>
-         <div class="workspace-query-results column col-12 mt-2">
-            <label class="form-label ml-2">{{ $t('message.selectStatement') }}</label>
-            <QueryEditor
-               ref="queryEditor"
-               :value.sync="localView.sql"
-               :workspace="workspace"
-               :schema="schema"
-               :height="editorHeight"
-            />
-         </div>
-      </div>
-   </ConfirmModal>
-</template>
-
-<script>
-import ConfirmModal from '@/components/BaseConfirmModal';
-import QueryEditor from '@/components/QueryEditor';
-
-export default {
-   name: 'ModalNewView',
-   components: {
-      ConfirmModal,
-      QueryEditor
-   },
-   props: {
-      workspace: Object
-   },
-   data () {
-      return {
-         localView: {
-            algorithm: 'UNDEFINED',
-            definer: '',
-            security: 'DEFINER',
-            updateOption: '',
-            sql: '',
-            name: ''
-         },
-         isOptionsChanging: false,
-         editorHeight: 300
-      };
-   },
-   computed: {
-      schema () {
-         return this.workspace.breadcrumbs.schema;
-      }
-   },
-   mounted () {
-      setTimeout(() => {
-         this.$refs.firstInput.focus();
-      }, 20);
-   },
-   methods: {
-      confirmOptionsChange () {
-         this.$emit('open-create-view-editor', this.localView);
-      }
-   }
-};
-</script>
--- a/src/renderer/components/ModalProcessesList.vue
+++ b/src/renderer/components/ModalProcessesList.vue
@@ -1,5 +1,15 @@
 <template>
   <div class="modal active">
+      <ModalProcessesListContext
+         v-if="isContext"
+         :context-event="contextEvent"
+         :selected-row="selectedRow"
+         :selected-cell="selectedCell"
+         @copy-cell="copyCell"
+         @copy-row="copyRow"
+         @kill-process="killProcess"
+         @close-context="closeContext"
+      />
      <a class="modal-overlay" @click.stop="closeModal" />
      <div class="modal-container p-0 pb-4">
         <div class="modal-header pl-2">
@@ -12,34 +22,55 @@
            <a class="btn btn-clear c-hand" @click.stop="closeModal" />
         </div>
         <div class="processes-toolbar py-2 px-4">
-            <div class="dropdown">
-               <div class="btn-group">
-                  <button
-                     class="btn btn-dark btn-sm mr-0 pr-1 d-flex"
-                     :class="{'loading':isQuering}"
-                     title="F5"
-                     @click="getProcessesList"
-                  >
-                     <span>{{ $t('word.refresh') }}</span>
-                     <i v-if="!+autorefreshTimer" class="mdi mdi-24px mdi-refresh ml-1" />
-                     <i v-else class="mdi mdi-24px mdi-history mdi-flip-h ml-1" />
-                  </button>
-                  <div class="btn btn-dark btn-sm dropdown-toggle pl-0 pr-0" tabindex="0">
-                     <i class="mdi mdi-24px mdi-menu-down" />
-                  </div>
-                  <div class="menu px-3">
-                     <span>{{ $t('word.autoRefresh') }}: <b>{{ +autorefreshTimer ? `${autorefreshTimer}s` : 'OFF' }}</b></span>
-                     <input
-                        v-model="autorefreshTimer"
-                        class="slider no-border"
-                        type="range"
-                        min="0"
-                        max="15"
-                        step="0.5"
-                        @change="setRefreshInterval"
+            <div class="workspace-query-buttons">
+               <div class="dropdown pr-1">
+                  <div class="btn-group">
+                     <button
+                        class="btn btn-dark btn-sm mr-0 pr-1 d-flex"
+                        :class="{'loading':isQuering}"
+                        title="F5"
+                        @click="getProcessesList"
                     >
+                        <i v-if="!+autorefreshTimer" class="mdi mdi-24px mdi-refresh mr-1" />
+                        <i v-else class="mdi mdi-24px mdi-history mdi-flip-h mr-1" />
+                        <span>{{ $t('word.refresh') }}</span>
+                     </button>
+                     <div class="btn btn-dark btn-sm dropdown-toggle pl-0 pr-0" tabindex="0">
+                        <i class="mdi mdi-24px mdi-menu-down" />
+                     </div>
+                     <div class="menu px-3">
+                        <span>{{ $t('word.autoRefresh') }}: <b>{{ +autorefreshTimer ? `${autorefreshTimer}s` : 'OFF' }}</b></span>
+                        <input
+                           v-model="autorefreshTimer"
+                           class="slider no-border"
+                           type="range"
+                           min="0"
+                           max="15"
+                           step="0.5"
+                           @change="setRefreshInterval"
+                        >
+                     </div>
                  </div>
               </div>
+               <div class="dropdown table-dropdown">
+                  <button
+                     :disabled="isQuering"
+                     class="btn btn-dark btn-sm dropdown-toggle d-flex mr-0 pr-0"
+                     tabindex="0"
+                  >
+                     <i class="mdi mdi-24px mdi-file-export mr-1" />
+                     <span>{{ $t('word.export') }}</span>
+                     <i class="mdi mdi-24px mdi-menu-down" />
+                  </button>
+                  <ul class="menu text-left">
+                     <li class="menu-item">
+                        <a class="c-hand" @click="downloadTable('json')">JSON</a>
+                     </li>
+                     <li class="menu-item">
+                        <a class="c-hand" @click="downloadTable('csv')">CSV</a>
+                     </li>
+                  </ul>
+               </div>
            </div>
            <div class="workspace-query-info">
               <div v-if="sortedResults.length">
@@ -83,11 +114,12 @@
                     :scroll-element="scrollElement"
                  >
                     <template slot-scope="{ items }">
-                        <ProcessesListRow
+                        <ModalProcessesListRow
                           v-for="row in items"
-                           :key="row._id"
+                           :key="row.id"
                           class="process-row"
                           :row="row"
+                           @select-row="selectRow(row.id)"
                           @contextmenu="contextMenu"
                           @stop-refresh="stopRefresh"
                        />
@@ -102,15 +134,18 @@

 <script>
 import { mapGetters, mapActions } from 'vuex';
+import arrayToFile from '../libs/arrayToFile';
 import Schema from '@/ipc-api/Schema';
 import BaseVirtualScroll from '@/components/BaseVirtualScroll';
-import ProcessesListRow from '@/components/ProcessesListRow';
+import ModalProcessesListRow from '@/components/ModalProcessesListRow';
+import ModalProcessesListContext from '@/components/ModalProcessesListContext';

 export default {
   name: 'ModalProcessesList',
   components: {
      BaseVirtualScroll,
-      ProcessesListRow
+      ModalProcessesListRow,
+      ModalProcessesListContext
   },
   props: {
      connection: Object
@@ -119,8 +154,12 @@ export default {
      return {
         resultsSize: 1000,
         isQuering: false,
+         isContext: false,
         autorefreshTimer: 0,
         refreshInterval: null,
+         contextEvent: null,
+         selectedCell: null,
+         selectedRow: null,
         results: [],
         fields: [],
         currentSort: '',
@@ -245,10 +284,55 @@ export default {
         this.autorefreshTimer = 0;
         this.clearRefresh();
      },
-      contextMenu () {},
+      selectRow (row) {
+         this.selectedRow = row;
+      },
+      contextMenu (event, cell) {
+         if (event.target.localName === 'input') return;
+         this.stopRefresh();
+
+         this.selectedCell = cell;
+         this.selectedRow = cell.id;
+         this.contextEvent = event;
+         this.isContext = true;
+      },
+      async killProcess () {
+         try { // Table data
+            const { status, response } = await Schema.killProcess({ uid: this.connection.uid, pid: this.selectedRow });
+
+            if (status === 'success')
+               this.getProcessesList();
+            else
+               this.addNotification({ status: 'error', message: response });
+         }
+         catch (err) {
+            this.addNotification({ status: 'error', message: err.stack });
+         }
+      },
+      closeContext () {
+         this.isContext = false;
+      },
+      copyCell () {
+         const row = this.results.find(row => row.id === this.selectedRow);
+         const valueToCopy = row[this.selectedCell.field];
+         navigator.clipboard.writeText(valueToCopy);
+      },
+      copyRow () {
+         const row = this.results.find(row => row.id === this.selectedRow);
+         const rowToCopy = JSON.parse(JSON.stringify(row));
+         navigator.clipboard.writeText(JSON.stringify(rowToCopy));
+      },
      closeModal () {
         this.$emit('close');
      },
+      downloadTable (format) {
+         if (!this.sortedResults) return;
+         arrayToFile({
+            type: format,
+            content: this.sortedResults,
+            filename: 'processes'
+         });
+      },
      onKey (e) {
         e.stopPropagation();
         if (e.key === 'Escape')
--- a/src/renderer/components/ModalProcessesListContext.vue
+++ b/src/renderer/components/ModalProcessesListContext.vue
@@ -0,0 +1,75 @@
+<template>
+   <BaseContextMenu
+      :context-event="contextEvent"
+      @close-context="closeContext"
+   >
+      <div v-if="selectedRow" class="context-element">
+         <span class="d-flex"><i class="mdi mdi-18px mdi-content-copy text-light pr-1" /> {{ $t('word.copy') }}</span>
+         <i class="mdi mdi-18px mdi-chevron-right text-light pl-1" />
+         <div class="context-submenu">
+            <div
+               v-if="selectedRow"
+               class="context-element"
+               @click="copyCell"
+            >
+               <span class="d-flex">
+                  <i class="mdi mdi-18px mdi-numeric-0 mdi-rotate-90 text-light pr-1" /> {{ $tc('word.cell', 1) }}
+               </span>
+            </div>
+            <div
+               v-if="selectedRow"
+               class="context-element"
+               @click="copyRow"
+            >
+               <span class="d-flex">
+                  <i class="mdi mdi-18px mdi-table-row text-light pr-1" /> {{ $tc('word.row', 1) }}
+               </span>
+            </div>
+         </div>
+      </div>
+      <div
+         v-if="selectedRow"
+         class="context-element"
+         @click="killProcess"
+      >
+         <span class="d-flex">
+            <i class="mdi mdi-18px mdi-close-circle-outline text-light pr-1" /> {{ $t('message.killProcess') }}
+         </span>
+      </div>
+   </BaseContextMenu>
+</template>
+
+<script>
+import BaseContextMenu from '@/components/BaseContextMenu';
+
+export default {
+   name: 'ModalProcessesListContext',
+   components: {
+      BaseContextMenu
+   },
+   props: {
+      contextEvent: MouseEvent,
+      selectedRow: Number,
+      selectedCell: Object
+   },
+   computed: {
+   },
+   methods: {
+      closeContext () {
+         this.$emit('close-context');
+      },
+      copyCell () {
+         this.$emit('copy-cell');
+         this.closeContext();
+      },
+      copyRow () {
+         this.$emit('copy-row');
+         this.closeContext();
+      },
+      killProcess () {
+         this.$emit('kill-process');
+         this.closeContext();
+      }
+   }
+};
+</script>
--- a/src/renderer/components/ModalProcessesListRow.vue
+++ b/src/renderer/components/ModalProcessesListRow.vue
@@ -1,21 +1,18 @@
 <template>
-   <div class="tr" @click="selectRow($event, row._id)">
+   <div class="tr" @click="selectRow()">
      <div
         v-for="(col, cKey) in row"
-         v-show="cKey !== '_id'"
         :key="cKey"
         class="td p-0"
         tabindex="0"
-         @contextmenu.prevent="openContext($event, { id: row._id, field: cKey })"
+         @contextmenu.prevent="openContext($event, { id: row.id, field: cKey })"
      >
-         <template v-if="cKey !== '_id'">
-            <span
-               v-if="!isInlineEditor[cKey]"
-               class="cell-content px-2"
-               :class="`${isNull(col)} type-${typeof col === 'number' ? 'int' : 'varchar'}`"
-               @dblclick="dblClick(cKey)"
-            >{{ col | cutText }}</span>
-         </template>
+         <span
+            v-if="!isInlineEditor[cKey]"
+            class="cell-content"
+            :class="`${isNull(col)} type-${typeof col === 'number' ? 'int' : 'varchar'}`"
+            @dblclick="dblClick(cKey)"
+         >{{ col | cutText }}</span>
      </div>
      <ConfirmModal
         v-if="isInfoModal"
@@ -51,7 +48,7 @@ import ConfirmModal from '@/components/BaseConfirmModal';
 import TextEditor from '@/components/BaseTextEditor';

 export default {
-   name: 'ProcessesListRow',
+   name: 'ModalProcessesListRow',
   components: {
      ConfirmModal,
      TextEditor
@@ -73,25 +70,15 @@ export default {
      };
   },
   computed: {},
-   watch: {
-      fields () {
-         Object.keys(this.fields).forEach(field => {
-            this.isInlineEditor[field.name] = false;
-         });
-      }
-   },
   methods: {
      isNull (value) {
         return value === null ? ' is-null' : '';
      },
-      selectRow (event, row) {
-         this.$emit('select-row', event, row);
+      selectRow () {
+         this.$emit('select-row');
      },
      openContext (event, payload) {
-         if (this.isEditable) {
-            payload.field = this.fields[payload.field].name;// Ensures field name only
-            this.$emit('contextmenu', event, payload);
-         }
+         this.$emit('contextmenu', event, payload);
      },
      hideInfoModal () {
         this.isInfoModal = false;
@@ -126,6 +113,7 @@ export default {

 .cell-content {
  display: block;
+  padding: 0 0.2rem;
  min-height: 0.8rem;
  text-overflow: ellipsis;
  white-space: nowrap;
--- a/src/renderer/components/ModalSettings.vue
+++ b/src/renderer/components/ModalSettings.vue
@@ -59,15 +59,15 @@
                        <div class="column col-12 h6 text-uppercase mb-1">
                           {{ $t('word.application') }}
                        </div>
-                        <div class="column col-8 col-sm-12 mb-2">
+                        <div class="column col-9 col-sm-12 mb-2">
                           <div class="form-group">
-                              <div class="col-6 col-sm-12">
+                              <div class="col-7 col-sm-12">
                                 <label class="form-label">
                                    <i class="mdi mdi-18px mdi-translate mr-1" />
                                    {{ $t('word.language') }}
                                 </label>
                              </div>
-                              <div class="col-6 col-sm-12">
+                              <div class="col-5 col-sm-12">
                                 <select
                                    v-model="localLocale"
                                    class="form-select"
@@ -84,12 +84,12 @@
                              </div>
                           </div>
                           <div class="form-group">
-                              <div class="col-6 col-sm-12">
+                              <div class="col-7 col-sm-12">
                                 <label class="form-label">
                                    {{ $t('message.dataTabPageSize') }}
                                 </label>
                              </div>
-                              <div class="col-6 col-sm-12">
+                              <div class="col-5 col-sm-12">
                                 <select
                                    v-model="localPageSize"
                                    class="form-select"
@@ -104,13 +104,26 @@
                                 </select>
                              </div>
                           </div>
+                           <div class="form-group mb-0">
+                              <div class="col-7 col-sm-12">
+                                 <label class="form-label">
+                                    {{ $t('message.restorePreviourSession') }}
+                                 </label>
+                              </div>
+                              <div class="col-5 col-sm-12">
+                                 <label class="form-switch d-inline-block" @click.prevent="toggleRestoreSession">
+                                    <input type="checkbox" :checked="restoreTabs">
+                                    <i class="form-icon" />
+                                 </label>
+                              </div>
+                           </div>
                           <div class="form-group">
-                              <div class="col-6 col-sm-12">
+                              <div class="col-7 col-sm-12">
                                 <label class="form-label">
                                    {{ $t('message.notificationsTimeout') }}
                                 </label>
                              </div>
-                              <div class="col-6 col-sm-12">
+                              <div class="col-5 col-sm-12">
                                 <div class="input-group">
                                    <input
                                       v-model="localTimeout"
@@ -128,29 +141,27 @@
                        <div class="column col-12 h6 mt-4 text-uppercase mb-1">
                           {{ $t('word.editor') }}
                        </div>
-                        <div class="column col-8 col-sm-12">
-                           <div class="form-group">
-                              <div class="col-6 col-sm-12">
+                        <div class="column col-9 col-sm-12">
+                           <div class="form-group mb-0">
+                              <div class="col-7 col-sm-12">
                                 <label class="form-label">
                                    {{ $t('word.autoCompletion') }}
                                 </label>
                              </div>
-                              <div class="col-6 col-sm-12">
+                              <div class="col-5 col-sm-12">
                                 <label class="form-switch d-inline-block" @click.prevent="toggleAutoComplete">
                                    <input type="checkbox" :checked="selectedAutoComplete">
                                    <i class="form-icon" />
                                 </label>
                              </div>
                           </div>
-                        </div>
-                        <div class="column col-8 col-sm-12">
-                           <div class="form-group">
-                              <div class="col-6 col-sm-12">
+                           <div class="form-group mb-0">
+                              <div class="col-7 col-sm-12">
                                 <label class="form-label">
                                    {{ $t('message.wrapLongLines') }}
                                 </label>
                              </div>
-                              <div class="col-6 col-sm-12">
+                              <div class="col-5 col-sm-12">
                                 <label class="form-switch d-inline-block" @click.prevent="toggleLineWrap">
                                    <input type="checkbox" :checked="selectedLineWrap">
                                    <i class="form-icon" />
@@ -307,7 +318,7 @@ export default {
         localTimeout: null,
         localEditorTheme: null,
         selectedTab: 'general',
-         pageSizes: [40, 100, 250, 500, 1000],
+         pageSizes: [30, 40, 100, 250, 500, 1000],
         editorThemes: [
            {
               group: this.$t('word.light'),
@@ -369,6 +380,7 @@ export default {
         selectedAutoComplete: 'settings/getAutoComplete',
         selectedLineWrap: 'settings/getLineWrap',
         notificationsTimeout: 'settings/getNotificationsTimeout',
+         restoreTabs: 'settings/getRestoreTabs',
         applicationTheme: 'settings/getApplicationTheme',
         editorTheme: 'settings/getEditorTheme',
         editorFontSize: 'settings/getEditorFontSize',
@@ -423,6 +435,7 @@ ORDER BY
         closeModal: 'application/hideSettingModal',
         changeLocale: 'settings/changeLocale',
         changePageSize: 'settings/changePageSize',
+         changeRestoreTabs: 'settings/changeRestoreTabs',
         changeAutoComplete: 'settings/changeAutoComplete',
         changeLineWrap: 'settings/changeLineWrap',
         changeApplicationTheme: 'settings/changeApplicationTheme',
@@ -447,6 +460,9 @@ ORDER BY
         if (e.key === 'Escape')
            this.closeModal();
      },
+      toggleRestoreSession () {
+         this.changeRestoreTabs(!this.restoreTabs);
+      },
      toggleAutoComplete () {
         this.changeAutoComplete(!this.selectedAutoComplete);
      },
--- a/src/renderer/components/TheSettingBar.vue
+++ b/src/renderer/components/TheSettingBar.vue
@@ -8,21 +8,25 @@
            @close-context="isContext = false"
         />
         <ul class="settingbar-elements">
-            <draggable v-model="connections">
+            <Draggable
+               v-model="connections"
+               @start="isDragging = true"
+               @end="dragStop"
+            >
               <li
                  v-for="connection in connections"
                  :key="connection.uid"
                  draggable="true"
                  class="settingbar-element btn btn-link ex-tooltip"
                  :class="{'selected': connection.uid === selectedWorkspace}"
-                  @click="selectWorkspace(connection.uid)"
+                  @click.stop="selectWorkspace(connection.uid)"
                  @contextmenu.prevent="contextMenu($event, connection)"
                  @mouseover.self="tooltipPosition"
               >
                  <i class="settingbar-element-icon dbi" :class="`dbi-${connection.client} ${getStatusBadge(connection.uid)}`" />
-                  <span class="ex-tooltip-content">{{ getConnectionName(connection.uid) }}</span>
+                  <span v-if="!isDragging" class="ex-tooltip-content">{{ getConnectionName(connection.uid) }}</span>
               </li>
-            </draggable>
+            </Draggable>
            <li
               class="settingbar-element btn btn-link ex-tooltip"
               :class="{'selected': 'NEW' === selectedWorkspace}"
@@ -52,19 +56,20 @@

 <script>
 import { mapActions, mapGetters } from 'vuex';
-import draggable from 'vuedraggable';
+import Draggable from 'vuedraggable';
 import SettingBarContext from '@/components/SettingBarContext';

 export default {
   name: 'TheSettingBar',
   components: {
-      draggable,
+      Draggable,
      SettingBarContext
   },
   data () {
      return {
         dragElement: null,
         isContext: false,
+         isDragging: false,
         contextEvent: null,
         contextConnection: {},
         scale: 0
@@ -106,13 +111,13 @@ export default {
         return connection.ask ? '' : `${connection.user + '@'}${connection.host}:${connection.port}`;
      },
      tooltipPosition (e) {
-         const el = e.target;
+         const el = e.target ? e.target : e;
         const fromTop = window.pageYOffset + el.getBoundingClientRect().top - (el.offsetHeight / 4);
         el.querySelector('.ex-tooltip-content').style.top = `${fromTop}px`;
      },
      getStatusBadge (uid) {
         if (this.getWorkspace(uid)) {
-            const status = this.getWorkspace(uid).connection_status;
+            const status = this.getWorkspace(uid).connectionStatus;

            switch (status) {
               case 'connected':
@@ -125,6 +130,13 @@ export default {
                  return '';
            }
         }
+      },
+      dragStop (e) {
+         this.isDragging = false;
+
+         setTimeout(() => {
+            this.tooltipPosition(e.originalEvent.target.parentNode);
+         }, 200);
      }
   }
 };
@@ -235,7 +247,13 @@ export default {
      transition: opacity 0.2s;
    }

-    &:hover .ex-tooltip-content {
+    &.sortable-chosen {
+      .ex-tooltip-content {
+        opacity: 0 !important;
+      }
+    }
+
+    &:hover:not(.selected) .ex-tooltip-content {
      visibility: visible;
      opacity: 1;
    }
--- a/src/renderer/components/Workspace.vue
+++ b/src/renderer/components/Workspace.vue
@@ -1,17 +1,262 @@
 <template>
   <div v-show="isSelected" class="workspace column columns col-gapless">
      <WorkspaceExploreBar
-         v-if="workspace.connection_status === 'connected'"
+         v-if="workspace.connectionStatus === 'connected'"
         :connection="connection"
         :is-selected="isSelected"
      />
-      <div v-if="workspace.connection_status === 'connected'" class="workspace-tabs column columns col-gapless">
-         <ul
-            id="tabWrap"
+      <div v-if="workspace.connectionStatus === 'connected'" class="workspace-tabs column columns col-gapless">
+         <Draggable
            ref="tabWrap"
+            v-model="draggableTabs"
+            tag="ul"
+            group="tabs"
            class="tab tab-block column col-12"
+            draggable=".tab-draggable"
+            @mouseover.native="addWheelEvent"
         >
-            <li class="tab-item dropdown tools-dropdown">
+            <li
+               v-for="(tab, i) of draggableTabs"
+               :key="i"
+               :ref="selectedTab === tab.uid ? 'tab-selected' : ''"
+               class="tab-item tab-draggable"
+               draggable="true"
+               :class="{'active': selectedTab === tab.uid}"
+               @mousedown.left="selectTab({uid: workspace.uid, tab: tab.uid})"
+               @mouseup.middle="closeTab(tab)"
+            >
+               <a v-if="tab.type === 'query'" class="tab-link">
+                  <i class="mdi mdi-18px mdi-code-tags mr-1" />
+                  <span>
+                     <span>{{ tab.content || 'Query' | cutText }} #{{ tab.index }}</span>
+                     <span
+                        class="btn btn-clear"
+                        :title="$t('word.close')"
+                        @mousedown.left.stop
+                        @click.stop="closeTab(tab)"
+                     />
+                  </span>
+               </a>
+
+               <a
+                  v-else-if="tab.type === 'temp-data'"
+                  class="tab-link"
+                  @dblclick="openAsPermanentTab(tab)"
+               >
+                  <i class="mdi mdi-18px mr-1" :class="tab.elementType === 'view' ? 'mdi-table-eye' : 'mdi-table'" />
+                  <span :title="`${$t('word.data').toUpperCase()}: ${$tc(`word.${tab.elementType}`)}`">
+                     <span class=" text-italic">{{ tab.elementName | cutText }}</span>
+                     <span
+                        class="btn btn-clear"
+                        :title="$t('word.close')"
+                        @mousedown.left.stop
+                        @click.stop="closeTab(tab)"
+                     />
+                  </span>
+               </a>
+
+               <a v-else-if="tab.type === 'data'" class="tab-link">
+                  <i class="mdi mdi-18px mr-1" :class="tab.elementType === 'view' ? 'mdi-table-eye' : 'mdi-table'" />
+                  <span :title="`${$t('word.data').toUpperCase()}: ${$tc(`word.${tab.elementType}`)}`">
+                     {{ tab.elementName | cutText }}
+                     <span
+                        class="btn btn-clear"
+                        :title="$t('word.close')"
+                        @mousedown.left.stop
+                        @click.stop="closeTab(tab)"
+                     />
+                  </span>
+               </a>
+
+               <a
+                  v-else-if="tab.type === 'new-table'"
+                  class="tab-link"
+                  :class="{'badge': tab.isChanged}"
+               >
+                  <i class="mdi mdi-shape-square-plus mdi-18px mr-1" />
+                  <span :title="`${$t('word.new').toUpperCase()}: ${$tc(`word.${tab.elementType}`)}`">
+                     {{ $t('message.newTable') }}
+                     <span
+                        class="btn btn-clear"
+                        :title="$t('word.close')"
+                        @mousedown.left.stop
+                        @click.stop="closeTab(tab)"
+                     />
+                  </span>
+               </a>
+
+               <a
+                  v-else-if="tab.type === 'table-props'"
+                  class="tab-link"
+                  :class="{'badge': tab.isChanged}"
+               >
+                  <i class="mdi mdi-tune-vertical-variant mdi-18px mr-1" />
+                  <span :title="`${$t('word.settings').toUpperCase()}: ${$tc(`word.${tab.elementType}`)}`">
+                     {{ tab.elementName | cutText }}
+                     <span
+                        class="btn btn-clear"
+                        :title="$t('word.close')"
+                        @mousedown.left.stop
+                        @click.stop="closeTab(tab)"
+                     />
+                  </span>
+               </a>
+
+               <a
+                  v-else-if="tab.type === 'view-props'"
+                  class="tab-link"
+                  :class="{'badge': tab.isChanged}"
+               >
+                  <i class="mdi mdi-tune-vertical-variant mdi-18px mr-1" />
+                  <span :title="`${$t('word.settings').toUpperCase()}: ${$tc(`word.view`)}`">
+                     {{ tab.elementName | cutText }}
+                     <span
+                        class="btn btn-clear"
+                        :title="$t('word.close')"
+                        @mousedown.left.stop
+                        @click.stop="closeTab(tab)"
+                     />
+                  </span>
+               </a>
+
+               <a
+                  v-else-if="tab.type === 'new-view'"
+                  class="tab-link"
+                  :class="{'badge': tab.isChanged}"
+               >
+                  <i class="mdi mdi-shape-square-plus mdi-18px mr-1" />
+                  <span :title="`${$t('word.new').toUpperCase()}: ${$tc(`word.${tab.elementType}`)}`">
+                     {{ $t('message.newView') }}
+                     <span
+                        class="btn btn-clear"
+                        :title="$t('word.close')"
+                        @mousedown.left.stop
+                        @click.stop="closeTab(tab)"
+                     />
+                  </span>
+               </a>
+
+               <a
+                  v-else-if="tab.type === 'new-trigger'"
+                  class="tab-link"
+                  :class="{'badge': tab.isChanged}"
+               >
+                  <i class="mdi mdi-shape-square-plus mdi-18px mr-1" />
+                  <span :title="`${$t('word.new').toUpperCase()}: ${$tc(`word.${tab.elementType}`)}`">
+                     {{ $t('message.newTrigger') }}
+                     <span
+                        class="btn btn-clear"
+                        :title="$t('word.close')"
+                        @mousedown.left.stop
+                        @click.stop="closeTab(tab)"
+                     />
+                  </span>
+               </a>
+
+               <a
+                  v-else-if="tab.type === 'new-routine'"
+                  class="tab-link"
+                  :class="{'badge': tab.isChanged}"
+               >
+                  <i class="mdi mdi-shape-square-plus mdi-18px mr-1" />
+                  <span :title="`${$t('word.new').toUpperCase()}: ${$tc(`word.${tab.elementType}`)}`">
+                     {{ $t('message.newRoutine') }}
+                     <span
+                        class="btn btn-clear"
+                        :title="$t('word.close')"
+                        @mousedown.left.stop
+                        @click.stop="closeTab(tab)"
+                     />
+                  </span>
+               </a>
+
+               <a
+                  v-else-if="tab.type === 'new-function'"
+                  class="tab-link"
+                  :class="{'badge': tab.isChanged}"
+               >
+                  <i class="mdi mdi-shape-square-plus mdi-18px mr-1" />
+                  <span :title="`${$t('word.new').toUpperCase()}: ${$tc(`word.${tab.elementType}`)}`">
+                     {{ $t('message.newFunction') }}
+                     <span
+                        class="btn btn-clear"
+                        :title="$t('word.close')"
+                        @mousedown.left.stop
+                        @click.stop="closeTab(tab)"
+                     />
+                  </span>
+               </a>
+
+               <a
+                  v-else-if="tab.type === 'new-trigger-function'"
+                  class="tab-link"
+                  :class="{'badge': tab.isChanged}"
+               >
+                  <i class="mdi mdi-shape-square-plus mdi-18px mr-1" />
+                  <span :title="`${$t('word.new').toUpperCase()}: ${$tc(`word.${tab.elementType}`)}`">
+                     {{ $t('message.newTriggerFunction') }}
+                     <span
+                        class="btn btn-clear"
+                        :title="$t('word.close')"
+                        @mousedown.left.stop
+                        @click.stop="closeTab(tab)"
+                     />
+                  </span>
+               </a>
+
+               <a
+                  v-else-if="tab.type === 'new-scheduler'"
+                  class="tab-link"
+                  :class="{'badge': tab.isChanged}"
+               >
+                  <i class="mdi mdi-shape-square-plus mdi-18px mr-1" />
+                  <span :title="`${$t('word.new').toUpperCase()}: ${$tc(`word.${tab.elementType}`)}`">
+                     {{ $t('message.newScheduler') }}
+                     <span
+                        class="btn btn-clear"
+                        :title="$t('word.close')"
+                        @mousedown.left.stop
+                        @click.stop="closeTab(tab)"
+                     />
+                  </span>
+               </a>
+
+               <a
+                  v-else-if="tab.type.includes('temp-')"
+                  class="tab-link"
+                  :class="{'badge': tab.isChanged}"
+                  @dblclick="openAsPermanentTab(tab)"
+               >
+                  <i class="mdi mdi-18px mdi-tune-vertical-variant mr-1" />
+                  <span :title="`${$t('word.settings').toUpperCase()}: ${$tc(`word.${tab.elementType}`)}`">
+                     <span class=" text-italic">{{ tab.elementName | cutText }}</span>
+                     <span
+                        class="btn btn-clear"
+                        :title="$t('word.close')"
+                        @mousedown.left.stop
+                        @click.stop="closeTab(tab)"
+                     />
+                  </span>
+               </a>
+
+               <a
+                  v-else
+                  class="tab-link"
+                  :class="{'badge': tab.isChanged}"
+               >
+                  <i class="mdi mdi-18px mdi-tune-vertical-variant mr-1" />
+                  <span :title="`${$t('word.settings').toUpperCase()}: ${$tc(`word.${tab.elementType}`)}`">
+                     {{ tab.elementName | cutText }}
+                     <span
+                        class="btn btn-clear"
+                        :title="$t('word.close')"
+                        @mousedown.left.stop
+                        @click.stop="closeTab(tab)"
+                     />
+                  </span>
+               </a>
+            </li>
+            <li slot="header" class="tab-item dropdown tools-dropdown">
               <a
                  class="tab-link workspace-tools-link dropdown-toggle"
                  tabindex="0"
@@ -48,113 +293,152 @@
                  </li>
               </ul>
            </li>
-            <li
-               v-if="schemaChild && isSettingSupported"
-               class="tab-item"
-               :class="{'active': selectedTab === 'prop'}"
-               @click="selectTab({uid: workspace.uid, tab: 'prop'})"
-            >
-               <a class="tab-link">
-                  <i class="mdi mdi-18px mdi-tune-vertical-variant mr-1" />
-                  <span :title="schemaChild">{{ $t('word.settings').toUpperCase() }}: {{ schemaChild }}</span>
-               </a>
-            </li>
-            <li
-               v-if="workspace.breadcrumbs.table || workspace.breadcrumbs.view"
-               class="tab-item"
-               :class="{'active': selectedTab === 'data'}"
-               @click="selectTab({uid: workspace.uid, tab: 'data'})"
-            >
-               <a class="tab-link">
-                  <i class="mdi mdi-18px mr-1" :class="workspace.breadcrumbs.table ? 'mdi-table' : 'mdi-table-eye'" />
-                  <span :title="schemaChild">{{ $t('word.data').toUpperCase() }}: {{ schemaChild }}</span>
-               </a>
-            </li>
-            <li
-               v-for="tab of queryTabs"
-               :key="tab.uid"
-               class="tab-item"
-               :class="{'active': selectedTab === tab.uid}"
-               @click="selectTab({uid: workspace.uid, tab: tab.uid})"
-               @mouseup.middle="closeTab(tab.uid)"
-            >
-               <a class="tab-link">
-                  <i class="mdi mdi-18px mdi-code-tags mr-1" />
-                  <span>
-                     Query #{{ tab.index }}
-                     <span
-                        v-if="queryTabs.length > 1"
-                        class="btn btn-clear"
-                        :title="$t('word.close')"
-                        @click.stop="closeTab(tab.uid)"
-                     />
-                  </span>
-               </a>
-            </li>
-            <li class="tab-item">
+            <li slot="footer" class="tab-item">
               <a
                  class="tab-add"
                  :title="$t('message.openNewTab')"
-                  @click="addTab"
+                  @click="addQueryTab"
               >
                  <i class="mdi mdi-24px mdi-plus" />
               </a>
            </li>
-         </ul>
-         <WorkspacePropsTab
-            v-show="selectedTab === 'prop' && workspace.breadcrumbs.table"
-            :is-selected="selectedTab === 'prop'"
-            :connection="connection"
-            :table="workspace.breadcrumbs.table"
-         />
-         <WorkspacePropsTabView
-            v-show="selectedTab === 'prop' && workspace.breadcrumbs.view"
-            :is-selected="selectedTab === 'prop'"
-            :connection="connection"
-            :view="workspace.breadcrumbs.view"
-         />
-         <WorkspacePropsTabTrigger
-            v-show="selectedTab === 'prop' && workspace.breadcrumbs.trigger"
-            :is-selected="selectedTab === 'prop'"
-            :connection="connection"
-            :trigger="workspace.breadcrumbs.trigger"
-         />
-         <WorkspacePropsTabRoutine
-            v-show="selectedTab === 'prop' && workspace.breadcrumbs.procedure"
-            :is-selected="selectedTab === 'prop'"
-            :connection="connection"
-            :routine="workspace.breadcrumbs.procedure"
-         />
-         <WorkspacePropsTabFunction
-            v-show="selectedTab === 'prop' && workspace.breadcrumbs.function"
-            :is-selected="selectedTab === 'prop'"
-            :connection="connection"
-            :function="workspace.breadcrumbs.function"
-         />
-         <WorkspacePropsTabTriggerFunction
-            v-show="selectedTab === 'prop' && workspace.breadcrumbs.triggerFunction"
-            :is-selected="selectedTab === 'prop'"
-            :connection="connection"
-            :function="workspace.breadcrumbs.triggerFunction"
-         />
-         <WorkspacePropsTabScheduler
-            v-show="selectedTab === 'prop' && workspace.breadcrumbs.scheduler"
-            :is-selected="selectedTab === 'prop'"
-            :connection="connection"
-            :scheduler="workspace.breadcrumbs.scheduler"
-         />
-         <WorkspaceTableTab
-            v-show="selectedTab === 'data'"
-            :connection="connection"
-            :table="workspace.breadcrumbs.table || workspace.breadcrumbs.view"
-         />
-         <WorkspaceQueryTab
-            v-for="tab of queryTabs"
-            :key="tab.uid"
-            :tab="tab"
-            :is-selected="selectedTab === tab.uid"
-            :connection="connection"
-         />
+         </Draggable>
+         <WorkspaceEmptyState v-if="!workspace.tabs.length" @new-tab="addQueryTab" />
+         <template v-for="tab of workspace.tabs">
+            <WorkspaceTabQuery
+               v-if="tab.type==='query'"
+               :key="tab.uid"
+               :tab="tab"
+               :is-selected="selectedTab === tab.uid"
+               :connection="connection"
+            />
+            <WorkspaceTabTable
+               v-else-if="['temp-data', 'data'].includes(tab.type)"
+               :key="tab.uid"
+               :connection="connection"
+               :is-selected="selectedTab === tab.uid"
+               :table="tab.elementName"
+               :schema="tab.schema"
+               :element-type="tab.elementType"
+            />
+            <WorkspaceTabNewTable
+               v-else-if="tab.type === 'new-table'"
+               :key="tab.uid"
+               :tab="tab"
+               :connection="connection"
+               :is-selected="selectedTab === tab.uid"
+               :schema="tab.schema"
+            />
+            <WorkspaceTabPropsTable
+               v-else-if="tab.type === 'table-props'"
+               :key="tab.uid"
+               :connection="connection"
+               :is-selected="selectedTab === tab.uid"
+               :table="tab.elementName"
+               :schema="tab.schema"
+            />
+            <WorkspaceTabNewView
+               v-else-if="tab.type === 'new-view'"
+               :key="tab.uid"
+               :tab="tab"
+               :connection="connection"
+               :is-selected="selectedTab === tab.uid"
+               :schema="tab.schema"
+            />
+            <WorkspaceTabPropsView
+               v-else-if="tab.type === 'view-props'"
+               :key="tab.uid"
+               :is-selected="selectedTab === tab.uid"
+               :connection="connection"
+               :view="tab.elementName"
+               :schema="tab.schema"
+            />
+            <WorkspaceTabNewTrigger
+               v-else-if="tab.type === 'new-trigger'"
+               :key="tab.uid"
+               :tab="tab"
+               :connection="connection"
+               :is-selected="selectedTab === tab.uid"
+               :trigger="tab.elementName"
+               :schema="tab.schema"
+            />
+            <WorkspaceTabPropsTrigger
+               v-else-if="['temp-trigger-props', 'trigger-props'].includes(tab.type)"
+               :key="tab.uid"
+               :connection="connection"
+               :is-selected="selectedTab === tab.uid"
+               :trigger="tab.elementName"
+               :schema="tab.schema"
+            />
+            <WorkspaceTabNewTriggerFunction
+               v-else-if="tab.type === 'new-trigger-function'"
+               :key="tab.uid"
+               :tab="tab"
+               :connection="connection"
+               :is-selected="selectedTab === tab.uid"
+               :trigger="tab.elementName"
+               :schema="tab.schema"
+            />
+            <WorkspaceTabPropsTriggerFunction
+               v-else-if="['temp-trigger-function-props', 'trigger-function-props'].includes(tab.type)"
+               :key="tab.uid"
+               :connection="connection"
+               :is-selected="selectedTab === tab.uid"
+               :function="tab.elementName"
+               :schema="tab.schema"
+            />
+            <WorkspaceTabNewRoutine
+               v-else-if="tab.type === 'new-routine'"
+               :key="tab.uid"
+               :tab="tab"
+               :connection="connection"
+               :is-selected="selectedTab === tab.uid"
+               :trigger="tab.elementName"
+               :schema="tab.schema"
+            />
+            <WorkspaceTabPropsRoutine
+               v-else-if="['temp-routine-props', 'routine-props'].includes(tab.type)"
+               :key="tab.uid"
+               :connection="connection"
+               :is-selected="selectedTab === tab.uid"
+               :routine="tab.elementName"
+               :schema="tab.schema"
+            />
+            <WorkspaceTabNewFunction
+               v-else-if="tab.type === 'new-function'"
+               :key="tab.uid"
+               :tab="tab"
+               :connection="connection"
+               :is-selected="selectedTab === tab.uid"
+               :trigger="tab.elementName"
+               :schema="tab.schema"
+            />
+            <WorkspaceTabPropsFunction
+               v-else-if="['temp-function-props', 'function-props'].includes(tab.type)"
+               :key="tab.uid"
+               :connection="connection"
+               :is-selected="selectedTab === tab.uid"
+               :function="tab.elementName"
+               :schema="tab.schema"
+            />
+            <WorkspaceTabNewScheduler
+               v-else-if="tab.type === 'new-scheduler'"
+               :key="tab.uid"
+               :tab="tab"
+               :connection="connection"
+               :is-selected="selectedTab === tab.uid"
+               :trigger="tab.elementName"
+               :schema="tab.schema"
+            />
+            <WorkspaceTabPropsScheduler
+               v-else-if="['temp-scheduler-props', 'scheduler-props'].includes(tab.type)"
+               :key="tab.uid"
+               :connection="connection"
+               :is-selected="selectedTab === tab.uid"
+               :scheduler="tab.elementName"
+               :schema="tab.schema"
+            />
+         </template>
      </div>
      <WorkspaceEditConnectionPanel v-else :connection="connection" />
      <ModalProcessesList
@@ -162,40 +446,77 @@
         :connection="connection"
         @close="hideProcessesModal"
      />
+
+      <ModalDiscardChanges
+         v-if="unsavedTab"
+         @confirm="closeTab(unsavedTab, true)"
+         @close="unsavedTab = null"
+      />
   </div>
 </template>

 <script>
 import { mapGetters, mapActions } from 'vuex';
+import Draggable from 'vuedraggable';
 import Connection from '@/ipc-api/Connection';
+import WorkspaceEmptyState from '@/components/WorkspaceEmptyState';
 import WorkspaceExploreBar from '@/components/WorkspaceExploreBar';
 import WorkspaceEditConnectionPanel from '@/components/WorkspaceEditConnectionPanel';
-import WorkspaceQueryTab from '@/components/WorkspaceQueryTab';
-import WorkspaceTableTab from '@/components/WorkspaceTableTab';
-import WorkspacePropsTab from '@/components/WorkspacePropsTab';
-import WorkspacePropsTabView from '@/components/WorkspacePropsTabView';
-import WorkspacePropsTabTrigger from '@/components/WorkspacePropsTabTrigger';
-import WorkspacePropsTabRoutine from '@/components/WorkspacePropsTabRoutine';
-import WorkspacePropsTabFunction from '@/components/WorkspacePropsTabFunction';
-import WorkspacePropsTabTriggerFunction from '@/components/WorkspacePropsTabTriggerFunction';
-import WorkspacePropsTabScheduler from '@/components/WorkspacePropsTabScheduler';
+import WorkspaceTabQuery from '@/components/WorkspaceTabQuery';
+import WorkspaceTabTable from '@/components/WorkspaceTabTable';
+
+import WorkspaceTabNewTable from '@/components/WorkspaceTabNewTable';
+import WorkspaceTabNewView from '@/components/WorkspaceTabNewView';
+import WorkspaceTabNewTrigger from '@/components/WorkspaceTabNewTrigger';
+import WorkspaceTabNewRoutine from '@/components/WorkspaceTabNewRoutine';
+import WorkspaceTabNewFunction from '@/components/WorkspaceTabNewFunction';
+import WorkspaceTabNewScheduler from '@/components/WorkspaceTabNewScheduler';
+import WorkspaceTabNewTriggerFunction from '@/components/WorkspaceTabNewTriggerFunction';
+
+import WorkspaceTabPropsTable from '@/components/WorkspaceTabPropsTable';
+import WorkspaceTabPropsView from '@/components/WorkspaceTabPropsView';
+import WorkspaceTabPropsTrigger from '@/components/WorkspaceTabPropsTrigger';
+import WorkspaceTabPropsTriggerFunction from '@/components/WorkspaceTabPropsTriggerFunction';
+import WorkspaceTabPropsRoutine from '@/components/WorkspaceTabPropsRoutine';
+import WorkspaceTabPropsFunction from '@/components/WorkspaceTabPropsFunction';
+import WorkspaceTabPropsScheduler from '@/components/WorkspaceTabPropsScheduler';
 import ModalProcessesList from '@/components/ModalProcessesList';
+import ModalDiscardChanges from '@/components/ModalDiscardChanges';

 export default {
   name: 'Workspace',
   components: {
+      Draggable,
+      WorkspaceEmptyState,
      WorkspaceExploreBar,
      WorkspaceEditConnectionPanel,
-      WorkspaceQueryTab,
-      WorkspaceTableTab,
-      WorkspacePropsTab,
-      WorkspacePropsTabView,
-      WorkspacePropsTabTrigger,
-      WorkspacePropsTabRoutine,
-      WorkspacePropsTabFunction,
-      WorkspacePropsTabTriggerFunction,
-      WorkspacePropsTabScheduler,
-      ModalProcessesList
+      WorkspaceTabQuery,
+      WorkspaceTabTable,
+      WorkspaceTabNewTable,
+      WorkspaceTabPropsTable,
+      WorkspaceTabNewView,
+      WorkspaceTabPropsView,
+      WorkspaceTabNewTrigger,
+      WorkspaceTabPropsTrigger,
+      WorkspaceTabNewTriggerFunction,
+      WorkspaceTabPropsTriggerFunction,
+      WorkspaceTabNewRoutine,
+      WorkspaceTabNewFunction,
+      WorkspaceTabPropsRoutine,
+      WorkspaceTabPropsFunction,
+      WorkspaceTabNewScheduler,
+      WorkspaceTabPropsScheduler,
+      ModalProcessesList,
+      ModalDiscardChanges
+   },
+   filters: {
+      cutText (string) {
+         const limit = 20;
+         const escapedString = string.replace(/\s{2,}/g, ' ');
+         if (escapedString.length > limit)
+            return `${escapedString.substr(0, limit)}...`;
+         return escapedString;
+      }
   },
   props: {
      connection: Object
@@ -203,7 +524,8 @@ export default {
   data () {
      return {
         hasWheelEvent: false,
-         isProcessesModal: false
+         isProcessesModal: false,
+         unsavedTab: null
      };
   },
   computed: {
@@ -214,6 +536,14 @@ export default {
      workspace () {
         return this.getWorkspace(this.connection.uid);
      },
+      draggableTabs: {
+         get () {
+            return this.workspace.tabs;
+         },
+         set (val) {
+            this.updateTabs({ uid: this.connection.uid, tabs: val });
+         }
+      },
      isSelected () {
         return this.selectedWorkspace === this.connection.uid;
      },
@@ -228,29 +558,7 @@ export default {
         return false;
      },
      selectedTab () {
-         if (
-            (
-               this.workspace.breadcrumbs.table === null &&
-               this.workspace.breadcrumbs.view === null &&
-               this.workspace.breadcrumbs.trigger === null &&
-               this.workspace.breadcrumbs.procedure === null &&
-               this.workspace.breadcrumbs.function === null &&
-               this.workspace.breadcrumbs.triggerFunction === null &&
-               this.workspace.breadcrumbs.scheduler === null &&
-               ['data', 'prop'].includes(this.workspace.selected_tab)
-            ) ||
-            (
-               this.workspace.breadcrumbs.table === null &&
-               this.workspace.breadcrumbs.view === null &&
-               this.workspace.selected_tab === 'data'
-            )
-         )
-            return this.queryTabs[0].uid;
-
-         return this.queryTabs.find(tab => tab.uid === this.workspace.selected_tab) ||
-         ['data', 'prop'].includes(this.workspace.selected_tab)
-            ? this.workspace.selected_tab
-            : this.queryTabs[0].uid;
+         return this.workspace ? this.workspace.selectedTab : null;
      },
      queryTabs () {
         return this.workspace.tabs.filter(tab => tab.type === 'query');
@@ -263,20 +571,26 @@ export default {
         return false;
      }
   },
+   watch: {
+      selectedTab (newVal, oldVal) {
+         if (newVal !== oldVal) {
+            setTimeout(() => {
+               const element = this.$refs['tab-selected'] ? this.$refs['tab-selected'][0] : null;
+               if (element) {
+                  element.setAttribute('tabindex', '-1');
+                  element.focus();
+                  element.removeAttribute('tabindex');
+               }
+            }, 50);
+         }
+      }
+   },
   async created () {
      await this.addWorkspace(this.connection.uid);
      const isInitiated = await Connection.checkConnection(this.connection.uid);
      if (isInitiated)
         this.connectWorkspace(this.connection);
   },
-   mounted () {
-      if (this.$refs.tabWrap) {
-         this.$refs.tabWrap.addEventListener('wheel', e => {
-            if (e.deltaY > 0) this.$refs.tabWrap.scrollLeft += 50;
-            else this.$refs.tabWrap.scrollLeft -= 50;
-         });
-      }
-   },
   methods: {
      ...mapActions({
         addWorkspace: 'workspaces/addWorkspace',
@@ -284,28 +598,55 @@ export default {
         removeConnected: 'workspaces/removeConnected',
         selectTab: 'workspaces/selectTab',
         newTab: 'workspaces/newTab',
-         removeTab: 'workspaces/removeTab'
+         removeTab: 'workspaces/removeTab',
+         updateTabs: 'workspaces/updateTabs'
      }),
-      addTab () {
-         this.newTab({ uid: this.connection.uid });
-
-         if (!this.hasWheelEvent) {
-            this.$refs.tabWrap.addEventListener('wheel', e => {
-               if (e.deltaY > 0) this.$refs.tabWrap.scrollLeft += 50;
-               else this.$refs.tabWrap.scrollLeft -= 50;
-            });
-            this.hasWheelEvent = true;
-         }
+      addQueryTab () {
+         this.newTab({ uid: this.connection.uid, type: 'query' });
      },
-      closeTab (tUid) {
-         if (this.queryTabs.length === 1) return;
-         this.removeTab({ uid: this.connection.uid, tab: tUid });
+      openAsPermanentTab (tab) {
+         const permanentTabs = {
+            table: 'data',
+            view: 'data',
+            trigger: 'trigger-props',
+            triggerFunction: 'trigger-function-props',
+            function: 'function-props',
+            routine: 'routine-props',
+            scheduler: 'scheduler-props'
+         };
+
+         this.newTab({
+            uid: this.connection.uid,
+            schema: tab.schema,
+            elementName: tab.elementName,
+            type: permanentTabs[tab.elementType],
+            elementType: tab.elementType
+         });
+      },
+      closeTab (tab, force) {
+         this.unsavedTab = null;
+         // if (tab.type === 'query' && this.queryTabs.length === 1) return;
+         if (!force && tab.isChanged) {
+            this.unsavedTab = tab;
+            return;
+         }
+
+         this.removeTab({ uid: this.connection.uid, tab: tab.uid });
      },
      showProcessesModal () {
         this.isProcessesModal = true;
      },
      hideProcessesModal () {
         this.isProcessesModal = false;
+      },
+      addWheelEvent () {
+         if (!this.hasWheelEvent) {
+            this.$refs.tabWrap.$el.addEventListener('wheel', e => {
+               if (e.deltaY > 0) this.$refs.tabWrap.$el.scrollLeft += 50;
+               else this.$refs.tabWrap.$el.scrollLeft -= 50;
+            });
+            this.hasWheelEvent = true;
+         }
      }
   }
 };
@@ -334,20 +675,35 @@ export default {
      }

      .tab-item {
-        max-width: 12rem;
        width: fit-content;
        flex: initial;

        > a {
-          padding: 0.2rem 0.8rem;
+          padding: 0.2rem 0.6rem;
          cursor: pointer;
          display: flex;
          align-items: center;
          opacity: 0.7;
          transition: opacity 0.2s;

+          &.badge::after {
+            position: absolute;
+            right: 35px;
+            top: 25px;
+          }
+
+          .btn-clear {
+            margin-left: 0.5rem;
+            opacity: 0;
+            transition: opacity 0.2s;
+          }
+
          &:hover {
            opacity: 1;
+
+            .btn-clear {
+              opacity: 1;
+            }
          }

          &.tab-add {
@@ -366,9 +722,15 @@ export default {

        &.active a {
          opacity: 1;
+
+          .btn-clear {
+            opacity: 1;
+          }
        }

        &.tools-dropdown {
+          height: 34px;
+
          .tab-link:focus {
            opacity: 1;
            outline: 0;
@@ -423,7 +785,7 @@ export default {
      .th {
        position: sticky;
        top: 0;
-        border: 1px solid;
+        border: 2px solid;
        border-left: none;
        border-bottom-width: 2px;
        padding: 0;
@@ -432,15 +794,15 @@ export default {
        z-index: 1;

        > div {
-          padding: 0.1rem 0.4rem;
+          padding: 0.1rem 0.2rem;
          min-width: -webkit-fill-available;
        }
      }

      .td {
-        border-right: 1px solid;
-        border-bottom: 1px solid;
-        padding: 0 0.4rem;
+        border-right: 2px solid;
+        border-bottom: 2px solid;
+        padding: 0 0.2rem;
        text-overflow: ellipsis;
        max-width: 200px;
        white-space: nowrap;
--- a/src/renderer/components/WorkspaceAddConnectionPanel.vue
+++ b/src/renderer/components/WorkspaceAddConnectionPanel.vue
@@ -393,6 +393,13 @@ export default {
         return this.isConnecting || this.isTesting;
      }
   },
+   watch: {
+      'connection.client' () {
+         this.connection.user = this.customizations.defaultUser;
+         this.connection.port = this.customizations.defaultPort;
+         this.connection.database = this.customizations.defaultDatabase;
+      }
+   },
   created () {
      this.setDefaults();

--- a/src/renderer/components/WorkspaceEmptyState.vue
+++ b/src/renderer/components/WorkspaceEmptyState.vue
@@ -0,0 +1,55 @@
+<template>
+   <div class="column col-12 empty">
+      <div class="empty-icon">
+         <img :src="require(`@/images/logo-${applicationTheme}.svg`).default" width="200">
+      </div>
+      <p class="h6 empty-subtitle">
+         {{ $t('message.noOpenTabs') }}
+      </p>
+      <div class="empty-action">
+         <button class="btn btn-gray d-flex" @click="$emit('new-tab')">
+            <i class="mdi mdi-24px mdi-tab-plus mr-2" />
+            {{ $t('message.openNewTab') }}
+         </button>
+      </div>
+   </div>
+</template>
+
+<script>
+import { mapGetters, mapActions } from 'vuex';
+export default {
+   name: 'WorkspaceEmptyState',
+   computed: {
+      ...mapGetters({
+         applicationTheme: 'settings/getApplicationTheme',
+         getWorkspace: 'workspaces/getWorkspace',
+         selectedWorkspace: 'workspaces/getSelected'
+      }),
+      workspace () {
+         return this.getWorkspace(this.selectedWorkspace);
+      }
+   },
+   created () {
+      this.changeBreadcrumbs({ schema: this.workspace.breadcrumbs.schema });
+   },
+   methods: {
+      ...mapActions({
+         changeBreadcrumbs: 'workspaces/changeBreadcrumbs'
+      })
+   }
+};
+</script>
+
+<style scoped>
+  .empty {
+    height: 100%;
+    border-radius: 0;
+    background: transparent;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    margin-left: auto;
+    margin-right: auto;
+  }
+</style>
--- a/src/renderer/components/WorkspaceExploreBar.vue
+++ b/src/renderer/components/WorkspaceExploreBar.vue
@@ -5,10 +5,13 @@
         ref="explorebar"
         class="workspace-explorebar column"
         :style="{width: localWidth ? localWidth+'px' : ''}"
+         tabindex="0"
+         @keypress="explorebarSearch"
+         @keydown="explorebarSearch"
      >
         <div class="workspace-explorebar-header">
            <span class="workspace-explorebar-title">{{ connectionName }}</span>
-            <span v-if="workspace.connection_status === 'connected'" class="workspace-explorebar-tools">
+            <span v-if="workspace.connectionStatus === 'connected'" class="workspace-explorebar-tools">
               <i
                  class="mdi mdi-18px mdi-database-plus c-hand mr-2"
                  :title="$t('message.createNewSchema')"
@@ -21,24 +24,30 @@
                  @click="refresh"
               />
               <i
-                  class="mdi mdi-18px mdi-power-plug-off c-hand"
+                  class="mdi mdi-18px mdi-power c-hand"
                  :title="$t('word.disconnect')"
                  @click="disconnectWorkspace(connection.uid)"
               />
            </span>
         </div>
         <div class="workspace-explorebar-search">
-            <div v-if="workspace.connection_status === 'connected'" class="has-icon-right">
+            <div v-if="workspace.connectionStatus === 'connected'" class="has-icon-right">
               <input
+                  ref="searchInput"
                  v-model="searchTerm"
                  class="form-input input-sm"
                  type="text"
                  :placeholder="$t('message.searchForElements')"
               >
-               <i class="form-icon mdi mdi-magnify mdi-18px" />
+               <i v-if="!searchTerm" class="form-icon mdi mdi-magnify mdi-18px" />
+               <i
+                  v-else
+                  class="form-icon c-hand mdi mdi-backspace mdi-18px pr-1"
+                  @click="searchTerm = ''"
+               />
            </div>
         </div>
-         <div class="workspace-explorebar-body">
+         <div class="workspace-explorebar-body" @click="$refs.explorebar.focus()">
            <WorkspaceExploreBarSchema
               v-for="db of workspace.structure"
               :key="db.name"
@@ -56,72 +65,34 @@
         @close="hideNewDBModal"
         @reload="refresh"
      />
-      <ModalNewTable
-         v-if="isNewTableModal"
-         :workspace="workspace"
-         @close="hideCreateTableModal"
-         @open-create-table-editor="openCreateTableEditor"
-      />
-      <ModalNewView
-         v-if="isNewViewModal"
-         :workspace="workspace"
-         @close="hideCreateViewModal"
-         @open-create-view-editor="openCreateViewEditor"
-      />
-      <ModalNewTrigger
-         v-if="isNewTriggerModal"
-         :workspace="workspace"
-         @close="hideCreateTriggerModal"
-         @open-create-trigger-editor="openCreateTriggerEditor"
-      />
-      <ModalNewRoutine
-         v-if="isNewRoutineModal"
-         :workspace="workspace"
-         @close="hideCreateRoutineModal"
-         @open-create-routine-editor="openCreateRoutineEditor"
-      />
-      <ModalNewFunction
-         v-if="isNewFunctionModal"
-         :workspace="workspace"
-         @close="hideCreateFunctionModal"
-         @open-create-function-editor="openCreateFunctionEditor"
-      />
-      <ModalNewTriggerFunction
-         v-if="isNewTriggerFunctionModal"
-         :workspace="workspace"
-         @close="hideCreateTriggerFunctionModal"
-         @open-create-function-editor="openCreateTriggerFunctionEditor"
-      />
-      <ModalNewScheduler
-         v-if="isNewSchedulerModal"
-         :workspace="workspace"
-         @close="hideCreateSchedulerModal"
-         @open-create-scheduler-editor="openCreateSchedulerEditor"
-      />
      <DatabaseContext
         v-if="isDatabaseContext"
-         :selected-database="selectedDatabase"
+         :selected-schema="selectedSchema"
         :context-event="databaseContextEvent"
         @close-context="closeDatabaseContext"
-         @show-create-table-modal="showCreateTableModal"
-         @show-create-view-modal="showCreateViewModal"
-         @show-create-trigger-modal="showCreateTriggerModal"
-         @show-create-routine-modal="showCreateRoutineModal"
-         @show-create-function-modal="showCreateFunctionModal"
-         @show-create-trigger-function-modal="showCreateTriggerFunctionModal"
-         @show-create-scheduler-modal="showCreateSchedulerModal"
+         @open-create-table-tab="openCreateElementTab('table')"
+         @open-create-view-tab="openCreateElementTab('view')"
+         @open-create-trigger-tab="openCreateElementTab('trigger')"
+         @open-create-routine-tab="openCreateElementTab('routine')"
+         @open-create-function-tab="openCreateElementTab('function')"
+         @open-create-trigger-function-tab="openCreateElementTab('trigger-function')"
+         @open-create-scheduler-tab="openCreateElementTab('scheduler')"
         @reload="refresh"
      />
      <TableContext
         v-if="isTableContext"
+         :selected-schema="selectedSchema"
         :selected-table="selectedTable"
         :context-event="tableContextEvent"
+         @delete-table="deleteTable"
+         @duplicate-table="duplicateTable"
         @close-context="closeTableContext"
         @reload="refresh"
      />
      <MiscContext
         v-if="isMiscContext"
         :selected-misc="selectedMisc"
+         :selected-schema="selectedSchema"
         :context-event="miscContextEvent"
         @close-context="closeMiscContext"
         @reload="refresh"
@@ -129,12 +100,13 @@
      <MiscFolderContext
         v-if="isMiscFolderContext"
         :selected-misc="selectedMisc"
+         :selected-schema="selectedSchema"
         :context-event="miscContextEvent"
-         @show-create-trigger-modal="showCreateTriggerModal"
-         @show-create-routine-modal="showCreateRoutineModal"
-         @show-create-function-modal="showCreateFunctionModal"
-         @show-create-trigger-function-modal="showCreateTriggerFunctionModal"
-         @show-create-scheduler-modal="showCreateSchedulerModal"
+         @open-create-trigger-tab="openCreateElementTab('trigger')"
+         @open-create-routine-tab="openCreateElementTab('routine')"
+         @open-create-function-tab="openCreateElementTab('function')"
+         @open-create-trigger-function-tab="openCreateElementTab('trigger-function')"
+         @open-create-scheduler-tab="openCreateElementTab('scheduler')"
         @close-context="closeMiscFolderContext"
         @reload="refresh"
      />
@@ -146,8 +118,6 @@ import { mapGetters, mapActions } from 'vuex';

 import Tables from '@/ipc-api/Tables';
 import Views from '@/ipc-api/Views';
-import Triggers from '@/ipc-api/Triggers';
-import Routines from '@/ipc-api/Routines';
 import Functions from '@/ipc-api/Functions';
 import Schedulers from '@/ipc-api/Schedulers';

@@ -157,13 +127,6 @@ import TableContext from '@/components/WorkspaceExploreBarTableContext';
 import MiscContext from '@/components/WorkspaceExploreBarMiscContext';
 import MiscFolderContext from '@/components/WorkspaceExploreBarMiscFolderContext';
 import ModalNewSchema from '@/components/ModalNewSchema';
-import ModalNewTable from '@/components/ModalNewTable';
-import ModalNewView from '@/components/ModalNewView';
-import ModalNewTrigger from '@/components/ModalNewTrigger';
-import ModalNewRoutine from '@/components/ModalNewRoutine';
-import ModalNewFunction from '@/components/ModalNewFunction';
-import ModalNewTriggerFunction from '@/components/ModalNewTriggerFunction';
-import ModalNewScheduler from '@/components/ModalNewScheduler';

 export default {
   name: 'WorkspaceExploreBar',
@@ -173,14 +136,7 @@ export default {
      TableContext,
      MiscContext,
      MiscFolderContext,
-      ModalNewSchema,
-      ModalNewTable,
-      ModalNewView,
-      ModalNewTrigger,
-      ModalNewRoutine,
-      ModalNewFunction,
-      ModalNewTriggerFunction,
-      ModalNewScheduler
+      ModalNewSchema
   },
   props: {
      connection: Object,
@@ -191,7 +147,6 @@ export default {
         isRefreshing: false,

         isNewDBModal: false,
-         isNewTableModal: false,
         isNewViewModal: false,
         isNewTriggerModal: false,
         isNewRoutineModal: false,
@@ -211,7 +166,7 @@ export default {
         tableContextEvent: null,
         miscContextEvent: null,

-         selectedDatabase: '',
+         selectedSchema: '',
         selectedTable: null,
         selectedMisc: null,
         searchTerm: ''
@@ -271,9 +226,13 @@ export default {
         refreshStructure: 'workspaces/refreshStructure',
         changeBreadcrumbs: 'workspaces/changeBreadcrumbs',
         selectTab: 'workspaces/selectTab',
+         newTab: 'workspaces/newTab',
+         removeTabs: 'workspaces/removeTabs',
         setSearchTerm: 'workspaces/setSearchTerm',
         addNotification: 'notifications/addNotification',
-         changeExplorebarSize: 'settings/changeExplorebarSize'
+         changeExplorebarSize: 'settings/changeExplorebarSize',
+         addLoadingElement: 'workspaces/addLoadingElement',
+         removeLoadingElement: 'workspaces/removeLoadingElement'
      }),
      async refresh () {
         if (!this.isRefreshing) {
@@ -282,6 +241,19 @@ export default {
            this.isRefreshing = false;
         }
      },
+      explorebarSearch (e) {
+         if (e.code === 'Backspace') {
+            e.preventDefault();
+            if (this.searchTerm.length)
+               this.searchTerm = this.searchTerm.slice(0, -1);
+            else
+               return;
+         }
+         else if (e.key.length > 1)// Prevent non-alphanumerics
+            return;
+
+         this.$refs.searchInput.focus();
+      },
      resize (e) {
         const el = this.$refs.explorebar;
         let explorebarWidth = e.pageX - el.getBoundingClientRect().left;
@@ -298,31 +270,20 @@ export default {
      hideNewDBModal () {
         this.isNewDBModal = false;
      },
-      showCreateTableModal () {
+      openCreateElementTab (element) {
         this.closeDatabaseContext();
-         this.isNewTableModal = true;
-      },
-      hideCreateTableModal () {
-         this.isNewTableModal = false;
-      },
-      async openCreateTableEditor (payload) {
-         const params = {
-            uid: this.connection.uid,
-            ...payload
-         };
+         this.closeMiscFolderContext();

-         const { status, response } = await Tables.createTable(params);
-
-         if (status === 'success') {
-            await this.refresh();
-            this.changeBreadcrumbs({ schema: this.selectedDatabase, table: payload.name });
-            this.selectTab({ uid: this.workspace.uid, tab: 'prop' });
-         }
-         else
-            this.addNotification({ status: 'error', message: response });
+         this.newTab({
+            uid: this.workspace.uid,
+            schema: this.selectedSchema,
+            elementName: '',
+            elementType: element,
+            type: `new-${element}`
+         });
      },
      openSchemaContext (payload) {
-         this.selectedDatabase = payload.schema;
+         this.selectedSchema = payload.schema;
         this.databaseContextEvent = payload.event;
         this.isDatabaseContext = true;
      },
@@ -331,6 +292,7 @@ export default {
      },
      openTableContext (payload) {
         this.selectedTable = payload.table;
+         this.selectedSchema = payload.schema;
         this.tableContextEvent = payload.event;
         this.isTableContext = true;
      },
@@ -339,11 +301,13 @@ export default {
      },
      openMiscContext (payload) {
         this.selectedMisc = payload.misc;
+         this.selectedSchema = payload.schema;
         this.miscContextEvent = payload.event;
         this.isMiscContext = true;
      },
      openMiscFolderContext (payload) {
         this.selectedMisc = payload.type;
+         this.selectedSchema = payload.schema;
         this.miscContextEvent = payload.event;
         this.isMiscFolderContext = true;
      },
@@ -353,30 +317,6 @@ export default {
      closeMiscFolderContext () {
         this.isMiscFolderContext = false;
      },
-      showCreateViewModal () {
-         this.closeDatabaseContext();
-         this.closeMiscFolderContext();
-         this.isNewViewModal = true;
-      },
-      hideCreateViewModal () {
-         this.isNewViewModal = false;
-      },
-      async openCreateViewEditor (payload) {
-         const params = {
-            uid: this.connection.uid,
-            ...payload
-         };
-
-         const { status, response } = await Views.createView(params);
-
-         if (status === 'success') {
-            await this.refresh();
-            this.changeBreadcrumbs({ schema: this.selectedDatabase, view: payload.name });
-            this.selectTab({ uid: this.workspace.uid, tab: 'prop' });
-         }
-         else
-            this.addNotification({ status: 'error', message: response });
-      },
      showCreateTriggerModal () {
         this.closeDatabaseContext();
         this.closeMiscFolderContext();
@@ -385,23 +325,6 @@ export default {
      hideCreateTriggerModal () {
         this.isNewTriggerModal = false;
      },
-      async openCreateTriggerEditor (payload) {
-         const params = {
-            uid: this.connection.uid,
-            ...payload
-         };
-
-         const { status, response } = await Triggers.createTrigger(params);
-
-         if (status === 'success') {
-            await this.refresh();
-            const triggerName = this.customizations.triggerTableInName ? `${payload.table}.${payload.name}` : payload.name;
-            this.changeBreadcrumbs({ schema: this.selectedDatabase, trigger: triggerName });
-            this.selectTab({ uid: this.workspace.uid, tab: 'prop' });
-         }
-         else
-            this.addNotification({ status: 'error', message: response });
-      },
      showCreateRoutineModal () {
         this.closeDatabaseContext();
         this.closeMiscFolderContext();
@@ -410,22 +333,6 @@ export default {
      hideCreateRoutineModal () {
         this.isNewRoutineModal = false;
      },
-      async openCreateRoutineEditor (payload) {
-         const params = {
-            uid: this.connection.uid,
-            ...payload
-         };
-
-         const { status, response } = await Routines.createRoutine(params);
-
-         if (status === 'success') {
-            await this.refresh();
-            this.changeBreadcrumbs({ schema: this.selectedDatabase, procedure: payload.name });
-            this.selectTab({ uid: this.workspace.uid, tab: 'prop' });
-         }
-         else
-            this.addNotification({ status: 'error', message: response });
-      },
      showCreateFunctionModal () {
         this.closeDatabaseContext();
         this.closeMiscFolderContext();
@@ -450,9 +357,93 @@ export default {
      hideCreateSchedulerModal () {
         this.isNewSchedulerModal = false;
      },
+      async deleteTable (payload) {
+         this.closeTableContext();
+
+         this.addLoadingElement({
+            name: payload.table.name,
+            schema: payload.schema,
+            type: 'table'
+         });
+
+         try {
+            let res;
+
+            if (payload.table.type === 'table') {
+               res = await Tables.dropTable({
+                  uid: this.connection.uid,
+                  table: payload.table.name,
+                  schema: payload.schema
+               });
+            }
+            else if (payload.table.type === 'view') {
+               res = await Views.dropView({
+                  uid: this.connection.uid,
+                  view: payload.table.name,
+                  schema: payload.schema
+               });
+            }
+
+            const { status, response } = res;
+
+            if (status === 'success') {
+               this.refresh();
+
+               this.removeTabs({
+                  uid: this.connection.uid,
+                  elementName: payload.table.name,
+                  elementType: payload.table.type,
+                  schema: payload.schema
+               });
+            }
+            else
+               this.addNotification({ status: 'error', message: response });
+         }
+         catch (err) {
+            this.addNotification({ status: 'error', message: err.stack });
+         }
+
+         this.removeLoadingElement({
+            name: payload.table.name,
+            schema: payload.schema,
+            type: 'table'
+         });
+      },
+      async duplicateTable (payload) {
+         this.closeTableContext();
+
+         this.addLoadingElement({
+            name: payload.table.name,
+            schema: payload.schema,
+            type: 'table'
+         });
+
+         try {
+            const { status, response } = await Tables.duplicateTable({
+               uid: this.connection.uid,
+               table: payload.table.name,
+               schema: payload.schema
+            });
+
+            if (status === 'success')
+               this.refresh();
+            else
+               this.addNotification({ status: 'error', message: response });
+         }
+         catch (err) {
+            this.addNotification({ status: 'error', message: err.stack });
+         }
+
+         this.removeLoadingElement({
+            name: payload.table.name,
+            schema: payload.schema,
+            type: 'table'
+         });
+      },
      async openCreateFunctionEditor (payload) {
         const params = {
            uid: this.connection.uid,
+            schema: this.selectedSchema,
            ...payload
         };

@@ -460,8 +451,15 @@ export default {

         if (status === 'success') {
            await this.refresh();
-            this.changeBreadcrumbs({ schema: this.selectedDatabase, function: payload.name });
-            this.selectTab({ uid: this.workspace.uid, tab: 'prop' });
+            this.changeBreadcrumbs({ schema: this.selectedSchema, function: payload.name });
+
+            this.newTab({
+               uid: this.workspace.uid,
+               schema: this.selectedSchema,
+               elementName: payload.name,
+               elementType: 'function',
+               type: 'function-props'
+            });
         }
         else
            this.addNotification({ status: 'error', message: response });
@@ -469,6 +467,7 @@ export default {
      async openCreateTriggerFunctionEditor (payload) {
         const params = {
            uid: this.connection.uid,
+            schema: this.selectedSchema,
            ...payload
         };

@@ -476,8 +475,15 @@ export default {

         if (status === 'success') {
            await this.refresh();
-            this.changeBreadcrumbs({ schema: this.selectedDatabase, triggerFunction: payload.name });
-            this.selectTab({ uid: this.workspace.uid, tab: 'prop' });
+            this.changeBreadcrumbs({ schema: this.selectedSchema, triggerFunction: payload.name });
+
+            this.newTab({
+               uid: this.workspace.uid,
+               schema: this.selectedSchema,
+               elementName: payload.name,
+               elementType: 'triggerFunction',
+               type: 'trigger-function-props'
+            });
         }
         else
            this.addNotification({ status: 'error', message: response });
@@ -485,6 +491,7 @@ export default {
      async openCreateSchedulerEditor (payload) {
         const params = {
            uid: this.connection.uid,
+            schema: this.selectedSchema,
            ...payload
         };

@@ -492,8 +499,15 @@ export default {

         if (status === 'success') {
            await this.refresh();
-            this.changeBreadcrumbs({ schema: this.selectedDatabase, scheduler: payload.name });
-            this.selectTab({ uid: this.workspace.uid, tab: 'prop' });
+            this.changeBreadcrumbs({ schema: this.selectedSchema, scheduler: payload.name });
+
+            this.newTab({
+               uid: this.workspace.uid,
+               schema: this.selectedSchema,
+               elementName: payload.name,
+               elementType: 'scheduler',
+               type: 'scheduler-props'
+            });
         }
         else
            this.addNotification({ status: 'error', message: response });
@@ -530,6 +544,10 @@ export default {
    position: relative;
    padding: 0;

+    &:focus {
+      outline: none;
+    }
+
    .workspace-explorebar-header {
      width: 100%;
      padding: 0.3rem;
--- a/src/renderer/components/WorkspaceExploreBarMiscContext.vue
+++ b/src/renderer/components/WorkspaceExploreBarMiscContext.vue
@@ -59,7 +59,8 @@ export default {
   },
   props: {
      contextEvent: MouseEvent,
-      selectedMisc: Object
+      selectedMisc: Object,
+      selectedSchema: String
   },
   data () {
      return {
@@ -97,11 +98,9 @@ export default {
      ...mapActions({
         addNotification: 'notifications/addNotification',
         changeBreadcrumbs: 'workspaces/changeBreadcrumbs',
+         removeTabs: 'workspaces/removeTabs',
         newTab: 'workspaces/newTab'
      }),
-      showCreateTableModal () {
-         this.$emit('show-create-table-modal');
-      },
      showDeleteModal () {
         this.isDeleteModal = true;
      },
@@ -126,12 +125,14 @@ export default {
               case 'trigger':
                  res = await Triggers.dropTrigger({
                     uid: this.selectedWorkspace,
+                     schema: this.selectedSchema,
                     trigger: this.selectedMisc.name
                  });
                  break;
               case 'procedure':
                  res = await Routines.dropRoutine({
                     uid: this.selectedWorkspace,
+                     schema: this.selectedSchema,
                     routine: this.selectedMisc.name
                  });
                  break;
@@ -139,12 +140,14 @@ export default {
               case 'triggerFunction':
                  res = await Functions.dropFunction({
                     uid: this.selectedWorkspace,
+                     schema: this.selectedSchema,
                     func: this.selectedMisc.name
                  });
                  break;
               case 'scheduler':
                  res = await Schedulers.dropScheduler({
                     uid: this.selectedWorkspace,
+                     schema: this.selectedSchema,
                     scheduler: this.selectedMisc.name
                  });
                  break;
@@ -153,7 +156,12 @@ export default {
            const { status, response } = res;

            if (status === 'success') {
-               this.changeBreadcrumbs({ [this.selectedMisc.type]: null });
+               this.removeTabs({
+                  uid: this.selectedWorkspace,
+                  elementName: this.selectedMisc.name,
+                  elementType: this.selectedMisc.type,
+                  schema: this.selectedSchema
+               });

               this.closeContext();
               this.$emit('reload');
@@ -180,8 +188,8 @@ export default {
      async runRoutineCheck () {
         const params = {
            uid: this.selectedWorkspace,
-            schema: this.workspace.breadcrumbs.schema,
-            routine: this.workspace.breadcrumbs.procedure
+            schema: this.selectedSchema,
+            routine: this.selectedMisc.name
         };

         try {
@@ -218,14 +226,14 @@ export default {
               sql = `CALL \`${this.localElement.name}\`(${params.join(',')})`;
         }

-         this.newTab({ uid: this.workspace.uid, content: sql, autorun: true });
+         this.newTab({ uid: this.workspace.uid, content: sql, type: 'query', autorun: true });
         this.closeContext();
      },
      async runFunctionCheck () {
         const params = {
            uid: this.selectedWorkspace,
-            schema: this.workspace.breadcrumbs.schema,
-            func: this.workspace.breadcrumbs.function
+            schema: this.selectedSchema,
+            func: this.selectedMisc.name
         };

         try {
@@ -263,7 +271,7 @@ export default {
               sql = `SELECT \`${this.localElement.name}\` (${params.join(',')})`;
         }

-         this.newTab({ uid: this.workspace.uid, content: sql, autorun: true });
+         this.newTab({ uid: this.workspace.uid, content: sql, type: 'query', autorun: true });
         this.closeContext();
      }
   }
--- a/src/renderer/components/WorkspaceExploreBarMiscFolderContext.vue
+++ b/src/renderer/components/WorkspaceExploreBarMiscFolderContext.vue
@@ -6,35 +6,35 @@
      <div
         v-if="selectedMisc === 'trigger'"
         class="context-element"
-         @click="$emit('show-create-trigger-modal')"
+         @click="$emit('open-create-trigger-tab')"
      >
         <span class="d-flex"><i class="mdi mdi-18px mdi-table-cog text-light pr-1" /> {{ $t('message.createNewTrigger') }}</span>
      </div>
      <div
         v-if="selectedMisc === 'procedure'"
         class="context-element"
-         @click="$emit('show-create-routine-modal')"
+         @click="$emit('open-create-routine-tab')"
      >
         <span class="d-flex"><i class="mdi mdi-18px mdi-sync-circle text-light pr-1" /> {{ $t('message.createNewRoutine') }}</span>
      </div>
      <div
         v-if="selectedMisc === 'function'"
         class="context-element"
-         @click="$emit('show-create-function-modal')"
+         @click="$emit('open-create-function-tab')"
      >
         <span class="d-flex"><i class="mdi mdi-18px mdi-arrow-right-bold-box text-light pr-1" /> {{ $t('message.createNewFunction') }}</span>
      </div>
      <div
         v-if="selectedMisc === 'triggerFunction'"
         class="context-element"
-         @click="$emit('show-create-trigger-function-modal')"
+         @click="$emit('open-create-trigger-function-tab')"
      >
         <span class="d-flex"><i class="mdi mdi-18px mdi-cog-clockwise text-light pr-1" /> {{ $t('message.createNewFunction') }}</span>
      </div>
      <div
         v-if="selectedMisc === 'scheduler'"
         class="context-element"
-         @click="$emit('show-create-scheduler-modal')"
+         @click="$emit('open-create-scheduler-tab')"
      >
         <span class="d-flex"><i class="mdi mdi-18px mdi-calendar-clock text-light pr-1" /> {{ $t('message.createNewScheduler') }}</span>
      </div>
@@ -52,7 +52,8 @@ export default {
   },
   props: {
      contextEvent: MouseEvent,
-      selectedMisc: String
+      selectedMisc: String,
+      selectedSchema: String
   },
   data () {
      return {
@@ -73,9 +74,6 @@ export default {
         addNotification: 'notifications/addNotification',
         changeBreadcrumbs: 'workspaces/changeBreadcrumbs'
      }),
-      showCreateTableModal () {
-         this.$emit('show-create-table-modal');
-      },
      showDeleteModal () {
         this.isDeleteModal = true;
      },
--- a/src/renderer/components/WorkspaceExploreBarSchema.vue
+++ b/src/renderer/components/WorkspaceExploreBarSchema.vue
@@ -16,14 +16,21 @@
            <ul class="menu menu-nav pt-0">
               <li
                  v-for="table of filteredTables"
+                  :ref="breadcrumbs.schema === database.name && [breadcrumbs.table, breadcrumbs.view].includes(table.name) ? 'explorebar-selected' : ''"
                  :key="table.name"
                  class="menu-item"
-                  :class="{'text-bold': breadcrumbs.schema === database.name && [breadcrumbs.table, breadcrumbs.view].includes(table.name)}"
-                  @click="setBreadcrumbs({schema: database.name, [table.type]: table.name})"
+                  :class="{'selected': breadcrumbs.schema === database.name && [breadcrumbs.table, breadcrumbs.view].includes(table.name)}"
+                  @mousedown.left="selectTable({schema: database.name, table})"
+                  @dblclick="openDataTab({schema: database.name, table})"
                  @contextmenu.prevent="showTableContext($event, table)"
               >
                  <a class="table-name">
-                     <i class="table-icon mdi mdi-18px mr-1" :class="table.type === 'view' ? 'mdi-table-eye' : 'mdi-table'" />
+                     <div v-if="checkLoadingStatus(table.name, 'table')" class="icon loading mr-1" />
+                     <i
+                        v-else
+                        class="table-icon mdi mdi-18px mr-1"
+                        :class="table.type === 'view' ? 'mdi-table-eye' : 'mdi-table'"
+                     />
                     <span v-html="highlightWord(table.name)" />
                  </a>
                  <div
@@ -53,9 +60,11 @@
                        <li
                           v-for="trigger of filteredTriggers"
                           :key="trigger.name"
+                           :ref="breadcrumbs.schema === database.name && breadcrumbs.trigger === trigger.name ? 'explorebar-selected' : ''"
                           class="menu-item"
-                           :class="{'text-bold': breadcrumbs.schema === database.name && breadcrumbs.trigger === trigger.name}"
-                           @click="setBreadcrumbs({schema: database.name, trigger: trigger.name})"
+                           :class="{'selected': breadcrumbs.schema === database.name && breadcrumbs.trigger === trigger.name}"
+                           @mousedown.left="selectMisc({schema: database.name, misc: trigger, type: 'trigger'})"
+                           @dblclick="openMiscPermanentTab({schema: database.name, misc: trigger, type: 'trigger'})"
                           @contextmenu.prevent="showMiscContext($event, {...trigger, type: 'trigger'})"
                        >
                           <a class="table-name">
@@ -73,7 +82,7 @@
            <details class="accordion">
               <summary
                  class="accordion-header misc-name"
-                  :class="{'text-bold': breadcrumbs.schema === database.name && breadcrumbs.procedure}"
+                  :class="{'text-bold': breadcrumbs.schema === database.name && breadcrumbs.routine}"
                  @contextmenu.prevent="showMiscFolderContext($event, 'procedure')"
               >
                  <i class="misc-icon mdi mdi-18px mdi-folder-sync mr-1" />
@@ -85,9 +94,11 @@
                        <li
                           v-for="(procedure, i) of filteredProcedures"
                           :key="`${procedure.name}-${i}`"
+                           :ref="breadcrumbs.schema === database.name && breadcrumbs.routine === procedure.name ? 'explorebar-selected' : ''"
                           class="menu-item"
-                           :class="{'text-bold': breadcrumbs.schema === database.name && breadcrumbs.procedure === procedure.name}"
-                           @click="setBreadcrumbs({schema: database.name, procedure: procedure.name})"
+                           :class="{'selected': breadcrumbs.schema === database.name && breadcrumbs.routine === procedure.name}"
+                           @mousedown.left="selectMisc({schema: database.name, misc: procedure, type: 'routine'})"
+                           @dblclick="openMiscPermanentTab({schema: database.name, misc: procedure, type: 'routine'})"
                           @contextmenu.prevent="showMiscContext($event, {...procedure, type: 'procedure'})"
                        >
                           <a class="table-name">
@@ -117,9 +128,11 @@
                        <li
                           v-for="(func, i) of filteredTriggerFunctions"
                           :key="`${func.name}-${i}`"
+                           :ref="breadcrumbs.schema === database.name && breadcrumbs.triggerFunction === func.name ? 'explorebar-selected' : ''"
                           class="menu-item"
-                           :class="{'text-bold': breadcrumbs.schema === database.name && breadcrumbs.triggerFunction === func.name}"
-                           @click="setBreadcrumbs({schema: database.name, triggerFunction: func.name})"
+                           :class="{'selected': breadcrumbs.schema === database.name && breadcrumbs.triggerFunction === func.name}"
+                           @mousedown.left="selectMisc({schema: database.name, misc: func, type: 'triggerFunction'})"
+                           @dblclick="openMiscPermanentTab({schema: database.name, misc: func, type: 'triggerFunction'})"
                           @contextmenu.prevent="showMiscContext($event, {...func, type: 'triggerFunction'})"
                        >
                           <a class="table-name">
@@ -149,9 +162,11 @@
                        <li
                           v-for="(func, i) of filteredFunctions"
                           :key="`${func.name}-${i}`"
+                           :ref="breadcrumbs.schema === database.name && breadcrumbs.function === func.name ? 'explorebar-selected' : ''"
                           class="menu-item"
-                           :class="{'text-bold': breadcrumbs.schema === database.name && breadcrumbs.function === func.name}"
-                           @click="setBreadcrumbs({schema: database.name, function: func.name})"
+                           :class="{'selected': breadcrumbs.schema === database.name && breadcrumbs.function === func.name}"
+                           @mousedown.left="selectMisc({schema: database.name, misc: func, type: 'function'})"
+                           @dblclick="openMiscPermanentTab({schema: database.name, misc: func, type: 'function'})"
                           @contextmenu.prevent="showMiscContext($event, {...func, type: 'function'})"
                        >
                           <a class="table-name">
@@ -181,9 +196,11 @@
                        <li
                           v-for="scheduler of filteredSchedulers"
                           :key="scheduler.name"
+                           :ref="breadcrumbs.schema === database.name && breadcrumbs.scheduler === scheduler.name ? 'explorebar-selected' : ''"
                           class="menu-item"
-                           :class="{'text-bold': breadcrumbs.schema === database.name && breadcrumbs.scheduler === scheduler.name}"
-                           @click="setBreadcrumbs({schema: database.name, scheduler: scheduler.name})"
+                           :class="{'selected': breadcrumbs.schema === database.name && breadcrumbs.scheduler === scheduler.name}"
+                           @mousedown.left="selectMisc({schema: database.name, misc: scheduler, type: 'scheduler'})"
+                           @dblclick="openMiscPermanentTab({schema: database.name, misc: scheduler, type: 'scheduler'})"
                           @contextmenu.prevent="showMiscContext($event, {...scheduler, type: 'scheduler'})"
                        >
                           <a class="table-name">
@@ -245,11 +262,14 @@ export default {
      filteredSchedulers () {
         return this.database.schedulers.filter(scheduler => scheduler.name.search(this.searchTerm) >= 0);
      },
+      workspace () {
+         return this.getWorkspace(this.connection.uid);
+      },
      breadcrumbs () {
-         return this.getWorkspace(this.connection.uid).breadcrumbs;
+         return this.workspace.breadcrumbs;
      },
      customizations () {
-         return this.getWorkspace(this.connection.uid).customizations;
+         return this.workspace.customizations;
      },
      loadedSchemas () {
         return this.getLoadedSchemas(this.connection.uid);
@@ -264,9 +284,32 @@ export default {
         return this.database.tables.reduce((acc, curr) => acc + curr.size, 0);
      }
   },
+   watch: {
+      breadcrumbs (newVal, oldVal) {
+         if (JSON.stringify(newVal) !== JSON.stringify(oldVal)) {
+            setTimeout(() => {
+               const element = this.$refs['explorebar-selected'] ? this.$refs['explorebar-selected'][0] : null;
+               if (element) {
+                  const rect = element.getBoundingClientRect();
+                  const elemTop = rect.top;
+                  const elemBottom = rect.bottom;
+                  const isVisible = (elemTop >= 0) && (elemBottom <= window.innerHeight);
+
+                  if (!isVisible) {
+                     element.setAttribute('tabindex', '-1');
+                     element.focus();
+                     element.removeAttribute('tabindex');
+                  }
+               }
+            }, 50);
+         }
+      }
+   },
   methods: {
      ...mapActions({
         changeBreadcrumbs: 'workspaces/changeBreadcrumbs',
+         addLoadedSchema: 'workspaces/addLoadedSchema',
+         newTab: 'workspaces/newTab',
         refreshSchema: 'workspaces/refreshSchema'
      }),
      formatBytes,
@@ -274,27 +317,73 @@ export default {
         if (!this.loadedSchemas.has(schema) && !this.isLoading) {
            this.isLoading = true;
            await this.refreshSchema({ uid: this.connection.uid, schema });
+            this.addLoadedSchema(schema);
            this.isLoading = false;
         }
+      },
+      selectTable ({ schema, table }) {
+         this.newTab({
+            uid: this.connection.uid,
+            elementName: table.name,
+            schema: this.database.name,
+            type: 'temp-data',
+            elementType: table.type
+         });

-         this.changeBreadcrumbs({ schema, table: null });
+         this.setBreadcrumbs({ schema, [table.type]: table.name });
+      },
+      selectMisc ({ schema, misc, type }) {
+         const miscTempTabs = {
+            trigger: 'temp-trigger-props',
+            triggerFunction: 'temp-trigger-function-props',
+            function: 'temp-function-props',
+            routine: 'temp-routine-props',
+            scheduler: 'temp-scheduler-props'
+         };
+
+         this.newTab({
+            uid: this.connection.uid,
+            elementName: misc.name,
+            schema: this.database.name,
+            type: miscTempTabs[type],
+            elementType: type
+         });
+
+         this.setBreadcrumbs({ schema, [type]: misc.name });
+      },
+      openDataTab ({ schema, table }) {
+         this.newTab({ uid: this.connection.uid, elementName: table.name, schema: this.database.name, type: 'data', elementType: table.type });
+         this.setBreadcrumbs({ schema, [table.type]: table.name });
+      },
+      openMiscPermanentTab ({ schema, misc, type }) {
+         const miscTabs = {
+            trigger: 'trigger-props',
+            triggerFunction: 'trigger-function-props',
+            function: 'function-props',
+            routine: 'routine-props',
+            scheduler: 'scheduler-props'
+         };
+
+         this.newTab({
+            uid: this.connection.uid,
+            elementName: misc.name,
+            schema: this.database.name,
+            type: miscTabs[type],
+            elementType: type
+         });
+         this.setBreadcrumbs({ schema, [type]: misc.name });
      },
      showSchemaContext (event, schema) {
-         this.selectSchema(schema);
         this.$emit('show-schema-context', { event, schema });
      },
      showTableContext (event, table) {
-         this.setBreadcrumbs({ schema: this.database.name, [table.type]: table.name });
-         this.$emit('show-table-context', { event, table });
+         this.$emit('show-table-context', { event, schema: this.database.name, table });
      },
      showMiscContext (event, misc) {
-         this.setBreadcrumbs({ schema: this.database.name, [misc.type]: misc.name });
-         this.$emit('show-misc-context', { event, misc });
+         this.$emit('show-misc-context', { event, schema: this.database.name, misc });
      },
      showMiscFolderContext (event, type) {
-         this.selectSchema(this.database.name);
-         this.setBreadcrumbs({ schema: this.database.name, type });
-         this.$emit('show-misc-folder-context', { event, type });
+         this.$emit('show-misc-folder-context', { event, schema: this.database.name, type });
      },
      piePercentage (val) {
         const perc = val / this.maxSize * 100;
@@ -308,12 +397,20 @@ export default {
         this.changeBreadcrumbs(payload);
      },
      highlightWord (string) {
+         string = string.replaceAll('<', '&lt;').replaceAll('>', '&gt;');
+
         if (this.searchTerm) {
            const regexp = new RegExp(`(${this.searchTerm.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')})`, 'gi');
            return string.replace(regexp, '<span class="text-primary">$1</span>');
         }
         else
            return string;
+      },
+      checkLoadingStatus (name, type) {
+         return this.workspace.loadingElements.some(el =>
+            el.name === name &&
+            el.type === type &&
+            el.schema === this.database.name);
      }
   }
 };
@@ -321,6 +418,10 @@ export default {

 <style lang="scss">
 .workspace-explorebar-database {
+  .selected {
+    font-weight: 700;
+  }
+
  .database-name {
    position: sticky;
    top: 0;
@@ -377,7 +478,8 @@ export default {
    line-height: 1.2;
    position: relative;

-    &:hover {
+    &:hover,
+    &.selected {
      border-radius: $border-radius;
    }
  }
--- a/src/renderer/components/WorkspaceExploreBarSchemaContext.vue
+++ b/src/renderer/components/WorkspaceExploreBarSchemaContext.vue
@@ -10,49 +10,49 @@
            <div
               v-if="workspace.customizations.tableAdd"
               class="context-element"
-               @click="showCreateTableModal"
+               @click="openCreateTableTab"
            >
               <span class="d-flex"><i class="mdi mdi-18px mdi-table text-light pr-1" /> {{ $t('word.table') }}</span>
            </div>
            <div
               v-if="workspace.customizations.viewAdd"
               class="context-element"
-               @click="showCreateViewModal"
+               @click="openCreateViewTab"
            >
               <span class="d-flex"><i class="mdi mdi-18px mdi-table-eye text-light pr-1" /> {{ $t('word.view') }}</span>
            </div>
            <div
               v-if="workspace.customizations.triggerAdd"
               class="context-element"
-               @click="showCreateTriggerModal"
+               @click="openCreateTriggerTab"
            >
               <span class="d-flex"><i class="mdi mdi-18px mdi-table-cog text-light pr-1" /> {{ $tc('word.trigger', 1) }}</span>
            </div>
            <div
               v-if="workspace.customizations.routineAdd"
               class="context-element"
-               @click="showCreateRoutineModal"
+               @click="openCreateRoutineTab"
            >
               <span class="d-flex"><i class="mdi mdi-18px mdi-sync-circle pr-1" /> {{ $tc('word.storedRoutine', 1) }}</span>
            </div>
            <div
               v-if="workspace.customizations.functionAdd"
               class="context-element"
-               @click="showCreateFunctionModal"
+               @click="openCreateFunctionTab"
            >
               <span class="d-flex"><i class="mdi mdi-18px mdi-arrow-right-bold-box pr-1" /> {{ $tc('word.function', 1) }}</span>
            </div>
            <div
               v-if="workspace.customizations.triggerFunctionAdd"
               class="context-element"
-               @click="showCreateTriggerFunctionModal"
+               @click="openCreateTriggerFunctionTab"
            >
               <span class="d-flex"><i class="mdi mdi-18px mdi-cog-clockwise pr-1" /> {{ $tc('word.triggerFunction', 1) }}</span>
            </div>
            <div
               v-if="workspace.customizations.schedulerAdd"
               class="context-element"
-               @click="showCreateSchedulerModal"
+               @click="openCreateSchedulerTab"
            >
               <span class="d-flex"><i class="mdi mdi-18px mdi-calendar-clock text-light pr-1" /> {{ $tc('word.scheduler', 1) }}</span>
            </div>
@@ -82,13 +82,13 @@
         </template>
         <div slot="body">
            <div class="mb-2">
-               {{ $t('message.deleteCorfirm') }} "<b>{{ selectedDatabase }}</b>"?
+               {{ $t('message.deleteCorfirm') }} "<b>{{ selectedSchema }}</b>"?
            </div>
         </div>
      </ConfirmModal>
      <ModalEditSchema
         v-if="isEditModal"
-         :selected-database="selectedDatabase"
+         :selected-schema="selectedSchema"
         @close="hideEditModal"
      />
   </BaseContextMenu>
@@ -110,7 +110,7 @@ export default {
   },
   props: {
      contextEvent: MouseEvent,
-      selectedDatabase: String
+      selectedSchema: String
   },
   data () {
      return {
@@ -132,26 +132,26 @@ export default {
         addNotification: 'notifications/addNotification',
         changeBreadcrumbs: 'workspaces/changeBreadcrumbs'
      }),
-      showCreateTableModal () {
-         this.$emit('show-create-table-modal');
+      openCreateTableTab () {
+         this.$emit('open-create-table-tab');
      },
-      showCreateViewModal () {
-         this.$emit('show-create-view-modal');
+      openCreateViewTab () {
+         this.$emit('open-create-view-tab');
      },
-      showCreateTriggerModal () {
-         this.$emit('show-create-trigger-modal');
+      openCreateTriggerTab () {
+         this.$emit('open-create-trigger-tab');
      },
-      showCreateRoutineModal () {
-         this.$emit('show-create-routine-modal');
+      openCreateRoutineTab () {
+         this.$emit('open-create-routine-tab');
      },
-      showCreateFunctionModal () {
-         this.$emit('show-create-function-modal');
+      openCreateFunctionTab () {
+         this.$emit('open-create-function-tab');
      },
-      showCreateTriggerFunctionModal () {
-         this.$emit('show-create-trigger-function-modal');
+      openCreateTriggerFunctionTab () {
+         this.$emit('open-create-trigger-function-tab');
      },
-      showCreateSchedulerModal () {
-         this.$emit('show-create-scheduler-modal');
+      openCreateSchedulerTab () {
+         this.$emit('open-create-scheduler-tab');
      },
      showDeleteModal () {
         this.isDeleteModal = true;
@@ -173,11 +173,11 @@ export default {
         try {
            const { status, response } = await Schema.deleteSchema({
               uid: this.selectedWorkspace,
-               database: this.selectedDatabase
+               database: this.selectedSchema
            });

            if (status === 'success') {
-               if (this.selectedDatabase === this.workspace.breadcrumbs.schema)
+               if (this.selectedSchema === this.workspace.breadcrumbs.schema)
                  this.changeBreadcrumbs({ schema: null });

               this.closeContext();
--- a/src/renderer/components/WorkspaceExploreBarTableContext.vue
+++ b/src/renderer/components/WorkspaceExploreBarTableContext.vue
@@ -4,14 +4,28 @@
      @close-context="closeContext"
   >
      <div
-         v-if="selectedTable.type === 'table'"
+         v-if="selectedTable && selectedTable.type === 'table' && customizations.tableSettings"
+         class="context-element"
+         @click="openTableSettingTab"
+      >
+         <span class="d-flex"><i class="mdi mdi-18px mdi-tune-vertical-variant text-light pr-1" /> {{ $t('word.settings') }}</span>
+      </div>
+      <div
+         v-if="selectedTable && selectedTable.type === 'view' && customizations.viewSettings"
+         class="context-element"
+         @click="openViewSettingTab"
+      >
+         <span class="d-flex"><i class="mdi mdi-18px mdi-tune-vertical-variant text-light pr-1" /> {{ $t('word.settings') }}</span>
+      </div>
+      <div
+         v-if="selectedTable && selectedTable.type === 'table'"
         class="context-element"
         @click="duplicateTable"
      >
         <span class="d-flex"><i class="mdi mdi-18px mdi-table-multiple text-light pr-1" /> {{ $t('message.duplicateTable') }}</span>
      </div>
      <div
-         v-if="selectedTable.type === 'table'"
+         v-if="selectedTable && selectedTable.type === 'table'"
         class="context-element"
         @click="showEmptyModal"
      >
@@ -62,7 +76,6 @@ import { mapGetters, mapActions } from 'vuex';
 import BaseContextMenu from '@/components/BaseContextMenu';
 import ConfirmModal from '@/components/BaseConfirmModal';
 import Tables from '@/ipc-api/Tables';
-import Views from '@/ipc-api/Views';

 export default {
   name: 'WorkspaceExploreBarTableContext',
@@ -72,7 +85,8 @@ export default {
   },
   props: {
      contextEvent: MouseEvent,
-      selectedTable: Object
+      selectedTable: Object,
+      selectedSchema: String
   },
   data () {
      return {
@@ -87,16 +101,20 @@ export default {
      }),
      workspace () {
         return this.getWorkspace(this.selectedWorkspace);
+      },
+      customizations () {
+         return this.workspace && this.workspace.customizations ? this.workspace.customizations : {};
      }
   },
   methods: {
      ...mapActions({
         addNotification: 'notifications/addNotification',
+         newTab: 'workspaces/newTab',
+         removeTabs: 'workspaces/removeTabs',
+         addLoadingElement: 'workspaces/addLoadingElement',
+         removeLoadingElement: 'workspaces/removeLoadingElement',
         changeBreadcrumbs: 'workspaces/changeBreadcrumbs'
      }),
-      showCreateTableModal () {
-         this.$emit('show-create-table-modal');
-      },
      showDeleteModal () {
         this.isDeleteModal = true;
      },
@@ -112,77 +130,74 @@ export default {
      closeContext () {
         this.$emit('close-context');
      },
-      async duplicateTable () {
-         try {
-            const { status, response } = await Tables.duplicateTable({
-               uid: this.selectedWorkspace,
-               table: this.selectedTable.name
-            });
+      openTableSettingTab () {
+         this.newTab({
+            uid: this.selectedWorkspace,
+            elementName: this.selectedTable.name,
+            schema: this.selectedSchema,
+            type: 'table-props',
+            elementType: 'table'
+         });

-            if (status === 'success') {
-               this.closeContext();
-               this.$emit('reload');
-            }
-            else
-               this.addNotification({ status: 'error', message: response });
-         }
-         catch (err) {
-            this.addNotification({ status: 'error', message: err.stack });
-         }
+         this.changeBreadcrumbs({
+            schema: this.selectedSchema,
+            table: this.selectedTable.name
+         });
+
+         this.closeContext();
+      },
+      openViewSettingTab () {
+         this.newTab({
+            uid: this.selectedWorkspace,
+            elementType: 'table',
+            elementName: this.selectedTable.name,
+            schema: this.selectedSchema,
+            type: 'view-props'
+         });
+
+         this.changeBreadcrumbs({
+            schema: this.selectedSchema,
+            view: this.selectedTable.name
+         });
+
+         this.closeContext();
+      },
+      duplicateTable () {
+         this.$emit('duplicate-table', { schema: this.selectedSchema, table: this.selectedTable });
      },
      async emptyTable () {
+         this.closeContext();
+
+         this.addLoadingElement({
+            name: this.selectedTable.name,
+            schema: this.selectedSchema,
+            type: 'table'
+         });
+
         try {
            const { status, response } = await Tables.truncateTable({
               uid: this.selectedWorkspace,
-               table: this.selectedTable.name
+               table: this.selectedTable.name,
+               schema: this.selectedSchema
            });

-            if (status === 'success') {
-               if (this.selectedTable.name === this.workspace.breadcrumbs.table)
-                  this.changeBreadcrumbs({ table: null });
-
-               this.closeContext();
+            if (status === 'success')
               this.$emit('reload');
-            }
            else
               this.addNotification({ status: 'error', message: response });
         }
         catch (err) {
            this.addNotification({ status: 'error', message: err.stack });
         }
+
+         this.removeLoadingElement({
+            name: this.selectedTable.name,
+            schema: this.selectedSchema,
+            type: 'table'
+         });
      },
-      async deleteTable () {
-         try {
-            let res;
-
-            if (this.selectedTable.type === 'table') {
-               res = await Tables.dropTable({
-                  uid: this.selectedWorkspace,
-                  table: this.selectedTable.name
-               });
-            }
-            else if (this.selectedTable.type === 'view') {
-               res = await Views.dropView({
-                  uid: this.selectedWorkspace,
-                  view: this.selectedTable.name
-               });
-            }
-
-            const { status, response } = res;
-
-            if (status === 'success') {
-               if (this.selectedTable.name === this.workspace.breadcrumbs.table || this.selectedTable.name === this.workspace.breadcrumbs.view)
-                  this.changeBreadcrumbs({ table: null, view: null });
-
-               this.closeContext();
-               this.$emit('reload');
-            }
-            else
-               this.addNotification({ status: 'error', message: response });
-         }
-         catch (err) {
-            this.addNotification({ status: 'error', message: err.stack });
-         }
+      deleteTable () {
+         this.$emit('delete-table', { schema: this.selectedSchema, table: this.selectedTable });
      }
   }
 };
--- a/src/renderer/components/WorkspacePropsFunctionOptionsModal.vue
+++ b/src/renderer/components/WorkspacePropsFunctionOptionsModal.vue
@@ -1,213 +0,0 @@
-<template>
-   <ConfirmModal
-      :confirm-text="$t('word.confirm')"
-      size="400"
-      @confirm="confirmOptionsChange"
-      @hide="$emit('hide')"
-   >
-      <template :slot="'header'">
-         <div class="d-flex">
-            <i class="mdi mdi-24px mdi-cogs mr-1" />
-            <span class="cut-text">{{ $t('word.options') }} "{{ localOptions.name }}"</span>
-         </div>
-      </template>
-      <div :slot="'body'">
-         <form class="form-horizontal">
-            <div class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.name') }}
-               </label>
-               <div class="column">
-                  <input
-                     ref="firstInput"
-                     v-model="optionsProxy.name"
-                     class="form-input"
-                     :class="{'is-error': !isTableNameValid}"
-                     type="text"
-                  >
-               </div>
-            </div>
-            <div v-if="customizations.languages" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.language') }}
-               </label>
-               <div class="column">
-                  <select v-model="optionsProxy.language" class="form-select">
-                     <option v-for="language in customizations.languages" :key="language">
-                        {{ language }}
-                     </option>
-                  </select>
-               </div>
-            </div>
-            <div v-if="customizations.definer" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.definer') }}
-               </label>
-               <div class="column">
-                  <select
-                     v-if="workspace.users.length"
-                     v-model="optionsProxy.definer"
-                     class="form-select"
-                  >
-                     <option value="">
-                        {{ $t('message.currentUser') }}
-                     </option>
-                     <option
-                        v-for="user in workspace.users"
-                        :key="`${user.name}@${user.host}`"
-                        :value="`\`${user.name}\`@\`${user.host}\``"
-                     >
-                        {{ user.name }}@{{ user.host }}
-                     </option>
-                  </select>
-                  <select v-if="!workspace.users.length" class="form-select">
-                     <option value="">
-                        {{ $t('message.currentUser') }}
-                     </option>
-                  </select>
-               </div>
-            </div>
-            <div class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.returns') }}
-               </label>
-               <div class="column">
-                  <div class="input-group">
-                     <select
-                        v-model="optionsProxy.returns"
-                        class="form-select text-uppercase"
-                        style="width: 0;"
-                     >
-                        <option v-if="localOptions.returns === 'VOID'">
-                           VOID
-                        </option>
-                        <option v-if="!isInDataTypes">
-                           {{ localOptions.returns }}
-                        </option>
-                        <optgroup
-                           v-for="group in workspace.dataTypes"
-                           :key="group.group"
-                           :label="group.group"
-                        >
-                           <option
-                              v-for="type in group.types"
-                              :key="type.name"
-                              :selected="optionsProxy.returns === type.name"
-                              :value="type.name"
-                           >
-                              {{ type.name }}
-                           </option>
-                        </optgroup>
-                     </select>
-                     <input
-                        v-if="customizations.parametersLength"
-                        v-model="optionsProxy.returnsLength"
-                        class="form-input"
-                        type="number"
-                        min="0"
-                     >
-                  </div>
-               </div>
-            </div>
-            <div v-if="customizations.comment" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.comment') }}
-               </label>
-               <div class="column">
-                  <input
-                     v-model="optionsProxy.comment"
-                     class="form-input"
-                     type="text"
-                  >
-               </div>
-            </div>
-            <div class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('message.sqlSecurity') }}
-               </label>
-               <div class="column">
-                  <select v-model="optionsProxy.security" class="form-select">
-                     <option>DEFINER</option>
-                     <option>INVOKER</option>
-                  </select>
-               </div>
-            </div>
-            <div v-if="customizations.functionDataAccess" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('message.dataAccess') }}
-               </label>
-               <div class="column">
-                  <select v-model="optionsProxy.dataAccess" class="form-select">
-                     <option>CONTAINS SQL</option>
-                     <option>NO SQL</option>
-                     <option>READS SQL DATA</option>
-                     <option>MODIFIES SQL DATA</option>
-                  </select>
-               </div>
-            </div>
-            <div v-if="customizations.functionDeterministic" class="form-group">
-               <div class="col-4" />
-               <div class="column">
-                  <label class="form-checkbox form-inline">
-                     <input v-model="optionsProxy.deterministic" type="checkbox"><i class="form-icon" /> {{ $t('word.deterministic') }}
-                  </label>
-               </div>
-            </div>
-         </form>
-      </div>
-   </ConfirmModal>
-</template>
-
-<script>
-import ConfirmModal from '@/components/BaseConfirmModal';
-
-export default {
-   name: 'WorkspacePropsFunctionOptionsModal',
-   components: {
-      ConfirmModal
-   },
-   props: {
-      localOptions: Object,
-      workspace: Object
-   },
-   data () {
-      return {
-         optionsProxy: {},
-         isOptionsChanging: false
-      };
-   },
-   computed: {
-      isTableNameValid () {
-         return this.optionsProxy.name !== '';
-      },
-      customizations () {
-         return this.workspace.customizations;
-      },
-      isInDataTypes () {
-         let typeNames = [];
-         for (const group of this.workspace.dataTypes) {
-            typeNames = group.types.reduce((acc, curr) => {
-               acc.push(curr.name);
-               return acc;
-            }, []);
-         }
-         return typeNames.includes(this.localOptions.returns);
-      }
-   },
-   created () {
-      this.optionsProxy = JSON.parse(JSON.stringify(this.localOptions));
-
-      setTimeout(() => {
-         this.$refs.firstInput.focus();
-      }, 20);
-   },
-   methods: {
-      confirmOptionsChange () {
-         if (!this.isTableNameValid)
-            this.optionsProxy.name = this.localOptions.name;
-
-         this.$emit('options-update', this.optionsProxy);
-      }
-   }
-};
-</script>
--- a/src/renderer/components/WorkspacePropsOptionsModal.vue
+++ b/src/renderer/components/WorkspacePropsOptionsModal.vue
@@ -1,132 +0,0 @@
-<template>
-   <ConfirmModal
-      :confirm-text="$t('word.confirm')"
-      size="400"
-      @confirm="confirmOptionsChange"
-      @hide="$emit('hide')"
-   >
-      <template :slot="'header'">
-         <div class="d-flex">
-            <i class="mdi mdi-24px mdi-cogs mr-1" />
-            <span class="cut-text">{{ $t('word.options') }} "{{ table }}"</span>
-         </div>
-      </template>
-      <div :slot="'body'">
-         <form class="form-horizontal">
-            <div class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.name') }}
-               </label>
-               <div class="column">
-                  <input
-                     ref="firstInput"
-                     v-model="optionsProxy.name"
-                     class="form-input"
-                     :class="{'is-error': !isTableNameValid}"
-                     type="text"
-                  >
-               </div>
-            </div>
-            <div v-if="workspace.customizations.comment" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.comment') }}
-               </label>
-               <div class="column">
-                  <input
-                     v-model="optionsProxy.comment"
-                     class="form-input"
-                     type="text"
-                  >
-               </div>
-            </div>
-            <div v-if="workspace.customizations.autoIncrement" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.autoIncrement') }}
-               </label>
-               <div class="column">
-                  <input
-                     v-model="optionsProxy.autoIncrement"
-                     class="form-input"
-                     type="number"
-                     :disabled="optionsProxy.autoIncrement === null"
-                  >
-               </div>
-            </div>
-            <div v-if="workspace.customizations.collations" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.collation') }}
-               </label>
-               <div class="column">
-                  <select v-model="optionsProxy.collation" class="form-select">
-                     <option
-                        v-for="collation in workspace.collations"
-                        :key="collation.id"
-                        :value="collation.collation"
-                     >
-                        {{ collation.collation }}
-                     </option>
-                  </select>
-               </div>
-            </div>
-            <div v-if="workspace.customizations.engines" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.engine') }}
-               </label>
-               <div class="column">
-                  <select v-model="optionsProxy.engine" class="form-select">
-                     <option
-                        v-for="engine in workspace.engines"
-                        :key="engine.name"
-                        :value="engine.name"
-                     >
-                        {{ engine.name }}
-                     </option>
-                  </select>
-               </div>
-            </div>
-         </form>
-      </div>
-   </ConfirmModal>
-</template>
-
-<script>
-import ConfirmModal from '@/components/BaseConfirmModal';
-
-export default {
-   name: 'WorkspacePropsOptionsModal',
-   components: {
-      ConfirmModal
-   },
-   props: {
-      localOptions: Object,
-      table: String,
-      workspace: Object
-   },
-   data () {
-      return {
-         optionsProxy: {},
-         isOptionsChanging: false
-      };
-   },
-   computed: {
-      isTableNameValid () {
-         return this.optionsProxy.name !== '';
-      }
-   },
-   created () {
-      this.optionsProxy = JSON.parse(JSON.stringify(this.localOptions));
-
-      setTimeout(() => {
-         this.$refs.firstInput.focus();
-      }, 20);
-   },
-   methods: {
-      confirmOptionsChange () {
-         if (!this.isTableNameValid)
-            this.optionsProxy.name = this.localOptions.name;
-
-         this.$emit('options-update', this.optionsProxy);
-      }
-   }
-};
-</script>
--- a/src/renderer/components/WorkspacePropsRoutineOptionsModal.vue
+++ b/src/renderer/components/WorkspacePropsRoutineOptionsModal.vue
@@ -1,161 +0,0 @@
-<template>
-   <ConfirmModal
-      :confirm-text="$t('word.confirm')"
-      size="400"
-      @confirm="confirmOptionsChange"
-      @hide="$emit('hide')"
-   >
-      <template :slot="'header'">
-         <div class="d-flex">
-            <i class="mdi mdi-24px mdi-cogs mr-1" />
-            <span class="cut-text">{{ $t('word.options') }} "{{ localOptions.name }}"</span>
-         </div>
-      </template>
-      <div :slot="'body'">
-         <form class="form-horizontal">
-            <div class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.name') }}
-               </label>
-               <div class="column">
-                  <input
-                     ref="firstInput"
-                     v-model="optionsProxy.name"
-                     class="form-input"
-                     :class="{'is-error': !isTableNameValid}"
-                     type="text"
-                  >
-               </div>
-            </div>
-            <div v-if="customizations.languages" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.language') }}
-               </label>
-               <div class="column">
-                  <select v-model="optionsProxy.language" class="form-select">
-                     <option v-for="language in customizations.languages" :key="language">
-                        {{ language }}
-                     </option>
-                  </select>
-               </div>
-            </div>
-            <div v-if="customizations.definer" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.definer') }}
-               </label>
-               <div class="column">
-                  <select
-                     v-if="workspace.users.length"
-                     v-model="optionsProxy.definer"
-                     class="form-select"
-                  >
-                     <option value="">
-                        {{ $t('message.currentUser') }}
-                     </option>
-                     <option
-                        v-for="user in workspace.users"
-                        :key="`${user.name}@${user.host}`"
-                        :value="`\`${user.name}\`@\`${user.host}\``"
-                     >
-                        {{ user.name }}@{{ user.host }}
-                     </option>
-                  </select>
-                  <select v-if="!workspace.users.length" class="form-select">
-                     <option value="">
-                        {{ $t('message.currentUser') }}
-                     </option>
-                  </select>
-               </div>
-            </div>
-            <div v-if="customizations.comment" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.comment') }}
-               </label>
-               <div class="column">
-                  <input
-                     v-model="optionsProxy.comment"
-                     class="form-input"
-                     type="text"
-                  >
-               </div>
-            </div>
-            <div class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('message.sqlSecurity') }}
-               </label>
-               <div class="column">
-                  <select v-model="optionsProxy.security" class="form-select">
-                     <option>DEFINER</option>
-                     <option>INVOKER</option>
-                  </select>
-               </div>
-            </div>
-            <div v-if="customizations.procedureDataAccess" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('message.dataAccess') }}
-               </label>
-               <div class="column">
-                  <select v-model="optionsProxy.dataAccess" class="form-select">
-                     <option>CONTAINS SQL</option>
-                     <option>NO SQL</option>
-                     <option>READS SQL DATA</option>
-                     <option>MODIFIES SQL DATA</option>
-                  </select>
-               </div>
-            </div>
-            <div v-if="customizations.procedureDeterministic" class="form-group">
-               <div class="col-4" />
-               <div class="column">
-                  <label class="form-checkbox form-inline">
-                     <input v-model="optionsProxy.deterministic" type="checkbox"><i class="form-icon" /> {{ $t('word.deterministic') }}
-                  </label>
-               </div>
-            </div>
-         </form>
-      </div>
-   </ConfirmModal>
-</template>
-
-<script>
-import ConfirmModal from '@/components/BaseConfirmModal';
-
-export default {
-   name: 'WorkspacePropsRoutineOptionsModal',
-   components: {
-      ConfirmModal
-   },
-   props: {
-      localOptions: Object,
-      workspace: Object
-   },
-   data () {
-      return {
-         optionsProxy: {},
-         isOptionsChanging: false
-      };
-   },
-   computed: {
-      isTableNameValid () {
-         return this.optionsProxy.name !== '';
-      },
-      customizations () {
-         return this.workspace.customizations;
-      }
-   },
-   created () {
-      this.optionsProxy = JSON.parse(JSON.stringify(this.localOptions));
-
-      setTimeout(() => {
-         this.$refs.firstInput.focus();
-      }, 20);
-   },
-   methods: {
-      confirmOptionsChange () {
-         if (!this.isTableNameValid)
-            this.optionsProxy.name = this.localOptions.name;
-
-         this.$emit('options-update', this.optionsProxy);
-      }
-   }
-};
-</script>
--- a/src/renderer/components/WorkspacePropsTriggerFunctionOptionsModal.vue
+++ b/src/renderer/components/WorkspacePropsTriggerFunctionOptionsModal.vue
@@ -1,125 +0,0 @@
-<template>
-   <ConfirmModal
-      :confirm-text="$t('word.confirm')"
-      size="400"
-      @confirm="confirmOptionsChange"
-      @hide="$emit('hide')"
-   >
-      <template :slot="'header'">
-         <div class="d-flex">
-            <i class="mdi mdi-24px mdi-cogs mr-1" />
-            <span class="cut-text">{{ $t('word.options') }} "{{ localOptions.name }}"</span>
-         </div>
-      </template>
-      <div :slot="'body'">
-         <form class="form-horizontal">
-            <div v-if="customizations.triggerFunctionlanguages" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.language') }}
-               </label>
-               <div class="column">
-                  <select v-model="optionsProxy.language" class="form-select">
-                     <option v-for="language in customizations.triggerFunctionlanguages" :key="language">
-                        {{ language }}
-                     </option>
-                  </select>
-               </div>
-            </div>
-            <div v-if="customizations.definer" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.definer') }}
-               </label>
-               <div class="column">
-                  <select
-                     v-if="workspace.users.length"
-                     v-model="optionsProxy.definer"
-                     class="form-select"
-                  >
-                     <option value="">
-                        {{ $t('message.currentUser') }}
-                     </option>
-                     <option
-                        v-for="user in workspace.users"
-                        :key="`${user.name}@${user.host}`"
-                        :value="`\`${user.name}\`@\`${user.host}\``"
-                     >
-                        {{ user.name }}@{{ user.host }}
-                     </option>
-                  </select>
-                  <select v-if="!workspace.users.length" class="form-select">
-                     <option value="">
-                        {{ $t('message.currentUser') }}
-                     </option>
-                  </select>
-               </div>
-            </div>
-            <div v-if="customizations.comment" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.comment') }}
-               </label>
-               <div class="column">
-                  <input
-                     v-model="optionsProxy.comment"
-                     class="form-input"
-                     type="text"
-                  >
-               </div>
-            </div>
-         </form>
-      </div>
-   </ConfirmModal>
-</template>
-
-<script>
-import ConfirmModal from '@/components/BaseConfirmModal';
-
-export default {
-   name: 'WorkspacePropsTriggerFunctionOptionsModal',
-   components: {
-      ConfirmModal
-   },
-   props: {
-      localOptions: Object,
-      workspace: Object
-   },
-   data () {
-      return {
-         optionsProxy: {},
-         isOptionsChanging: false
-      };
-   },
-   computed: {
-      isTableNameValid () {
-         return this.optionsProxy.name !== '';
-      },
-      customizations () {
-         return this.workspace.customizations;
-      },
-      isInDataTypes () {
-         let typeNames = [];
-         for (const group of this.workspace.dataTypes) {
-            typeNames = group.types.reduce((acc, curr) => {
-               acc.push(curr.name);
-               return acc;
-            }, []);
-         }
-         return typeNames.includes(this.localOptions.returns);
-      }
-   },
-   created () {
-      this.optionsProxy = JSON.parse(JSON.stringify(this.localOptions));
-
-      setTimeout(() => {
-         this.$refs.firstInput.focus();
-      }, 20);
-   },
-   methods: {
-      confirmOptionsChange () {
-         if (!this.isTableNameValid)
-            this.optionsProxy.name = this.localOptions.name;
-
-         this.$emit('options-update', this.optionsProxy);
-      }
-   }
-};
-</script>
--- a/src/renderer/components/WorkspaceTabNewFunction.vue
+++ b/src/renderer/components/WorkspaceTabNewFunction.vue
@@ -0,0 +1,397 @@
+<template>
+   <div v-show="isSelected" class="workspace-query-tab column col-12 columns col-gapless">
+      <div class="workspace-query-runner column col-12">
+         <div class="workspace-query-runner-footer">
+            <div class="workspace-query-buttons">
+               <button
+                  class="btn btn-primary btn-sm"
+                  :disabled="!isChanged"
+                  :class="{'loading':isSaving}"
+                  title="CTRL+S"
+                  @click="saveChanges"
+               >
+                  <i class="mdi mdi-24px mdi-content-save mr-1" />
+                  <span>{{ $t('word.save') }}</span>
+               </button>
+               <button
+                  :disabled="!isChanged"
+                  class="btn btn-link btn-sm mr-0"
+                  :title="$t('message.clearChanges')"
+                  @click="clearChanges"
+               >
+                  <i class="mdi mdi-24px mdi-delete-sweep mr-1" />
+                  <span>{{ $t('word.clear') }}</span>
+               </button>
+
+               <div class="divider-vert py-3" />
+
+               <button class="btn btn-dark btn-sm" @click="showParamsModal">
+                  <i class="mdi mdi-24px mdi-dots-horizontal mr-1" />
+                  <span>{{ $t('word.parameters') }}</span>
+               </button>
+            </div>
+            <div class="workspace-query-info">
+               <div class="d-flex" :title="$t('word.schema')">
+                  <i class="mdi mdi-18px mdi-database mr-1" /><b>{{ schema }}</b>
+               </div>
+            </div>
+         </div>
+      </div>
+      <div class="container">
+         <div class="columns">
+            <div class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('word.name') }}
+                  </label>
+                  <input
+                     ref="firstInput"
+                     v-model="localFunction.name"
+                     class="form-input"
+                     type="text"
+                  >
+               </div>
+            </div>
+            <div v-if="customizations.languages" class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('word.language') }}
+                  </label>
+                  <select v-model="localFunction.language" class="form-select">
+                     <option v-for="language in customizations.languages" :key="language">
+                        {{ language }}
+                     </option>
+                  </select>
+               </div>
+            </div>
+            <div v-if="customizations.definer" class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('word.definer') }}
+                  </label>
+                  <select
+                     v-if="workspace.users.length"
+                     v-model="localFunction.definer"
+                     class="form-select"
+                  >
+                     <option value="">
+                        {{ $t('message.currentUser') }}
+                     </option>
+                     <option
+                        v-for="user in workspace.users"
+                        :key="`${user.name}@${user.host}`"
+                        :value="`\`${user.name}\`@\`${user.host}\``"
+                     >
+                        {{ user.name }}@{{ user.host }}
+                     </option>
+                  </select>
+                  <select v-if="!workspace.users.length" class="form-select">
+                     <option value="">
+                        {{ $t('message.currentUser') }}
+                     </option>
+                  </select>
+               </div>
+            </div>
+            <div class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('word.returns') }}
+                  </label>
+                  <div class="input-group">
+                     <select
+                        v-model="localFunction.returns"
+                        class="form-select text-uppercase"
+                        style="max-width: 150px;"
+                     >
+                        <option v-if="localFunction.returns === 'VOID'">
+                           VOID
+                        </option>
+                        <optgroup
+                           v-for="group in workspace.dataTypes"
+                           :key="group.group"
+                           :label="group.group"
+                        >
+                           <option
+                              v-for="type in group.types"
+                              :key="type.name"
+                              :selected="localFunction.returns === type.name"
+                              :value="type.name"
+                           >
+                              {{ type.name }}
+                           </option>
+                        </optgroup>
+                     </select>
+                     <input
+                        v-if="customizations.parametersLength"
+                        v-model="localFunction.returnsLength"
+                        style="max-width: 150px;"
+                        class="form-input"
+                        type="number"
+                        min="0"
+                        :placeholder="$t('word.length')"
+                     >
+                  </div>
+               </div>
+            </div>
+            <div v-if="customizations.comment" class="column">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('word.comment') }}
+                  </label>
+                  <input
+                     v-model="localFunction.comment"
+                     class="form-input"
+                     type="text"
+                  >
+               </div>
+            </div>
+            <div class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('message.sqlSecurity') }}
+                  </label>
+                  <select v-model="localFunction.security" class="form-select">
+                     <option>DEFINER</option>
+                     <option>INVOKER</option>
+                  </select>
+               </div>
+            </div>
+            <div v-if="customizations.functionDataAccess" class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('message.dataAccess') }}
+                  </label>
+                  <select v-model="localFunction.dataAccess" class="form-select">
+                     <option>CONTAINS SQL</option>
+                     <option>NO SQL</option>
+                     <option>READS SQL DATA</option>
+                     <option>MODIFIES SQL DATA</option>
+                  </select>
+               </div>
+            </div>
+            <div v-if="customizations.functionDeterministic" class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label d-invisible">.</label>
+                  <label class="form-checkbox form-inline">
+                     <input v-model="localFunction.deterministic" type="checkbox"><i class="form-icon" /> {{ $t('word.deterministic') }}
+                  </label>
+               </div>
+            </div>
+         </div>
+      </div>
+      <div class="workspace-query-results column col-12 mt-2 p-relative">
+         <BaseLoader v-if="isLoading" />
+         <label class="form-label ml-2">{{ $t('message.functionBody') }}</label>
+         <QueryEditor
+            v-show="isSelected"
+            ref="queryEditor"
+            :value.sync="localFunction.sql"
+            :workspace="workspace"
+            :schema="schema"
+            :height="editorHeight"
+         />
+      </div>
+      <WorkspaceTabPropsFunctionParamsModal
+         v-if="isParamsModal"
+         :local-parameters="localFunction.parameters"
+         :workspace="workspace"
+         :func="localFunction.name"
+         @hide="hideParamsModal"
+         @parameters-update="parametersUpdate"
+      />
+   </div>
+</template>
+
+<script>
+import { mapGetters, mapActions } from 'vuex';
+import BaseLoader from '@/components/BaseLoader';
+import QueryEditor from '@/components/QueryEditor';
+import WorkspaceTabPropsFunctionParamsModal from '@/components/WorkspaceTabPropsFunctionParamsModal';
+import Functions from '@/ipc-api/Functions';
+
+export default {
+   name: 'WorkspaceTabNewFunction',
+   components: {
+      BaseLoader,
+      QueryEditor,
+      WorkspaceTabPropsFunctionParamsModal
+   },
+   props: {
+      connection: Object,
+      tab: Object,
+      isSelected: Boolean,
+      schema: String
+   },
+   data () {
+      return {
+         isLoading: false,
+         isSaving: false,
+         isParamsModal: false,
+         originalFunction: {},
+         localFunction: {},
+         lastFunction: null,
+         sqlProxy: '',
+         editorHeight: 300
+      };
+   },
+   computed: {
+      ...mapGetters({
+         selectedWorkspace: 'workspaces/getSelected',
+         getWorkspace: 'workspaces/getWorkspace'
+      }),
+      workspace () {
+         return this.getWorkspace(this.connection.uid);
+      },
+      customizations () {
+         return this.workspace.customizations;
+      },
+      tabUid () {
+         return this.$vnode.key;
+      },
+      isChanged () {
+         return JSON.stringify(this.originalFunction) !== JSON.stringify(this.localFunction);
+      },
+      isDefinerInUsers () {
+         return this.originalFunction
+            ? this.workspace.users.some(user => this.originalFunction.definer === `\`${user.name}\`@\`${user.host}\``)
+            : true;
+      },
+      schemaTables () {
+         const schemaTables = this.workspace.structure
+            .filter(schema => schema.name === this.schema)
+            .map(schema => schema.tables);
+
+         return schemaTables.length ? schemaTables[0].filter(table => table.type === 'table') : [];
+      }
+   },
+   watch: {
+      isSelected (val) {
+         if (val)
+            this.changeBreadcrumbs({ schema: this.schema });
+      },
+      isChanged (val) {
+         this.setUnsavedChanges({ uid: this.connection.uid, tUid: this.tabUid, isChanged: val });
+      }
+   },
+   created () {
+      this.originalFunction = {
+         sql: this.customizations.functionSql,
+         language: this.customizations.languages ? this.customizations.languages[0] : null,
+         name: '',
+         definer: '',
+         comment: '',
+         security: 'DEFINER',
+         dataAccess: 'CONTAINS SQL',
+         deterministic: false,
+         returns: this.workspace.dataTypes.length ? this.workspace.dataTypes[0].types[0].name : null
+      };
+
+      this.localFunction = JSON.parse(JSON.stringify(this.originalFunction));
+
+      setTimeout(() => {
+         this.resizeQueryEditor();
+      }, 50);
+
+      window.addEventListener('keydown', this.onKey);
+   },
+   mounted () {
+      if (this.isSelected)
+         this.changeBreadcrumbs({ schema: this.schema });
+
+      setTimeout(() => {
+         this.$refs.firstInput.focus();
+      }, 100);
+   },
+   destroyed () {
+      window.removeEventListener('resize', this.resizeQueryEditor);
+   },
+   beforeDestroy () {
+      window.removeEventListener('keydown', this.onKey);
+   },
+   methods: {
+      ...mapActions({
+         addNotification: 'notifications/addNotification',
+         refreshStructure: 'workspaces/refreshStructure',
+         changeBreadcrumbs: 'workspaces/changeBreadcrumbs',
+         setUnsavedChanges: 'workspaces/setUnsavedChanges',
+         newTab: 'workspaces/newTab',
+         removeTab: 'workspaces/removeTab',
+         renameTabs: 'workspaces/renameTabs'
+      }),
+      async saveChanges () {
+         if (this.isSaving) return;
+         this.isSaving = true;
+         const params = {
+            uid: this.connection.uid,
+            schema: this.schema,
+            ...this.localFunction
+         };
+
+         try {
+            const { status, response } = await Functions.createFunction(params);
+
+            if (status === 'success') {
+               await this.refreshStructure(this.connection.uid);
+
+               this.newTab({
+                  uid: this.connection.uid,
+                  schema: this.schema,
+                  elementName: this.localFunction.name,
+                  elementType: 'function',
+                  type: 'function-props'
+               });
+
+               this.removeTab({ uid: this.connection.uid, tab: this.tab.uid });
+               this.changeBreadcrumbs({ schema: this.schema, function: this.localFunction.name });
+            }
+            else
+               this.addNotification({ status: 'error', message: response });
+         }
+         catch (err) {
+            this.addNotification({ status: 'error', message: err.stack });
+         }
+
+         this.isSaving = false;
+      },
+      clearChanges () {
+         this.localFunction = JSON.parse(JSON.stringify(this.originalFunction));
+         this.$refs.queryEditor.editor.session.setValue(this.localFunction.sql);
+      },
+      resizeQueryEditor () {
+         if (this.$refs.queryEditor) {
+            const footer = document.getElementById('footer');
+            const size = window.innerHeight - this.$refs.queryEditor.$el.getBoundingClientRect().top - footer.offsetHeight;
+            this.editorHeight = size;
+            this.$refs.queryEditor.editor.resize();
+         }
+      },
+      optionsUpdate (options) {
+         this.localFunction = options;
+      },
+      parametersUpdate (parameters) {
+         this.localFunction = { ...this.localFunction, parameters };
+      },
+      showParamsModal () {
+         this.isParamsModal = true;
+      },
+      hideParamsModal () {
+         this.isParamsModal = false;
+      },
+      showAskParamsModal () {
+         this.isAskingParameters = true;
+      },
+      hideAskParamsModal () {
+         this.isAskingParameters = false;
+      },
+      onKey (e) {
+         if (this.isSelected) {
+            e.stopPropagation();
+            if (e.ctrlKey && e.keyCode === 83) { // CTRL + S
+               if (this.isChanged)
+                  this.saveChanges();
+            }
+         }
+      }
+   }
+};
+</script>
--- a/src/renderer/components/WorkspaceTabNewRoutine.vue
+++ b/src/renderer/components/WorkspaceTabNewRoutine.vue
@@ -0,0 +1,353 @@
+<template>
+   <div v-show="isSelected" class="workspace-query-tab column col-12 columns col-gapless">
+      <div class="workspace-query-runner column col-12">
+         <div class="workspace-query-runner-footer">
+            <div class="workspace-query-buttons">
+               <button
+                  class="btn btn-primary btn-sm"
+                  :disabled="!isChanged"
+                  :class="{'loading':isSaving}"
+                  title="CTRL+S"
+                  @click="saveChanges"
+               >
+                  <i class="mdi mdi-24px mdi-content-save mr-1" />
+                  <span>{{ $t('word.save') }}</span>
+               </button>
+               <button
+                  :disabled="!isChanged"
+                  class="btn btn-link btn-sm mr-0"
+                  :title="$t('message.clearChanges')"
+                  @click="clearChanges"
+               >
+                  <i class="mdi mdi-24px mdi-delete-sweep mr-1" />
+                  <span>{{ $t('word.clear') }}</span>
+               </button>
+
+               <div class="divider-vert py-3" />
+
+               <button class="btn btn-dark btn-sm" @click="showParamsModal">
+                  <i class="mdi mdi-24px mdi-dots-horizontal mr-1" />
+                  <span>{{ $t('word.parameters') }}</span>
+               </button>
+            </div>
+            <div class="workspace-query-info">
+               <div class="d-flex" :title="$t('word.schema')">
+                  <i class="mdi mdi-18px mdi-database mr-1" /><b>{{ schema }}</b>
+               </div>
+            </div>
+         </div>
+      </div>
+      <div class="container">
+         <div class="columns">
+            <div class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('word.name') }}
+                  </label>
+                  <input
+                     ref="firstInput"
+                     v-model="localRoutine.name"
+                     class="form-input"
+                     type="text"
+                  >
+               </div>
+            </div>
+            <div v-if="customizations.languages" class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('word.language') }}
+                  </label>
+                  <select v-model="localRoutine.language" class="form-select">
+                     <option v-for="language in customizations.languages" :key="language">
+                        {{ language }}
+                     </option>
+                  </select>
+               </div>
+            </div>
+            <div v-if="customizations.definer" class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('word.definer') }}
+                  </label>
+                  <select
+                     v-if="workspace.users.length"
+                     v-model="localRoutine.definer"
+                     class="form-select"
+                  >
+                     <option value="">
+                        {{ $t('message.currentUser') }}
+                     </option>
+                     <option
+                        v-for="user in workspace.users"
+                        :key="`${user.name}@${user.host}`"
+                        :value="`\`${user.name}\`@\`${user.host}\``"
+                     >
+                        {{ user.name }}@{{ user.host }}
+                     </option>
+                  </select>
+                  <select v-if="!workspace.users.length" class="form-select">
+                     <option value="">
+                        {{ $t('message.currentUser') }}
+                     </option>
+                  </select>
+               </div>
+            </div>
+            <div v-if="customizations.comment" class="column">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('word.comment') }}
+                  </label>
+                  <input
+                     v-model="localRoutine.comment"
+                     class="form-input"
+                     type="text"
+                  >
+               </div>
+            </div>
+            <div class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('message.sqlSecurity') }}
+                  </label>
+                  <select v-model="localRoutine.security" class="form-select">
+                     <option>DEFINER</option>
+                     <option>INVOKER</option>
+                  </select>
+               </div>
+            </div>
+            <div v-if="customizations.procedureDataAccess" class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('message.dataAccess') }}
+                  </label>
+                  <select v-model="localRoutine.dataAccess" class="form-select">
+                     <option>CONTAINS SQL</option>
+                     <option>NO SQL</option>
+                     <option>READS SQL DATA</option>
+                     <option>MODIFIES SQL DATA</option>
+                  </select>
+               </div>
+            </div>
+            <div v-if="customizations.procedureDeterministic" class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label d-invisible">.</label>
+                  <label class="form-checkbox form-inline">
+                     <input v-model="localRoutine.deterministic" type="checkbox"><i class="form-icon" /> {{ $t('word.deterministic') }}
+                  </label>
+               </div>
+            </div>
+         </div>
+      </div>
+      <div class="workspace-query-results column col-12 mt-2 p-relative">
+         <BaseLoader v-if="isLoading" />
+         <label class="form-label ml-2">{{ $t('message.routineBody') }}</label>
+         <QueryEditor
+            v-show="isSelected"
+            :key="`new-${_uid}`"
+            ref="queryEditor"
+            :value.sync="localRoutine.sql"
+            :workspace="workspace"
+            :schema="schema"
+            :height="editorHeight"
+         />
+      </div>
+      <WorkspaceTabPropsRoutineParamsModal
+         v-if="isParamsModal"
+         :local-parameters="localRoutine.parameters"
+         :workspace="workspace"
+         routine="new"
+         @hide="hideParamsModal"
+         @parameters-update="parametersUpdate"
+      />
+   </div>
+</template>
+
+<script>
+import { mapGetters, mapActions } from 'vuex';
+import QueryEditor from '@/components/QueryEditor';
+import BaseLoader from '@/components/BaseLoader';
+import WorkspaceTabPropsRoutineParamsModal from '@/components/WorkspaceTabPropsRoutineParamsModal';
+import Routines from '@/ipc-api/Routines';
+
+export default {
+   name: 'WorkspaceTabNewRoutine',
+   components: {
+      QueryEditor,
+      BaseLoader,
+      WorkspaceTabPropsRoutineParamsModal
+   },
+   props: {
+      connection: Object,
+      tab: Object,
+      isSelected: Boolean,
+      schema: String
+   },
+   data () {
+      return {
+         isLoading: false,
+         isSaving: false,
+         isParamsModal: false,
+         originalRoutine: {},
+         localRoutine: {},
+         lastRoutine: null,
+         sqlProxy: '',
+         editorHeight: 300
+      };
+   },
+   computed: {
+      ...mapGetters({
+         selectedWorkspace: 'workspaces/getSelected',
+         getWorkspace: 'workspaces/getWorkspace'
+      }),
+      workspace () {
+         return this.getWorkspace(this.connection.uid);
+      },
+      customizations () {
+         return this.workspace.customizations;
+      },
+      tabUid () {
+         return this.$vnode.key;
+      },
+      isChanged () {
+         return JSON.stringify(this.originalRoutine) !== JSON.stringify(this.localRoutine);
+      },
+      isDefinerInUsers () {
+         return this.originalRoutine ? this.workspace.users.some(user => this.originalRoutine.definer === `\`${user.name}\`@\`${user.host}\``) : true;
+      },
+      schemaTables () {
+         const schemaTables = this.workspace.structure
+            .filter(schema => schema.name === this.schema)
+            .map(schema => schema.tables);
+
+         return schemaTables.length ? schemaTables[0].filter(table => table.type === 'table') : [];
+      }
+   },
+   watch: {
+      isSelected (val) {
+         if (val)
+            this.changeBreadcrumbs({ schema: this.schema });
+      },
+      isChanged (val) {
+         this.setUnsavedChanges({ uid: this.connection.uid, tUid: this.tabUid, isChanged: val });
+      }
+   },
+   created () {
+      this.originalRoutine = {
+         sql: this.customizations.procedureSql,
+         language: this.customizations.languages ? this.customizations.languages[0] : null,
+         name: '',
+         definer: '',
+         comment: '',
+         security: 'DEFINER',
+         dataAccess: 'CONTAINS SQL',
+         deterministic: false
+      };
+
+      this.localRoutine = JSON.parse(JSON.stringify(this.originalRoutine));
+
+      setTimeout(() => {
+         this.resizeQueryEditor();
+      }, 50);
+
+      window.addEventListener('keydown', this.onKey);
+   },
+   mounted () {
+      if (this.isSelected)
+         this.changeBreadcrumbs({ schema: this.schema });
+
+      setTimeout(() => {
+         this.$refs.firstInput.focus();
+      }, 100);
+
+      window.addEventListener('resize', this.resizeQueryEditor);
+   },
+   destroyed () {
+      window.removeEventListener('resize', this.resizeQueryEditor);
+   },
+   beforeDestroy () {
+      window.removeEventListener('keydown', this.onKey);
+   },
+   methods: {
+      ...mapActions({
+         addNotification: 'notifications/addNotification',
+         refreshStructure: 'workspaces/refreshStructure',
+         changeBreadcrumbs: 'workspaces/changeBreadcrumbs',
+         setUnsavedChanges: 'workspaces/setUnsavedChanges',
+         newTab: 'workspaces/newTab',
+         removeTab: 'workspaces/removeTab',
+         renameTabs: 'workspaces/renameTabs'
+      }),
+      async saveChanges () {
+         if (this.isSaving) return;
+         this.isSaving = true;
+         const params = {
+            uid: this.connection.uid,
+            schema: this.schema,
+            ...this.localRoutine
+         };
+
+         try {
+            const { status, response } = await Routines.createRoutine(params);
+
+            if (status === 'success') {
+               await this.refreshStructure(this.connection.uid);
+
+               this.newTab({
+                  uid: this.connection.uid,
+                  schema: this.schema,
+                  elementName: this.localRoutine.name,
+                  elementType: 'routine',
+                  type: 'routine-props'
+               });
+
+               this.removeTab({ uid: this.connection.uid, tab: this.tab.uid });
+               this.changeBreadcrumbs({ schema: this.schema, routine: this.localRoutine.name });
+            }
+            else
+               this.addNotification({ status: 'error', message: response });
+         }
+         catch (err) {
+            this.addNotification({ status: 'error', message: err.stack });
+         }
+
+         this.isSaving = false;
+      },
+      clearChanges () {
+         this.localRoutine = JSON.parse(JSON.stringify(this.originalRoutine));
+         this.$refs.queryEditor.editor.session.setValue(this.localRoutine.sql);
+      },
+      resizeQueryEditor () {
+         if (this.$refs.queryEditor) {
+            const footer = document.getElementById('footer');
+            const size = window.innerHeight - this.$refs.queryEditor.$el.getBoundingClientRect().top - footer.offsetHeight;
+            this.editorHeight = size;
+            this.$refs.queryEditor.editor.resize();
+         }
+      },
+      parametersUpdate (parameters) {
+         this.localRoutine = { ...this.localRoutine, parameters };
+      },
+      showParamsModal () {
+         this.isParamsModal = true;
+      },
+      hideParamsModal () {
+         this.isParamsModal = false;
+      },
+      showAskParamsModal () {
+         this.isAskingParameters = true;
+      },
+      hideAskParamsModal () {
+         this.isAskingParameters = false;
+      },
+      onKey (e) {
+         if (this.isSelected) {
+            e.stopPropagation();
+            if (e.ctrlKey && e.keyCode === 83) { // CTRL + S
+               if (this.isChanged)
+                  this.saveChanges();
+            }
+         }
+      }
+   }
+};
+</script>
--- a/src/renderer/components/WorkspaceTabNewScheduler.vue
+++ b/src/renderer/components/WorkspaceTabNewScheduler.vue
@@ -0,0 +1,323 @@
+<template>
+   <div v-show="isSelected" class="workspace-query-tab column col-12 columns col-gapless">
+      <div class="workspace-query-runner column col-12">
+         <div class="workspace-query-runner-footer">
+            <div class="workspace-query-buttons">
+               <button
+                  class="btn btn-primary btn-sm"
+                  :disabled="!isChanged"
+                  :class="{'loading':isSaving}"
+                  title="CTRL+S"
+                  @click="saveChanges"
+               >
+                  <i class="mdi mdi-24px mdi-content-save mr-1" />
+                  <span>{{ $t('word.save') }}</span>
+               </button>
+               <button
+                  :disabled="!isChanged"
+                  class="btn btn-link btn-sm mr-0"
+                  :title="$t('message.clearChanges')"
+                  @click="clearChanges"
+               >
+                  <i class="mdi mdi-24px mdi-delete-sweep mr-1" />
+                  <span>{{ $t('word.clear') }}</span>
+               </button>
+
+               <div class="divider-vert py-3" />
+               <button class="btn btn-dark btn-sm" @click="showTimingModal">
+                  <i class="mdi mdi-24px mdi-timer mr-1" />
+                  <span>{{ $t('word.timing') }}</span>
+               </button>
+            </div>
+            <div class="workspace-query-info">
+               <div class="d-flex" :title="$t('word.schema')">
+                  <i class="mdi mdi-18px mdi-database mr-1" /><b>{{ schema }}</b>
+               </div>
+            </div>
+         </div>
+      </div>
+      <div class="container">
+         <div class="columns">
+            <div class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">{{ $t('word.name') }}</label>
+                  <input
+                     ref="firstInput"
+                     v-model="localScheduler.name"
+                     class="form-input"
+                     type="text"
+                  >
+               </div>
+            </div>
+            <div class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">{{ $t('word.definer') }}</label>
+                  <select
+                     v-if="workspace.users.length"
+                     v-model="localScheduler.definer"
+                     class="form-select"
+                  >
+                     <option value="">
+                        {{ $t('message.currentUser') }}
+                     </option>
+                     <option v-if="!isDefinerInUsers" :value="originalScheduler.definer">
+                        {{ originalScheduler.definer.replaceAll('`', '') }}
+                     </option>
+                     <option
+                        v-for="user in workspace.users"
+                        :key="`${user.name}@${user.host}`"
+                        :value="`\`${user.name}\`@\`${user.host}\``"
+                     >
+                        {{ user.name }}@{{ user.host }}
+                     </option>
+                  </select>
+                  <select v-if="!workspace.users.length" class="form-select">
+                     <option value="">
+                        {{ $t('message.currentUser') }}
+                     </option>
+                  </select>
+               </div>
+            </div>
+            <div class="column">
+               <div class="form-group">
+                  <label class="form-label">{{ $t('word.comment') }}</label>
+                  <input
+                     v-model="localScheduler.comment"
+                     class="form-input"
+                     type="text"
+                  >
+               </div>
+            </div>
+            <div class="column">
+               <div class="form-group">
+                  <label class="form-label mr-2">{{ $t('word.state') }}</label>
+                  <label class="form-radio form-inline">
+                     <input
+                        v-model="localScheduler.state"
+                        type="radio"
+                        name="state"
+                        value="ENABLE"
+                     ><i class="form-icon" /> ENABLE
+                  </label>
+                  <label class="form-radio form-inline">
+                     <input
+                        v-model="localScheduler.state"
+                        type="radio"
+                        name="state"
+                        value="DISABLE"
+                     ><i class="form-icon" /> DISABLE
+                  </label>
+                  <label class="form-radio form-inline">
+                     <input
+                        v-model="localScheduler.state"
+                        type="radio"
+                        name="state"
+                        value="DISABLE ON SLAVE"
+                     ><i class="form-icon" /> DISABLE ON SLAVE
+                  </label>
+               </div>
+            </div>
+         </div>
+      </div>
+      <div class="workspace-query-results column col-12 mt-2 p-relative">
+         <BaseLoader v-if="isLoading" />
+         <label class="form-label ml-2">{{ $t('message.schedulerBody') }}</label>
+         <QueryEditor
+            v-show="isSelected"
+            ref="queryEditor"
+            :value.sync="localScheduler.sql"
+            :workspace="workspace"
+            :schema="schema"
+            :height="editorHeight"
+         />
+      </div>
+      <WorkspaceTabPropsSchedulerTimingModal
+         v-if="isTimingModal"
+         :local-options="localScheduler"
+         :workspace="workspace"
+         @hide="hideTimingModal"
+         @options-update="timingUpdate"
+      />
+   </div>
+</template>
+
+<script>
+import { mapGetters, mapActions } from 'vuex';
+import BaseLoader from '@/components/BaseLoader';
+import QueryEditor from '@/components/QueryEditor';
+import WorkspaceTabPropsSchedulerTimingModal from '@/components/WorkspaceTabPropsSchedulerTimingModal';
+import Schedulers from '@/ipc-api/Schedulers';
+
+export default {
+   name: 'WorkspaceTabNewScheduler',
+   components: {
+      BaseLoader,
+      QueryEditor,
+      WorkspaceTabPropsSchedulerTimingModal
+   },
+   props: {
+      connection: Object,
+      tab: Object,
+      isSelected: Boolean,
+      schema: String
+   },
+   data () {
+      return {
+         isLoading: false,
+         isSaving: false,
+         isTimingModal: false,
+         originalScheduler: {},
+         localScheduler: {},
+         lastScheduler: null,
+         sqlProxy: '',
+         editorHeight: 300
+      };
+   },
+   computed: {
+      ...mapGetters({
+         selectedWorkspace: 'workspaces/getSelected',
+         getWorkspace: 'workspaces/getWorkspace'
+      }),
+      workspace () {
+         return this.getWorkspace(this.connection.uid);
+      },
+      tabUid () {
+         return this.$vnode.key;
+      },
+      isChanged () {
+         return JSON.stringify(this.originalScheduler) !== JSON.stringify(this.localScheduler);
+      },
+      isDefinerInUsers () {
+         return this.originalScheduler ? this.workspace.users.some(user => this.originalScheduler.definer === `\`${user.name}\`@\`${user.host}\``) : true;
+      },
+      schemaTables () {
+         const schemaTables = this.workspace.structure
+            .filter(schema => schema.name === this.schema)
+            .map(schema => schema.tables);
+
+         return schemaTables.length ? schemaTables[0].filter(table => table.type === 'table') : [];
+      }
+   },
+   watch: {
+      isSelected (val) {
+         if (val)
+            this.changeBreadcrumbs({ schema: this.schema });
+      },
+      isChanged (val) {
+         this.setUnsavedChanges({ uid: this.connection.uid, tUid: this.tabUid, isChanged: val });
+      }
+   },
+   async created () {
+      this.originalScheduler = {
+         definer: '',
+         sql: 'BEGIN\r\n\r\nEND',
+         name: '',
+         comment: '',
+         execution: 'EVERY',
+         every: ['1', 'DAY'],
+         preserve: true,
+         state: 'DISABLE'
+      };
+
+      this.localScheduler = JSON.parse(JSON.stringify(this.originalScheduler));
+
+      setTimeout(() => {
+         this.resizeQueryEditor();
+      }, 50);
+
+      window.addEventListener('keydown', this.onKey);
+   },
+   mounted () {
+      if (this.isSelected)
+         this.changeBreadcrumbs({ schema: this.schema });
+
+      setTimeout(() => {
+         this.$refs.firstInput.focus();
+      }, 100);
+
+      window.addEventListener('resize', this.resizeQueryEditor);
+   },
+   destroyed () {
+      window.removeEventListener('resize', this.resizeQueryEditor);
+   },
+   beforeDestroy () {
+      window.removeEventListener('keydown', this.onKey);
+   },
+   methods: {
+      ...mapActions({
+         addNotification: 'notifications/addNotification',
+         refreshStructure: 'workspaces/refreshStructure',
+         changeBreadcrumbs: 'workspaces/changeBreadcrumbs',
+         setUnsavedChanges: 'workspaces/setUnsavedChanges',
+         newTab: 'workspaces/newTab',
+         removeTab: 'workspaces/removeTab',
+         renameTabs: 'workspaces/renameTabs'
+      }),
+      async saveChanges () {
+         if (this.isSaving) return;
+         this.isSaving = true;
+         const params = {
+            uid: this.connection.uid,
+            schema: this.schema,
+            ...this.localScheduler
+         };
+
+         try {
+            const { status, response } = await Schedulers.createScheduler(params);
+
+            if (status === 'success') {
+               await this.refreshStructure(this.connection.uid);
+
+               this.newTab({
+                  uid: this.connection.uid,
+                  schema: this.schema,
+                  elementName: this.localScheduler.name,
+                  elementType: 'scheduler',
+                  type: 'scheduler-props'
+               });
+
+               this.removeTab({ uid: this.connection.uid, tab: this.tab.uid });
+               this.changeBreadcrumbs({ schema: this.schema, scheduler: this.localScheduler.name });
+            }
+            else
+               this.addNotification({ status: 'error', message: response });
+         }
+         catch (err) {
+            this.addNotification({ status: 'error', message: err.stack });
+         }
+
+         this.isSaving = false;
+      },
+      clearChanges () {
+         this.localScheduler = JSON.parse(JSON.stringify(this.originalScheduler));
+         this.$refs.queryEditor.editor.session.setValue(this.localScheduler.sql);
+      },
+      resizeQueryEditor () {
+         if (this.$refs.queryEditor) {
+            const footer = document.getElementById('footer');
+            const size = window.innerHeight - this.$refs.queryEditor.$el.getBoundingClientRect().top - footer.offsetHeight;
+            this.editorHeight = size;
+            this.$refs.queryEditor.editor.resize();
+         }
+      },
+      showTimingModal () {
+         this.isTimingModal = true;
+      },
+      hideTimingModal () {
+         this.isTimingModal = false;
+      },
+      timingUpdate (options) {
+         this.localScheduler = options;
+      },
+      onKey (e) {
+         if (this.isSelected) {
+            e.stopPropagation();
+            if (e.ctrlKey && e.keyCode === 83) { // CTRL + S
+               if (this.isChanged)
+                  this.saveChanges();
+            }
+         }
+      }
+   }
+};
+</script>
--- a/src/renderer/components/WorkspaceTabNewTable.vue
+++ b/src/renderer/components/WorkspaceTabNewTable.vue
@@ -0,0 +1,452 @@
+<template>
+   <div v-show="isSelected" class="workspace-query-tab column col-12 columns col-gapless">
+      <div class="workspace-query-runner column col-12">
+         <div class="workspace-query-runner-footer">
+            <div class="workspace-query-buttons">
+               <button
+                  class="btn btn-primary btn-sm"
+                  :disabled="!isChanged"
+                  :class="{'loading':isSaving}"
+                  title="CTRL+S"
+                  @click="saveChanges"
+               >
+                  <i class="mdi mdi-24px mdi-content-save mr-1" />
+                  <span>{{ $t('word.save') }}</span>
+               </button>
+               <button
+                  :disabled="!isChanged || isSaving"
+                  class="btn btn-link btn-sm mr-0"
+                  :title="$t('message.clearChanges')"
+                  @click="clearChanges"
+               >
+                  <i class="mdi mdi-24px mdi-delete-sweep mr-1" />
+                  <span>{{ $t('word.clear') }}</span>
+               </button>
+
+               <div class="divider-vert py-3" />
+
+               <button
+                  :disabled="isSaving"
+                  class="btn btn-dark btn-sm"
+                  :title="$t('message.addNewField')"
+                  @click="addField"
+               >
+                  <i class="mdi mdi-24px mdi-playlist-plus mr-1" />
+                  <span>{{ $t('word.add') }}</span>
+               </button>
+               <button
+                  :disabled="isSaving || !localFields.length"
+                  class="btn btn-dark btn-sm"
+                  :title="$t('message.manageIndexes')"
+                  @click="showIntdexesModal"
+               >
+                  <i class="mdi mdi-24px mdi-key mdi-rotate-45 mr-1" />
+                  <span>{{ $t('word.indexes') }}</span>
+               </button>
+               <button
+                  class="btn btn-dark btn-sm"
+                  :disabled="isSaving || !localFields.length"
+                  @click="showForeignModal"
+               >
+                  <i class="mdi mdi-24px mdi-key-link mr-1" />
+                  <span>{{ $t('word.foreignKeys') }}</span>
+               </button>
+            </div>
+            <div class="workspace-query-info">
+               <div class="d-flex" :title="$t('word.schema')">
+                  <i class="mdi mdi-18px mdi-database mr-1" /><b>{{ schema }}</b>
+               </div>
+            </div>
+         </div>
+      </div>
+      <div class="container">
+         <div class="columns mb-4">
+            <div class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">{{ $t('word.name') }}</label>
+                  <input
+                     ref="firstInput"
+                     v-model="localOptions.name"
+                     class="form-input"
+                     type="text"
+                  >
+               </div>
+            </div>
+            <div v-if="workspace.customizations.comment" class="column">
+               <div class="form-group">
+                  <label class="form-label">{{ $t('word.comment') }}</label>
+                  <input
+                     v-model="localOptions.comment"
+                     class="form-input"
+                     type="text"
+                  >
+               </div>
+            </div>
+
+            <div v-if="workspace.customizations.collations" class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('word.collation') }}
+                  </label>
+                  <select v-model="localOptions.collation" class="form-select">
+                     <option
+                        v-for="collation in workspace.collations"
+                        :key="collation.id"
+                        :value="collation.collation"
+                     >
+                        {{ collation.collation }}
+                     </option>
+                  </select>
+               </div>
+            </div>
+            <div v-if="workspace.customizations.engines" class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('word.engine') }}
+                  </label>
+                  <select v-model="localOptions.engine" class="form-select">
+                     <option
+                        v-for="engine in workspace.engines"
+                        :key="engine.name"
+                        :value="engine.name"
+                     >
+                        {{ engine.name }}
+                     </option>
+                  </select>
+               </div>
+            </div>
+         </div>
+      </div>
+      <div class="workspace-query-results column col-12 p-relative">
+         <BaseLoader v-if="isLoading" />
+         <WorkspaceTabNewTableEmptyState v-if="!localFields.length" @new-field="addField" />
+         <WorkspaceTabPropsTableFields
+            v-if="localFields.length"
+            ref="indexTable"
+            :fields="localFields"
+            :indexes="localIndexes"
+            :foreigns="localKeyUsage"
+            :tab-uid="tabUid"
+            :conn-uid="connection.uid"
+            :index-types="workspace.indexTypes"
+            table="new"
+            :schema="schema"
+            mode="table"
+            @duplicate-field="duplicateField"
+            @remove-field="removeField"
+            @add-new-index="addNewIndex"
+            @add-to-index="addToIndex"
+            @rename-field="renameField"
+         />
+      </div>
+      <WorkspaceTabPropsTableIndexesModal
+         v-if="isIndexesModal"
+         :local-indexes="localIndexes"
+         table="new"
+         :fields="localFields"
+         :index-types="workspace.indexTypes"
+         :workspace="workspace"
+         @hide="hideIndexesModal"
+         @indexes-update="indexesUpdate"
+      />
+      <WorkspaceTabPropsTableForeignModal
+         v-if="isForeignModal"
+         :local-key-usage="localKeyUsage"
+         :connection="connection"
+         table="new"
+         :schema="schema"
+         :schema-tables="schemaTables"
+         :fields="localFields"
+         :workspace="workspace"
+         @hide="hideForeignModal"
+         @foreigns-update="foreignsUpdate"
+      />
+   </div>
+</template>
+
+<script>
+import { mapGetters, mapActions } from 'vuex';
+import { uidGen } from 'common/libs/uidGen';
+import Tables from '@/ipc-api/Tables';
+import BaseLoader from '@/components/BaseLoader';
+import WorkspaceTabPropsTableFields from '@/components/WorkspaceTabPropsTableFields';
+import WorkspaceTabPropsTableIndexesModal from '@/components/WorkspaceTabPropsTableIndexesModal';
+import WorkspaceTabPropsTableForeignModal from '@/components/WorkspaceTabPropsTableForeignModal';
+import WorkspaceTabNewTableEmptyState from '@/components/WorkspaceTabNewTableEmptyState';
+
+export default {
+   name: 'WorkspaceTabNewTable',
+   components: {
+      BaseLoader,
+      WorkspaceTabPropsTableFields,
+      WorkspaceTabPropsTableIndexesModal,
+      WorkspaceTabPropsTableForeignModal,
+      WorkspaceTabNewTableEmptyState
+   },
+   props: {
+      connection: Object,
+      tab: Object,
+      isSelected: Boolean,
+      schema: String
+   },
+   data () {
+      return {
+         isLoading: false,
+         isSaving: false,
+         isIndexesModal: false,
+         isForeignModal: false,
+         isOptionsChanging: false,
+         originalFields: [],
+         localFields: [],
+         originalKeyUsage: [],
+         localKeyUsage: [],
+         originalIndexes: [],
+         localIndexes: [],
+         tableOptions: {},
+         localOptions: {},
+         lastTable: null,
+         newFieldsCounter: 0
+      };
+   },
+   computed: {
+      ...mapGetters({
+         getWorkspace: 'workspaces/getWorkspace',
+         selectedWorkspace: 'workspaces/getSelected',
+         getDatabaseVariable: 'workspaces/getDatabaseVariable'
+      }),
+      workspace () {
+         return this.getWorkspace(this.connection.uid);
+      },
+      tabUid () {
+         return this.$vnode.key;
+      },
+      defaultCollation () {
+         if (this.workspace.customizations.collations)
+            return this.getDatabaseVariable(this.selectedWorkspace, 'collation_server').value || '';
+         return '';
+      },
+      defaultEngine () {
+         if (this.workspace.customizations.engines)
+            return this.workspace.engines.find(engine => engine.isDefault).name;
+         return '';
+      },
+      schemaTables () {
+         const schemaTables = this.workspace.structure
+            .filter(schema => schema.name === this.schema)
+            .map(schema => schema.tables);
+
+         return schemaTables.length ? schemaTables[0].filter(table => table.type === 'table') : [];
+      },
+      isChanged () {
+         return JSON.stringify(this.originalFields) !== JSON.stringify(this.localFields) ||
+            JSON.stringify(this.originalKeyUsage) !== JSON.stringify(this.localKeyUsage) ||
+            JSON.stringify(this.originalIndexes) !== JSON.stringify(this.localIndexes) ||
+            JSON.stringify(this.tableOptions) !== JSON.stringify(this.localOptions);
+      }
+   },
+   watch: {
+      isSelected (val) {
+         if (val)
+            this.changeBreadcrumbs({ schema: this.schema });
+      },
+      isChanged (val) {
+         this.setUnsavedChanges({ uid: this.connection.uid, tUid: this.tabUid, isChanged: val });
+      }
+   },
+   created () {
+      this.tableOptions = {
+         name: '',
+         type: 'table',
+         engine: this.defaultEngine,
+         comment: '',
+         collation: this.defaultCollation
+      };
+
+      this.localOptions = JSON.parse(JSON.stringify(this.tableOptions));
+      window.addEventListener('keydown', this.onKey);
+   },
+   mounted () {
+      if (this.isSelected)
+         this.changeBreadcrumbs({ schema: this.schema });
+
+      setTimeout(() => {
+         this.$refs.firstInput.focus();
+      }, 100);
+   },
+   beforeDestroy () {
+      window.removeEventListener('keydown', this.onKey);
+   },
+   methods: {
+      ...mapActions({
+         addNotification: 'notifications/addNotification',
+         refreshStructure: 'workspaces/refreshStructure',
+         setUnsavedChanges: 'workspaces/setUnsavedChanges',
+         newTab: 'workspaces/newTab',
+         renameTabs: 'workspaces/renameTabs',
+         removeTab: 'workspaces/removeTab',
+         changeBreadcrumbs: 'workspaces/changeBreadcrumbs'
+      }),
+      async saveChanges () {
+         if (this.isSaving) return;
+         this.isSaving = true;
+
+         const params = {
+            uid: this.connection.uid,
+            schema: this.schema,
+            fields: this.localFields,
+            foreigns: this.localKeyUsage,
+            indexes: this.localIndexes,
+            options: this.localOptions
+         };
+
+         try {
+            const { status, response } = await Tables.createTable(params);
+
+            if (status === 'success') {
+               await this.refreshStructure(this.connection.uid);
+
+               this.newTab({
+                  uid: this.connection.uid,
+                  schema: this.schema,
+                  elementName: this.localOptions.name,
+                  elementType: 'table',
+                  type: 'table-props'
+               });
+
+               this.removeTab({ uid: this.connection.uid, tab: this.tab.uid });
+               this.changeBreadcrumbs({ schema: this.schema, table: this.localOptions.name });
+            }
+            else
+               this.addNotification({ status: 'error', message: response });
+         }
+         catch (err) {
+            this.addNotification({ status: 'error', message: err.stack });
+         }
+
+         this.isSaving = false;
+         this.newFieldsCounter = 0;
+      },
+      clearChanges () {
+         this.localFields = JSON.parse(JSON.stringify(this.originalFields));
+         this.localIndexes = JSON.parse(JSON.stringify(this.originalIndexes));
+         this.localKeyUsage = JSON.parse(JSON.stringify(this.originalKeyUsage));
+
+         this.tableOptions = {
+            name: '',
+            type: 'table',
+            engine: this.defaultEngine,
+            comment: '',
+            collation: this.defaultCollation
+         };
+
+         this.localOptions = JSON.parse(JSON.stringify(this.tableOptions));
+         this.newFieldsCounter = 0;
+      },
+      addField () {
+         this.localFields.push({
+            _id: uidGen(),
+            name: `${this.$tc('word.field', 1)}_${++this.newFieldsCounter}`,
+            key: '',
+            type: this.workspace.dataTypes[0].types[0].name,
+            schema: this.schema,
+            numPrecision: null,
+            numLength: this.workspace.dataTypes[0].types[0].length,
+            datePrecision: null,
+            charLength: null,
+            nullable: false,
+            unsigned: false,
+            zerofill: false,
+            order: this.localFields.length + 1,
+            default: null,
+            charset: null,
+            collation: null,
+            autoIncrement: false,
+            onUpdate: '',
+            comment: ''
+         });
+
+         setTimeout(() => {
+            const scrollable = this.$refs.indexTable.$refs.tableWrapper;
+            scrollable.scrollTop = scrollable.scrollHeight + 30;
+         }, 20);
+      },
+      renameField (payload) {
+         this.localIndexes = this.localIndexes.map(index => {
+            const fi = index.fields.findIndex(field => field === payload.old);
+            if (fi !== -1)
+               index.fields[fi] = payload.new;
+            return index;
+         });
+
+         this.localKeyUsage = this.localKeyUsage.map(key => {
+            if (key.field === payload.old)
+               key.field = payload.new;
+            return key;
+         });
+      },
+      duplicateField (uid) {
+         const fieldToClone = Object.assign({}, this.localFields.find(field => field._id === uid));
+         fieldToClone._id = uidGen();
+         fieldToClone.name = `${fieldToClone.name}_copy`;
+         fieldToClone.order = this.localFields.length + 1;
+         this.localFields = [...this.localFields, fieldToClone];
+
+         setTimeout(() => {
+            const scrollable = this.$refs.indexTable.$refs.tableWrapper;
+            scrollable.scrollTop = scrollable.scrollHeight + 30;
+         }, 20);
+      },
+      removeField (uid) {
+         this.localFields = this.localFields.filter(field => field._id !== uid);
+      },
+      addNewIndex (payload) {
+         this.localIndexes = [...this.localIndexes, {
+            _id: uidGen(),
+            name: payload.index === 'PRIMARY' ? 'PRIMARY' : payload.field,
+            fields: [payload.field],
+            type: payload.index,
+            comment: '',
+            indexType: 'BTREE',
+            indexComment: '',
+            cardinality: 0
+         }];
+      },
+      addToIndex (payload) {
+         this.localIndexes = this.localIndexes.map(index => {
+            if (index._id === payload.index) index.fields.push(payload.field);
+            return index;
+         });
+      },
+      optionsUpdate (options) {
+         this.localOptions = options;
+      },
+      showIntdexesModal () {
+         this.isIndexesModal = true;
+      },
+      hideIndexesModal () {
+         this.isIndexesModal = false;
+      },
+      indexesUpdate (indexes) {
+         this.localIndexes = indexes;
+      },
+      showForeignModal () {
+         this.isForeignModal = true;
+      },
+      hideForeignModal () {
+         this.isForeignModal = false;
+      },
+      foreignsUpdate (foreigns) {
+         this.localKeyUsage = foreigns;
+      },
+      onKey (e) {
+         if (this.isSelected) {
+            e.stopPropagation();
+            if (e.ctrlKey && e.keyCode === 83) { // CTRL + S
+               if (this.isChanged)
+                  this.saveChanges();
+            }
+         }
+      }
+   }
+};
+</script>
--- a/src/renderer/components/WorkspaceTabNewTableEmptyState.vue
+++ b/src/renderer/components/WorkspaceTabNewTableEmptyState.vue
@@ -0,0 +1,33 @@
+<template>
+   <div class="column col-12 empty">
+      <p class="h6 empty-subtitle">
+         {{ $t('message.thereAreNoTableFields') }}
+      </p>
+      <div class="empty-action">
+         <button class="btn btn-gray d-flex" @click="$emit('new-field')">
+            <i class="mdi mdi-24px mdi-playlist-plus mr-2" />
+            {{ $t('message.addNewField') }}
+         </button>
+      </div>
+   </div>
+</template>
+
+<script>
+export default {
+   name: 'WorkspaceTabNewTableEmptyState'
+};
+</script>
+
+<style scoped>
+  .empty {
+    border-radius: 0;
+    background: transparent;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    margin-left: auto;
+    margin-right: auto;
+    z-index: 9;
+  }
+</style>
--- a/src/renderer/components/WorkspaceTabNewTrigger.vue
+++ b/src/renderer/components/WorkspaceTabNewTrigger.vue
@@ -0,0 +1,323 @@
+<template>
+   <div v-show="isSelected" class="workspace-query-tab column col-12 columns col-gapless">
+      <div class="workspace-query-runner column col-12">
+         <div class="workspace-query-runner-footer">
+            <div class="workspace-query-buttons">
+               <button
+                  class="btn btn-primary btn-sm"
+                  :disabled="!isChanged"
+                  :class="{'loading':isSaving}"
+                  title="CTRL+S"
+                  @click="saveChanges"
+               >
+                  <i class="mdi mdi-24px mdi-content-save mr-1" />
+                  <span>{{ $t('word.save') }}</span>
+               </button>
+               <button
+                  :disabled="!isChanged"
+                  class="btn btn-link btn-sm mr-0"
+                  :title="$t('message.clearChanges')"
+                  @click="clearChanges"
+               >
+                  <i class="mdi mdi-24px mdi-delete-sweep mr-1" />
+                  <span>{{ $t('word.clear') }}</span>
+               </button>
+            </div>
+            <div class="workspace-query-info">
+               <div class="d-flex" :title="$t('word.schema')">
+                  <i class="mdi mdi-18px mdi-database mr-1" /><b>{{ schema }}</b>
+               </div>
+            </div>
+         </div>
+      </div>
+      <div class="container">
+         <div class="columns">
+            <div class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">{{ $t('word.name') }}</label>
+                  <input
+                     ref="firstInput"
+                     v-model="localTrigger.name"
+                     class="form-input"
+                     type="text"
+                  >
+               </div>
+            </div>
+            <div v-if="customizations.definer" class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">{{ $t('word.definer') }}</label>
+                  <select
+                     v-if="workspace.users.length"
+                     v-model="localTrigger.definer"
+                     class="form-select"
+                  >
+                     <option value="">
+                        {{ $t('message.currentUser') }}
+                     </option>
+                     <option v-if="!isDefinerInUsers" :value="originalTrigger.definer">
+                        {{ originalTrigger.definer.replaceAll('`', '') }}
+                     </option>
+                     <option
+                        v-for="user in workspace.users"
+                        :key="`${user.name}@${user.host}`"
+                        :value="`\`${user.name}\`@\`${user.host}\``"
+                     >
+                        {{ user.name }}@{{ user.host }}
+                     </option>
+                  </select>
+                  <select v-if="!workspace.users.length" class="form-select">
+                     <option value="">
+                        {{ $t('message.currentUser') }}
+                     </option>
+                  </select>
+               </div>
+            </div>
+            <fieldset class="column columns mb-0" :disabled="customizations.triggerOnlyRename">
+               <div class="column col-auto">
+                  <div class="form-group">
+                     <label class="form-label">{{ $t('word.table') }}</label>
+                     <select v-model="localTrigger.table" class="form-select">
+                        <option v-for="table in schemaTables" :key="table.name">
+                           {{ table.name }}
+                        </option>
+                     </select>
+                  </div>
+               </div>
+               <div class="column col-auto">
+                  <div class="form-group">
+                     <label class="form-label">{{ $t('word.event') }}</label>
+                     <div class="input-group">
+                        <select v-model="localTrigger.activation" class="form-select">
+                           <option>BEFORE</option>
+                           <option>AFTER</option>
+                        </select>
+                        <select
+                           v-if="!customizations.triggerMultipleEvents"
+                           v-model="localTrigger.event"
+                           class="form-select"
+                        >
+                           <option v-for="event in Object.keys(localEvents)" :key="event">
+                              {{ event }}
+                           </option>
+                        </select>
+                        <div v-if="customizations.triggerMultipleEvents" class="px-4">
+                           <label
+                              v-for="event in Object.keys(localEvents)"
+                              :key="event"
+                              class="form-checkbox form-inline"
+                              @change.prevent="changeEvents(event)"
+                           >
+                              <input :checked="localEvents[event]" type="checkbox"><i class="form-icon" /> {{ event }}
+                           </label>
+                        </div>
+                     </div>
+                  </div>
+               </div>
+            </fieldset>
+         </div>
+      </div>
+      <div class="workspace-query-results column col-12 mt-2 p-relative">
+         <BaseLoader v-if="isLoading" />
+         <label class="form-label ml-2">{{ $t('message.triggerStatement') }}</label>
+         <QueryEditor
+            v-show="isSelected"
+            ref="queryEditor"
+            :value.sync="localTrigger.sql"
+            :workspace="workspace"
+            :schema="schema"
+            :height="editorHeight"
+         />
+      </div>
+   </div>
+</template>
+
+<script>
+import QueryEditor from '@/components/QueryEditor';
+import { mapGetters, mapActions } from 'vuex';
+import BaseLoader from '@/components/BaseLoader';
+import Triggers from '@/ipc-api/Triggers';
+
+export default {
+   name: 'WorkspaceTabNewTrigger',
+   components: {
+      BaseLoader,
+      QueryEditor
+   },
+   props: {
+      connection: Object,
+      tab: Object,
+      isSelected: Boolean,
+      schema: String
+   },
+   data () {
+      return {
+         isLoading: false,
+         isSaving: false,
+         originalTrigger: {},
+         localTrigger: {},
+         lastTrigger: null,
+         sqlProxy: '',
+         editorHeight: 300,
+         localEvents: { INSERT: false, UPDATE: false, DELETE: false }
+      };
+   },
+   computed: {
+      ...mapGetters({
+         selectedWorkspace: 'workspaces/getSelected',
+         getWorkspace: 'workspaces/getWorkspace'
+      }),
+      workspace () {
+         return this.getWorkspace(this.connection.uid);
+      },
+      tabUid () {
+         return this.$vnode.key;
+      },
+      customizations () {
+         return this.workspace.customizations;
+      },
+      isChanged () {
+         return JSON.stringify(this.originalTrigger) !== JSON.stringify(this.localTrigger);
+      },
+      isDefinerInUsers () {
+         return this.originalTrigger ? this.workspace.users.some(user => this.originalTrigger.definer === `\`${user.name}\`@\`${user.host}\``) : true;
+      },
+      schemaTables () {
+         const schemaTables = this.workspace.structure
+            .filter(schema => schema.name === this.schema)
+            .map(schema => schema.tables);
+
+         return schemaTables.length ? schemaTables[0].filter(table => table.type === 'table') : [];
+      }
+   },
+   watch: {
+      isSelected (val) {
+         if (val)
+            this.changeBreadcrumbs({ schema: this.schema });
+      },
+      isChanged (val) {
+         this.setUnsavedChanges({ uid: this.connection.uid, tUid: this.tabUid, isChanged: val });
+      }
+   },
+   created () {
+      this.originalTrigger = {
+         sql: this.customizations.triggerSql,
+         definer: '',
+         table: this.schemaTables.length ? this.schemaTables[0].name : null,
+         activation: 'BEFORE',
+         event: this.customizations.triggerMultipleEvents ? ['INSERT'] : 'INSERT',
+         name: ''
+      };
+
+      this.localTrigger = JSON.parse(JSON.stringify(this.originalTrigger));
+
+      setTimeout(() => {
+         this.resizeQueryEditor();
+      }, 50);
+
+      window.addEventListener('keydown', this.onKey);
+   },
+   mounted () {
+      if (this.isSelected)
+         this.changeBreadcrumbs({ schema: this.schema });
+
+      setTimeout(() => {
+         this.$refs.firstInput.focus();
+      }, 100);
+
+      window.addEventListener('resize', this.resizeQueryEditor);
+   },
+   destroyed () {
+      window.removeEventListener('resize', this.resizeQueryEditor);
+   },
+   beforeDestroy () {
+      window.removeEventListener('keydown', this.onKey);
+   },
+   methods: {
+      ...mapActions({
+         addNotification: 'notifications/addNotification',
+         refreshStructure: 'workspaces/refreshStructure',
+         changeBreadcrumbs: 'workspaces/changeBreadcrumbs',
+         setUnsavedChanges: 'workspaces/setUnsavedChanges',
+         newTab: 'workspaces/newTab',
+         removeTab: 'workspaces/removeTab',
+         renameTabs: 'workspaces/renameTabs'
+      }),
+      changeEvents (event) {
+         if (this.customizations.triggerMultipleEvents) {
+            this.localEvents[event] = !this.localEvents[event];
+            this.localTrigger.event = [];
+            for (const key in this.localEvents) {
+               if (this.localEvents[key])
+                  this.localTrigger.event.push(key);
+            }
+         }
+      },
+      async saveChanges () {
+         if (this.isSaving) return;
+         this.isSaving = true;
+         const params = {
+            uid: this.connection.uid,
+            schema: this.schema,
+            ...this.localTrigger
+         };
+
+         try {
+            const { status, response } = await Triggers.createTrigger(params);
+
+            if (status === 'success') {
+               await this.refreshStructure(this.connection.uid);
+
+               this.newTab({
+                  uid: this.connection.uid,
+                  schema: this.schema,
+                  elementName: this.localTrigger.name,
+                  elementType: 'trigger',
+                  type: 'trigger-props'
+               });
+
+               this.removeTab({ uid: this.connection.uid, tab: this.tab.uid });
+               this.changeBreadcrumbs({ schema: this.schema, trigger: this.localTrigger.name });
+            }
+            else
+               this.addNotification({ status: 'error', message: response });
+         }
+         catch (err) {
+            this.addNotification({ status: 'error', message: err.stack });
+         }
+
+         this.isSaving = false;
+      },
+      clearChanges () {
+         this.localTrigger = JSON.parse(JSON.stringify(this.originalTrigger));
+         this.$refs.queryEditor.editor.session.setValue(this.localTrigger.sql);
+
+         Object.keys(this.localEvents).forEach(event => {
+            this.localEvents[event] = false;
+         });
+
+         if (this.customizations.triggerMultipleEvents) {
+            this.originalTrigger.event.forEach(e => {
+               this.localEvents[e] = true;
+            });
+         }
+      },
+      resizeQueryEditor () {
+         if (this.$refs.queryEditor) {
+            const footer = document.getElementById('footer');
+            const size = window.innerHeight - this.$refs.queryEditor.$el.getBoundingClientRect().top - footer.offsetHeight;
+            this.editorHeight = size;
+            this.$refs.queryEditor.editor.resize();
+         }
+      },
+      onKey (e) {
+         if (this.isSelected) {
+            e.stopPropagation();
+            if (e.ctrlKey && e.keyCode === 83) { // CTRL + S
+               if (this.isChanged)
+                  this.saveChanges();
+            }
+         }
+      }
+   }
+};
+</script>
--- a/src/renderer/components/WorkspaceTabNewTriggerFunction.vue
+++ b/src/renderer/components/WorkspaceTabNewTriggerFunction.vue
@@ -0,0 +1,279 @@
+<template>
+   <div v-show="isSelected" class="workspace-query-tab column col-12 columns col-gapless">
+      <div class="workspace-query-runner column col-12">
+         <div class="workspace-query-runner-footer">
+            <div class="workspace-query-buttons">
+               <button
+                  class="btn btn-primary btn-sm"
+                  :disabled="!isChanged"
+                  :class="{'loading':isSaving}"
+                  title="CTRL+S"
+                  @click="saveChanges"
+               >
+                  <i class="mdi mdi-24px mdi-content-save mr-1" />
+                  <span>{{ $t('word.save') }}</span>
+               </button>
+               <button
+                  :disabled="!isChanged"
+                  class="btn btn-link btn-sm mr-0"
+                  :title="$t('message.clearChanges')"
+                  @click="clearChanges"
+               >
+                  <i class="mdi mdi-24px mdi-delete-sweep mr-1" />
+                  <span>{{ $t('word.clear') }}</span>
+               </button>
+            </div>
+         </div>
+      </div>
+      <div class="container">
+         <div class="columns">
+            <div class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('word.name') }}
+                  </label>
+                  <input
+                     ref="firstInput"
+                     v-model="localFunction.name"
+                     class="form-input"
+                     type="text"
+                  >
+               </div>
+            </div>
+            <div v-if="customizations.triggerFunctionlanguages" class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('word.language') }}
+                  </label>
+                  <select v-model="localFunction.language" class="form-select">
+                     <option v-for="language in customizations.triggerFunctionlanguages" :key="language">
+                        {{ language }}
+                     </option>
+                  </select>
+               </div>
+            </div>
+            <div v-if="customizations.definer" class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('word.definer') }}
+                  </label>
+                  <select
+                     v-if="workspace.users.length"
+                     v-model="localFunction.definer"
+                     class="form-select"
+                  >
+                     <option value="">
+                        {{ $t('message.currentUser') }}
+                     </option>
+                     <option
+                        v-for="user in workspace.users"
+                        :key="`${user.name}@${user.host}`"
+                        :value="`\`${user.name}\`@\`${user.host}\``"
+                     >
+                        {{ user.name }}@{{ user.host }}
+                     </option>
+                  </select>
+                  <select v-if="!workspace.users.length" class="form-select">
+                     <option value="">
+                        {{ $t('message.currentUser') }}
+                     </option>
+                  </select>
+               </div>
+            </div>
+            <div v-if="customizations.comment" class="form-group">
+               <label class="form-label">
+                  {{ $t('word.comment') }}
+               </label>
+               <input
+                  v-model="localFunction.comment"
+                  class="form-input"
+                  type="text"
+               >
+            </div>
+         </div>
+      </div>
+      <div class="workspace-query-results column col-12 mt-2 p-relative">
+         <BaseLoader v-if="isLoading" />
+         <label class="form-label ml-2">{{ $t('message.functionBody') }}</label>
+         <QueryEditor
+            v-show="isSelected"
+            ref="queryEditor"
+            :value.sync="localFunction.sql"
+            :workspace="workspace"
+            :schema="schema"
+            :height="editorHeight"
+         />
+      </div>
+   </div>
+</template>
+
+<script>
+import { mapGetters, mapActions } from 'vuex';
+import BaseLoader from '@/components/BaseLoader';
+import QueryEditor from '@/components/QueryEditor';
+import Functions from '@/ipc-api/Functions';
+
+export default {
+   name: 'WorkspaceTabNewTriggerFunction',
+   components: {
+      BaseLoader,
+      QueryEditor
+   },
+   props: {
+      connection: Object,
+      tab: Object,
+      isSelected: Boolean,
+      schema: String
+   },
+   data () {
+      return {
+         isLoading: false,
+         isSaving: false,
+         isParamsModal: false,
+         isAskingParameters: false,
+         originalFunction: {},
+         localFunction: {},
+         lastFunction: null,
+         sqlProxy: '',
+         editorHeight: 300
+      };
+   },
+   computed: {
+      ...mapGetters({
+         selectedWorkspace: 'workspaces/getSelected',
+         getWorkspace: 'workspaces/getWorkspace'
+      }),
+      workspace () {
+         return this.getWorkspace(this.connection.uid);
+      },
+      customizations () {
+         return this.workspace.customizations;
+      },
+      tabUid () {
+         return this.$vnode.key;
+      },
+      isChanged () {
+         return JSON.stringify(this.originalFunction) !== JSON.stringify(this.localFunction);
+      },
+      isDefinerInUsers () {
+         return this.originalFunction
+            ? this.workspace.users.some(user => this.originalFunction.definer === `\`${user.name}\`@\`${user.host}\``)
+            : true;
+      },
+      schemaTables () {
+         const schemaTables = this.workspace.structure
+            .filter(schema => schema.name === this.schema)
+            .map(schema => schema.tables);
+
+         return schemaTables.length ? schemaTables[0].filter(table => table.type === 'table') : [];
+      }
+   },
+   watch: {
+      isSelected (val) {
+         if (val)
+            this.changeBreadcrumbs({ schema: this.schema });
+      },
+      isChanged (val) {
+         this.setUnsavedChanges({ uid: this.connection.uid, tUid: this.tabUid, isChanged: val });
+      }
+   },
+   created () {
+      this.originalFunction = {
+         sql: this.customizations.triggerFunctionSql,
+         language: this.customizations.triggerFunctionlanguages.length ? this.customizations.triggerFunctionlanguages[0] : null,
+         name: ''
+      };
+
+      this.localFunction = JSON.parse(JSON.stringify(this.originalFunction));
+
+      setTimeout(() => {
+         this.resizeQueryEditor();
+      }, 50);
+
+      window.addEventListener('keydown', this.onKey);
+   },
+   mounted () {
+      if (this.isSelected)
+         this.changeBreadcrumbs({ schema: this.schema });
+
+      setTimeout(() => {
+         this.$refs.firstInput.focus();
+      }, 100);
+
+      window.addEventListener('resize', this.resizeQueryEditor);
+   },
+   destroyed () {
+      window.removeEventListener('resize', this.resizeQueryEditor);
+   },
+   beforeDestroy () {
+      window.removeEventListener('keydown', this.onKey);
+   },
+   methods: {
+      ...mapActions({
+         addNotification: 'notifications/addNotification',
+         refreshStructure: 'workspaces/refreshStructure',
+         changeBreadcrumbs: 'workspaces/changeBreadcrumbs',
+         setUnsavedChanges: 'workspaces/setUnsavedChanges',
+         newTab: 'workspaces/newTab',
+         removeTab: 'workspaces/removeTab',
+         renameTabs: 'workspaces/renameTabs'
+      }),
+      async saveChanges () {
+         if (this.isSaving) return;
+         this.isSaving = true;
+         const params = {
+            uid: this.connection.uid,
+            schema: this.schema,
+            ...this.localFunction
+         };
+
+         try {
+            const { status, response } = await Functions.createTriggerFunction(params);
+
+            if (status === 'success') {
+               await this.refreshStructure(this.connection.uid);
+
+               this.newTab({
+                  uid: this.connection.uid,
+                  schema: this.schema,
+                  elementName: this.localFunction.name,
+                  elementType: 'triggerFunction',
+                  type: 'trigger-function-props'
+               });
+
+               this.removeTab({ uid: this.connection.uid, tab: this.tab.uid });
+               this.changeBreadcrumbs({ schema: this.schema, triggerFunction: this.localFunction.name });
+            }
+            else
+               this.addNotification({ status: 'error', message: response });
+         }
+         catch (err) {
+            this.addNotification({ status: 'error', message: err.stack });
+         }
+
+         this.isSaving = false;
+      },
+      clearChanges () {
+         this.localFunction = JSON.parse(JSON.stringify(this.originalFunction));
+         this.$refs.queryEditor.editor.session.setValue(this.localFunction.sql);
+      },
+      resizeQueryEditor () {
+         if (this.$refs.queryEditor) {
+            const footer = document.getElementById('footer');
+            const size = window.innerHeight - this.$refs.queryEditor.$el.getBoundingClientRect().top - footer.offsetHeight;
+            this.editorHeight = size;
+            this.$refs.queryEditor.editor.resize();
+         }
+      },
+      onKey (e) {
+         if (this.isSelected) {
+            e.stopPropagation();
+            if (e.ctrlKey && e.keyCode === 83) { // CTRL + S
+               if (this.isChanged)
+                  this.saveChanges();
+            }
+         }
+      }
+   }
+};
+</script>
--- a/src/renderer/components/WorkspaceTabNewView.vue
+++ b/src/renderer/components/WorkspaceTabNewView.vue
@@ -0,0 +1,287 @@
+<template>
+   <div v-show="isSelected" class="workspace-query-tab column col-12 columns col-gapless">
+      <div class="workspace-query-runner column col-12">
+         <div class="workspace-query-runner-footer">
+            <div class="workspace-query-buttons">
+               <button
+                  class="btn btn-primary btn-sm"
+                  :disabled="!isChanged"
+                  :class="{'loading':isSaving}"
+                  title="CTRL+S"
+                  @click="saveChanges"
+               >
+                  <i class="mdi mdi-24px mdi-content-save mr-1" />
+                  <span>{{ $t('word.save') }}</span>
+               </button>
+               <button
+                  :disabled="!isChanged"
+                  class="btn btn-link btn-sm mr-0"
+                  :title="$t('message.clearChanges')"
+                  @click="clearChanges"
+               >
+                  <i class="mdi mdi-24px mdi-delete-sweep mr-1" />
+                  <span>{{ $t('word.clear') }}</span>
+               </button>
+            </div>
+            <div class="workspace-query-info">
+               <div class="d-flex" :title="$t('word.schema')">
+                  <i class="mdi mdi-18px mdi-database mr-1" /><b>{{ schema }}</b>
+               </div>
+            </div>
+         </div>
+      </div>
+      <div class="container">
+         <div class="columns">
+            <div class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">{{ $t('word.name') }}</label>
+                  <input
+                     ref="firstInput"
+                     v-model="localView.name"
+                     class="form-input"
+                     type="text"
+                  >
+               </div>
+            </div>
+            <div class="column col-auto">
+               <div v-if="workspace.customizations.definer" class="form-group">
+                  <label class="form-label">{{ $t('word.definer') }}</label>
+                  <select
+                     v-if="workspace.users.length"
+                     v-model="localView.definer"
+                     class="form-select"
+                  >
+                     <option value="">
+                        {{ $t('message.currentUser') }}
+                     </option>
+                     <option v-if="!isDefinerInUsers" :value="originalView.definer">
+                        {{ originalView.definer.replaceAll('`', '') }}
+                     </option>
+                     <option
+                        v-for="user in workspace.users"
+                        :key="`${user.name}@${user.host}`"
+                        :value="`\`${user.name}\`@\`${user.host}\``"
+                     >
+                        {{ user.name }}@{{ user.host }}
+                     </option>
+                  </select>
+                  <select v-if="!workspace.users.length" class="form-select">
+                     <option value="">
+                        {{ $t('message.currentUser') }}
+                     </option>
+                  </select>
+               </div>
+            </div>
+            <div class="column col-auto mr-2">
+               <div v-if="workspace.customizations.viewSqlSecurity" class="form-group">
+                  <label class="form-label">{{ $t('message.sqlSecurity') }}</label>
+                  <select v-model="localView.security" class="form-select">
+                     <option>DEFINER</option>
+                     <option>INVOKER</option>
+                  </select>
+               </div>
+            </div>
+            <div class="column col-auto mr-2">
+               <div v-if="workspace.customizations.viewAlgorithm" class="form-group">
+                  <label class="form-label">{{ $t('word.algorithm') }}</label>
+                  <select v-model="localView.algorithm" class="form-select">
+                     <option>UNDEFINED</option>
+                     <option>MERGE</option>
+                     <option>TEMPTABLE</option>
+                  </select>
+               </div>
+            </div>
+            <div v-if="workspace.customizations.viewUpdateOption" class="column col-auto mr-2">
+               <div class="form-group">
+                  <label class="form-label">{{ $t('message.updateOption') }}</label>
+                  <select v-model="localView.updateOption" class="form-select">
+                     <option value="">
+                        None
+                     </option>
+                     <option>CASCADED</option>
+                     <option>LOCAL</option>
+                  </select>
+               </div>
+            </div>
+         </div>
+      </div>
+      <div class="workspace-query-results column col-12 mt-2 p-relative">
+         <BaseLoader v-if="isLoading" />
+         <label class="form-label ml-2">{{ $t('message.selectStatement') }}</label>
+         <QueryEditor
+            v-show="isSelected"
+            ref="queryEditor"
+            :value.sync="localView.sql"
+            :workspace="workspace"
+            :schema="schema"
+            :height="editorHeight"
+         />
+      </div>
+   </div>
+</template>
+
+<script>
+import { mapGetters, mapActions } from 'vuex';
+import BaseLoader from '@/components/BaseLoader';
+import QueryEditor from '@/components/QueryEditor';
+import Views from '@/ipc-api/Views';
+
+export default {
+   name: 'WorkspaceTabNewView',
+   components: {
+      BaseLoader,
+      QueryEditor
+   },
+   props: {
+      connection: Object,
+      tab: Object,
+      isSelected: Boolean,
+      schema: String
+   },
+   data () {
+      return {
+         isLoading: false,
+         isSaving: false,
+         originalView: {},
+         localView: {},
+         lastView: null,
+         sqlProxy: '',
+         editorHeight: 300
+      };
+   },
+   computed: {
+      ...mapGetters({
+         selectedWorkspace: 'workspaces/getSelected',
+         getWorkspace: 'workspaces/getWorkspace'
+      }),
+      workspace () {
+         return this.getWorkspace(this.connection.uid);
+      },
+      tabUid () {
+         return this.$vnode.key;
+      },
+      isChanged () {
+         return JSON.stringify(this.originalView) !== JSON.stringify(this.localView);
+      },
+      isDefinerInUsers () {
+         return this.originalView ? this.workspace.users.some(user => this.originalView.definer === `\`${user.name}\`@\`${user.host}\``) : true;
+      }
+   },
+   watch: {
+      isSelected (val) {
+         if (val) {
+            this.changeBreadcrumbs({ schema: this.schema, view: this.view });
+
+            setTimeout(() => {
+               this.resizeQueryEditor();
+            }, 50);
+         }
+      },
+      isChanged (val) {
+         this.setUnsavedChanges({ uid: this.connection.uid, tUid: this.tabUid, isChanged: val });
+      }
+   },
+   async created () {
+      this.originalView = {
+         algorithm: 'UNDEFINED',
+         definer: '',
+         security: 'DEFINER',
+         updateOption: '',
+         sql: '',
+         name: ''
+      };
+
+      this.localView = JSON.parse(JSON.stringify(this.originalView));
+
+      setTimeout(() => {
+         this.resizeQueryEditor();
+      }, 50);
+
+      window.addEventListener('keydown', this.onKey);
+   },
+   mounted () {
+      if (this.isSelected)
+         this.changeBreadcrumbs({ schema: this.schema });
+
+      setTimeout(() => {
+         this.$refs.firstInput.focus();
+      }, 100);
+
+      window.addEventListener('resize', this.resizeQueryEditor);
+   },
+   destroyed () {
+      window.removeEventListener('resize', this.resizeQueryEditor);
+   },
+   beforeDestroy () {
+      window.removeEventListener('keydown', this.onKey);
+   },
+   methods: {
+      ...mapActions({
+         addNotification: 'notifications/addNotification',
+         refreshStructure: 'workspaces/refreshStructure',
+         setUnsavedChanges: 'workspaces/setUnsavedChanges',
+         changeBreadcrumbs: 'workspaces/changeBreadcrumbs',
+         newTab: 'workspaces/newTab',
+         removeTab: 'workspaces/removeTab',
+         renameTabs: 'workspaces/renameTabs'
+      }),
+      async saveChanges () {
+         if (this.isSaving) return;
+         this.isSaving = true;
+
+         const params = {
+            uid: this.connection.uid,
+            schema: this.schema,
+            ...this.localView
+         };
+
+         try {
+            const { status, response } = await Views.createView(params);
+
+            if (status === 'success') {
+               await this.refreshStructure(this.connection.uid);
+
+               this.newTab({
+                  uid: this.connection.uid,
+                  schema: this.schema,
+                  elementName: this.localView.name,
+                  elementType: 'view',
+                  type: 'view-props'
+               });
+
+               this.removeTab({ uid: this.connection.uid, tab: this.tab.uid });
+               this.changeBreadcrumbs({ schema: this.schema, view: this.localView.name });
+            }
+            else
+               this.addNotification({ status: 'error', message: response });
+         }
+         catch (err) {
+            this.addNotification({ status: 'error', message: err.stack });
+         }
+
+         this.isSaving = false;
+      },
+      clearChanges () {
+         this.localView = JSON.parse(JSON.stringify(this.originalView));
+         this.$refs.queryEditor.editor.session.setValue(this.localView.sql);
+      },
+      resizeQueryEditor () {
+         if (this.$refs.queryEditor) {
+            const footer = document.getElementById('footer');
+            const size = window.innerHeight - this.$refs.queryEditor.$el.getBoundingClientRect().top - footer.offsetHeight;
+            this.editorHeight = size;
+            this.$refs.queryEditor.editor.resize();
+         }
+      },
+      onKey (e) {
+         if (this.isSelected) {
+            e.stopPropagation();
+            if (e.ctrlKey && e.keyCode === 83) { // CTRL + S
+               if (this.isChanged)
+                  this.saveChanges();
+            }
+         }
+      }
+   }
+};
+</script>
--- a/src/renderer/components/WorkspaceTabPropsFunction.vue
+++ b/src/renderer/components/WorkspaceTabPropsFunction.vue
@@ -1,5 +1,5 @@
 <template>
-   <div class="workspace-query-tab column col-12 columns col-gapless">
+   <div v-show="isSelected" class="workspace-query-tab column col-12 columns col-gapless">
      <div class="workspace-query-runner column col-12">
         <div class="workspace-query-runner-footer">
            <div class="workspace-query-buttons">
@@ -37,10 +37,157 @@
                  <i class="mdi mdi-24px mdi-dots-horizontal mr-1" />
                  <span>{{ $t('word.parameters') }}</span>
               </button>
-               <button class="btn btn-dark btn-sm" @click="showOptionsModal">
-                  <i class="mdi mdi-24px mdi-cogs mr-1" />
-                  <span>{{ $t('word.options') }}</span>
-               </button>
+            </div>
+            <div class="workspace-query-info">
+               <div class="d-flex" :title="$t('word.schema')">
+                  <i class="mdi mdi-18px mdi-database mr-1" /><b>{{ schema }}</b>
+               </div>
+            </div>
+         </div>
+      </div>
+      <div class="container">
+         <div class="columns">
+            <div class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('word.name') }}
+                  </label>
+                  <input
+                     ref="firstInput"
+                     v-model="localFunction.name"
+                     class="form-input"
+                     :class="{'is-error': !isTableNameValid}"
+                     type="text"
+                  >
+               </div>
+            </div>
+            <div v-if="customizations.languages" class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('word.language') }}
+                  </label>
+                  <select v-model="localFunction.language" class="form-select">
+                     <option v-for="language in customizations.languages" :key="language">
+                        {{ language }}
+                     </option>
+                  </select>
+               </div>
+            </div>
+            <div v-if="customizations.definer" class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('word.definer') }}
+                  </label>
+                  <select
+                     v-if="workspace.users.length"
+                     v-model="localFunction.definer"
+                     class="form-select"
+                  >
+                     <option value="">
+                        {{ $t('message.currentUser') }}
+                     </option>
+                     <option
+                        v-for="user in workspace.users"
+                        :key="`${user.name}@${user.host}`"
+                        :value="`\`${user.name}\`@\`${user.host}\``"
+                     >
+                        {{ user.name }}@{{ user.host }}
+                     </option>
+                  </select>
+                  <select v-if="!workspace.users.length" class="form-select">
+                     <option value="">
+                        {{ $t('message.currentUser') }}
+                     </option>
+                  </select>
+               </div>
+            </div>
+            <div class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('word.returns') }}
+                  </label>
+                  <div class="input-group">
+                     <select
+                        v-model="localFunction.returns"
+                        class="form-select text-uppercase"
+                        style="max-width: 150px;"
+                     >
+                        <option v-if="localFunction.returns === 'VOID'">
+                           VOID
+                        </option>
+                        <option v-if="!isInDataTypes">
+                           {{ localFunction.returns }}
+                        </option>
+                        <optgroup
+                           v-for="group in workspace.dataTypes"
+                           :key="group.group"
+                           :label="group.group"
+                        >
+                           <option
+                              v-for="type in group.types"
+                              :key="type.name"
+                              :selected="localFunction.returns === type.name"
+                              :value="type.name"
+                           >
+                              {{ type.name }}
+                           </option>
+                        </optgroup>
+                     </select>
+                     <input
+                        v-if="customizations.parametersLength"
+                        v-model="localFunction.returnsLength"
+                        style="max-width: 150px;"
+                        class="form-input"
+                        type="number"
+                        min="0"
+                        :placeholder="$t('word.length')"
+                     >
+                  </div>
+               </div>
+            </div>
+            <div v-if="customizations.comment" class="column">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('word.comment') }}
+                  </label>
+                  <input
+                     v-model="localFunction.comment"
+                     class="form-input"
+                     type="text"
+                  >
+               </div>
+            </div>
+            <div class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('message.sqlSecurity') }}
+                  </label>
+                  <select v-model="localFunction.security" class="form-select">
+                     <option>DEFINER</option>
+                     <option>INVOKER</option>
+                  </select>
+               </div>
+            </div>
+            <div v-if="customizations.functionDataAccess" class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('message.dataAccess') }}
+                  </label>
+                  <select v-model="localFunction.dataAccess" class="form-select">
+                     <option>CONTAINS SQL</option>
+                     <option>NO SQL</option>
+                     <option>READS SQL DATA</option>
+                     <option>MODIFIES SQL DATA</option>
+                  </select>
+               </div>
+            </div>
+            <div v-if="customizations.functionDeterministic" class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label d-invisible">.</label>
+                  <label class="form-checkbox form-inline">
+                     <input v-model="localFunction.deterministic" type="checkbox"><i class="form-icon" /> {{ $t('word.deterministic') }}
+                  </label>
+               </div>
            </div>
         </div>
      </div>
@@ -56,14 +203,7 @@
            :height="editorHeight"
         />
      </div>
-      <WorkspacePropsFunctionOptionsModal
-         v-if="isOptionsModal"
-         :local-options="localFunction"
-         :workspace="workspace"
-         @hide="hideOptionsModal"
-         @options-update="optionsUpdate"
-      />
-      <WorkspacePropsFunctionParamsModal
+      <WorkspaceTabPropsFunctionParamsModal
         v-if="isParamsModal"
         :local-parameters="localFunction.parameters"
         :workspace="workspace"
@@ -86,30 +226,28 @@ import { mapGetters, mapActions } from 'vuex';
 import { uidGen } from 'common/libs/uidGen';
 import BaseLoader from '@/components/BaseLoader';
 import QueryEditor from '@/components/QueryEditor';
-import WorkspacePropsFunctionOptionsModal from '@/components/WorkspacePropsFunctionOptionsModal';
-import WorkspacePropsFunctionParamsModal from '@/components/WorkspacePropsFunctionParamsModal';
+import WorkspaceTabPropsFunctionParamsModal from '@/components/WorkspaceTabPropsFunctionParamsModal';
 import ModalAskParameters from '@/components/ModalAskParameters';
 import Functions from '@/ipc-api/Functions';

 export default {
-   name: 'WorkspacePropsTabFunction',
+   name: 'WorkspaceTabPropsFunction',
   components: {
      BaseLoader,
      QueryEditor,
-      WorkspacePropsFunctionOptionsModal,
-      WorkspacePropsFunctionParamsModal,
+      WorkspaceTabPropsFunctionParamsModal,
      ModalAskParameters
   },
   props: {
      connection: Object,
-      function: String
+      function: String,
+      isSelected: Boolean,
+      schema: String
   },
   data () {
      return {
-         tabUid: 'prop',
         isLoading: false,
         isSaving: false,
-         isOptionsModal: false,
         isParamsModal: false,
         isAskingParameters: false,
         originalFunction: null,
@@ -127,11 +265,11 @@ export default {
      workspace () {
         return this.getWorkspace(this.connection.uid);
      },
-      isSelected () {
-         return this.workspace.selected_tab === 'prop' && this.selectedWorkspace === this.workspace.uid && this.function;
+      customizations () {
+         return this.workspace.customizations;
      },
-      schema () {
-         return this.workspace.breadcrumbs.schema;
+      tabUid () {
+         return this.$vnode.key;
      },
      isChanged () {
         return JSON.stringify(this.originalFunction) !== JSON.stringify(this.localFunction);
@@ -141,6 +279,19 @@ export default {
            ? this.workspace.users.some(user => this.originalFunction.definer === `\`${user.name}\`@\`${user.host}\``)
            : true;
      },
+      isTableNameValid () {
+         return this.localFunction.name !== '';
+      },
+      isInDataTypes () {
+         let typeNames = [];
+         for (const group of this.workspace.dataTypes) {
+            typeNames = group.types.reduce((acc, curr) => {
+               acc.push(curr.name);
+               return acc;
+            }, []);
+         }
+         return typeNames.includes(this.localFunction.returns);
+      },
      schemaTables () {
         const schemaTables = this.workspace.structure
            .filter(schema => schema.name === this.schema)
@@ -150,6 +301,13 @@ export default {
      }
   },
   watch: {
+      async schema () {
+         if (this.isSelected) {
+            await this.getFunctionData();
+            this.$refs.queryEditor.editor.session.setValue(this.localFunction.sql);
+            this.lastFunction = this.function;
+         }
+      },
      async function () {
         if (this.isSelected) {
            await this.getFunctionData();
@@ -158,26 +316,32 @@ export default {
         }
      },
      async isSelected (val) {
-         if (val && this.lastFunction !== this.function) {
-            await this.getFunctionData();
-            this.$refs.queryEditor.editor.session.setValue(this.localFunction.sql);
-            this.lastFunction = this.function;
+         if (val) {
+            this.changeBreadcrumbs({ schema: this.schema, function: this.function });
+
+            setTimeout(() => {
+               this.resizeQueryEditor();
+            }, 200);
+
+            if (this.lastFunction !== this.function)
+               this.getRoutineData();
         }
      },
      isChanged (val) {
-         if (this.isSelected && this.lastFunction === this.function && this.function !== null)
-            this.setUnsavedChanges(val);
+         this.setUnsavedChanges({ uid: this.connection.uid, tUid: this.tabUid, isChanged: val });
      }
   },
+   async created () {
+      await this.getFunctionData();
+      this.$refs.queryEditor.editor.session.setValue(this.localFunction.sql);
+      window.addEventListener('keydown', this.onKey);
+   },
   mounted () {
      window.addEventListener('resize', this.resizeQueryEditor);
   },
   destroyed () {
      window.removeEventListener('resize', this.resizeQueryEditor);
   },
-   created () {
-      window.addEventListener('keydown', this.onKey);
-   },
   beforeDestroy () {
      window.removeEventListener('keydown', this.onKey);
   },
@@ -185,20 +349,22 @@ export default {
      ...mapActions({
         addNotification: 'notifications/addNotification',
         refreshStructure: 'workspaces/refreshStructure',
-         setUnsavedChanges: 'workspaces/setUnsavedChanges',
+         renameTabs: 'workspaces/renameTabs',
+         newTab: 'workspaces/newTab',
         changeBreadcrumbs: 'workspaces/changeBreadcrumbs',
-         newTab: 'workspaces/newTab'
+         setUnsavedChanges: 'workspaces/setUnsavedChanges'
      }),
      async getFunctionData () {
         if (!this.function) return;

         this.isLoading = true;
         this.localFunction = { sql: '' };
+         this.lastFunction = this.function;

         const params = {
            uid: this.connection.uid,
            schema: this.schema,
-            func: this.workspace.breadcrumbs.function
+            func: this.function
         };

         try {
@@ -229,9 +395,9 @@ export default {
         this.isSaving = true;
         const params = {
            uid: this.connection.uid,
-            schema: this.schema,
            func: {
               ...this.localFunction,
+               schema: this.schema,
               oldName: this.originalFunction.name
            }
         };
@@ -245,11 +411,18 @@ export default {
               await this.refreshStructure(this.connection.uid);

               if (oldName !== this.localFunction.name) {
-                  this.setUnsavedChanges(false);
+                  this.renameTabs({
+                     uid: this.connection.uid,
+                     schema: this.schema,
+                     elementName: oldName,
+                     elementNewName: this.localFunction.name,
+                     elementType: 'function'
+                  });
+
                  this.changeBreadcrumbs({ schema: this.schema, function: this.localFunction.name });
               }
-
-               this.getFunctionData();
+               else
+                  this.getFunctionData();
            }
            else
               this.addNotification({ status: 'error', message: response });
@@ -303,13 +476,7 @@ export default {
               sql = `SELECT \`${this.originalFunction.name}\` (${params.join(',')})`;
         }

-         this.newTab({ uid: this.connection.uid, content: sql, autorun: true });
-      },
-      showOptionsModal () {
-         this.isOptionsModal = true;
-      },
-      hideOptionsModal () {
-         this.isOptionsModal = false;
+         this.newTab({ uid: this.connection.uid, content: sql, type: 'query', autorun: true });
      },
      showParamsModal () {
         this.isParamsModal = true;
--- a/src/renderer/components/WorkspaceTabPropsFunctionParamsModal.vue
+++ b/src/renderer/components/WorkspaceTabPropsFunctionParamsModal.vue
@@ -176,7 +176,7 @@ import { uidGen } from 'common/libs/uidGen';
 import ConfirmModal from '@/components/BaseConfirmModal';

 export default {
-   name: 'WorkspacePropsRoutineParamsModal',
+   name: 'WorkspaceTabPropsFunctionParamsModal',
   components: {
      ConfirmModal
   },
@@ -242,7 +242,7 @@ export default {
            name: `Param${this.i++}`,
            type: 'INT',
            context: 'IN',
-            length: 10
+            length: ''
         }];

         if (this.parametersProxy.length === 1)
--- a/src/renderer/components/WorkspaceTabPropsRoutine.vue
+++ b/src/renderer/components/WorkspaceTabPropsRoutine.vue
@@ -1,5 +1,5 @@
 <template>
-   <div class="workspace-query-tab column col-12 columns col-gapless">
+   <div v-show="isSelected" class="workspace-query-tab column col-12 columns col-gapless">
      <div class="workspace-query-runner column col-12">
         <div class="workspace-query-runner-footer">
            <div class="workspace-query-buttons">
@@ -37,10 +37,113 @@
                  <i class="mdi mdi-24px mdi-dots-horizontal mr-1" />
                  <span>{{ $t('word.parameters') }}</span>
               </button>
-               <button class="btn btn-dark btn-sm" @click="showOptionsModal">
-                  <i class="mdi mdi-24px mdi-cogs mr-1" />
-                  <span>{{ $t('word.options') }}</span>
-               </button>
+            </div>
+            <div class="workspace-query-info">
+               <div class="d-flex" :title="$t('word.schema')">
+                  <i class="mdi mdi-18px mdi-database mr-1" /><b>{{ schema }}</b>
+               </div>
+            </div>
+         </div>
+      </div>
+      <div class="container">
+         <div class="columns">
+            <div class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('word.name') }}
+                  </label>
+                  <input
+                     ref="firstInput"
+                     v-model="localRoutine.name"
+                     class="form-input"
+                     :class="{'is-error': !isTableNameValid}"
+                     type="text"
+                  >
+               </div>
+            </div>
+            <div v-if="customizations.languages" class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('word.language') }}
+                  </label>
+                  <select v-model="localRoutine.language" class="form-select">
+                     <option v-for="language in customizations.languages" :key="language">
+                        {{ language }}
+                     </option>
+                  </select>
+               </div>
+            </div>
+            <div v-if="customizations.definer" class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('word.definer') }}
+                  </label>
+                  <select
+                     v-if="workspace.users.length"
+                     v-model="localRoutine.definer"
+                     class="form-select"
+                  >
+                     <option value="">
+                        {{ $t('message.currentUser') }}
+                     </option>
+                     <option
+                        v-for="user in workspace.users"
+                        :key="`${user.name}@${user.host}`"
+                        :value="`\`${user.name}\`@\`${user.host}\``"
+                     >
+                        {{ user.name }}@{{ user.host }}
+                     </option>
+                  </select>
+                  <select v-if="!workspace.users.length" class="form-select">
+                     <option value="">
+                        {{ $t('message.currentUser') }}
+                     </option>
+                  </select>
+               </div>
+            </div>
+            <div v-if="customizations.comment" class="column">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('word.comment') }}
+                  </label>
+                  <input
+                     v-model="localRoutine.comment"
+                     class="form-input"
+                     type="text"
+                  >
+               </div>
+            </div>
+            <div class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('message.sqlSecurity') }}
+                  </label>
+                  <select v-model="localRoutine.security" class="form-select">
+                     <option>DEFINER</option>
+                     <option>INVOKER</option>
+                  </select>
+               </div>
+            </div>
+            <div v-if="customizations.procedureDataAccess" class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('message.dataAccess') }}
+                  </label>
+                  <select v-model="localRoutine.dataAccess" class="form-select">
+                     <option>CONTAINS SQL</option>
+                     <option>NO SQL</option>
+                     <option>READS SQL DATA</option>
+                     <option>MODIFIES SQL DATA</option>
+                  </select>
+               </div>
+            </div>
+            <div v-if="customizations.procedureDeterministic" class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label d-invisible">.</label>
+                  <label class="form-checkbox form-inline">
+                     <input v-model="localRoutine.deterministic" type="checkbox"><i class="form-icon" /> {{ $t('word.deterministic') }}
+                  </label>
+               </div>
            </div>
         </div>
      </div>
@@ -57,14 +160,7 @@
            :height="editorHeight"
         />
      </div>
-      <WorkspacePropsRoutineOptionsModal
-         v-if="isOptionsModal"
-         :local-options="localRoutine"
-         :workspace="workspace"
-         @hide="hideOptionsModal"
-         @options-update="optionsUpdate"
-      />
-      <WorkspacePropsRoutineParamsModal
+      <WorkspaceTabPropsRoutineParamsModal
         v-if="isParamsModal"
         :local-parameters="localRoutine.parameters"
         :workspace="workspace"
@@ -87,30 +183,28 @@ import { mapGetters, mapActions } from 'vuex';
 import { uidGen } from 'common/libs/uidGen';
 import QueryEditor from '@/components/QueryEditor';
 import BaseLoader from '@/components/BaseLoader';
-import WorkspacePropsRoutineOptionsModal from '@/components/WorkspacePropsRoutineOptionsModal';
-import WorkspacePropsRoutineParamsModal from '@/components/WorkspacePropsRoutineParamsModal';
+import WorkspaceTabPropsRoutineParamsModal from '@/components/WorkspaceTabPropsRoutineParamsModal';
 import ModalAskParameters from '@/components/ModalAskParameters';
 import Routines from '@/ipc-api/Routines';

 export default {
-   name: 'WorkspacePropsTabRoutine',
+   name: 'WorkspaceTabPropsRoutine',
   components: {
      QueryEditor,
      BaseLoader,
-      WorkspacePropsRoutineOptionsModal,
-      WorkspacePropsRoutineParamsModal,
+      WorkspaceTabPropsRoutineParamsModal,
      ModalAskParameters
   },
   props: {
      connection: Object,
-      routine: String
+      routine: String,
+      isSelected: Boolean,
+      schema: String
   },
   data () {
      return {
-         tabUid: 'prop',
         isLoading: false,
         isSaving: false,
-         isOptionsModal: false,
         isParamsModal: false,
         isAskingParameters: false,
         originalRoutine: null,
@@ -128,11 +222,11 @@ export default {
      workspace () {
         return this.getWorkspace(this.connection.uid);
      },
-      isSelected () {
-         return this.workspace.selected_tab === 'prop' && this.selectedWorkspace === this.workspace.uid && this.routine;
+      customizations () {
+         return this.workspace.customizations;
      },
-      schema () {
-         return this.workspace.breadcrumbs.schema;
+      tabUid () {
+         return this.$vnode.key;
      },
      isChanged () {
         return JSON.stringify(this.originalRoutine) !== JSON.stringify(this.localRoutine);
@@ -140,6 +234,9 @@ export default {
      isDefinerInUsers () {
         return this.originalRoutine ? this.workspace.users.some(user => this.originalRoutine.definer === `\`${user.name}\`@\`${user.host}\``) : true;
      },
+      isTableNameValid () {
+         return this.localRoutine.name !== '';
+      },
      schemaTables () {
         const schemaTables = this.workspace.structure
            .filter(schema => schema.name === this.schema)
@@ -149,6 +246,13 @@ export default {
      }
   },
   watch: {
+      async schema () {
+         if (this.isSelected) {
+            await this.getRoutineData();
+            this.$refs.queryEditor.editor.session.setValue(this.localRoutine.sql);
+            this.lastRoutine = this.routine;
+         }
+      },
      async routine () {
         if (this.isSelected) {
            await this.getRoutineData();
@@ -157,26 +261,32 @@ export default {
         }
      },
      async isSelected (val) {
-         if (val && this.lastRoutine !== this.routine) {
-            await this.getRoutineData();
-            this.$refs.queryEditor.editor.session.setValue(this.localRoutine.sql);
-            this.lastRoutine = this.routine;
+         if (val) {
+            this.changeBreadcrumbs({ schema: this.schema, routine: this.routine });
+
+            setTimeout(() => {
+               this.resizeQueryEditor();
+            }, 200);
+
+            if (this.lastRoutine !== this.routine)
+               this.getRoutineData();
         }
      },
      isChanged (val) {
-         if (this.isSelected && this.lastRoutine === this.routine && this.routine !== null)
-            this.setUnsavedChanges(val);
+         this.setUnsavedChanges({ uid: this.connection.uid, tUid: this.tabUid, isChanged: val });
      }
   },
+   async created () {
+      await this.getRoutineData();
+      this.$refs.queryEditor.editor.session.setValue(this.localRoutine.sql);
+      window.addEventListener('keydown', this.onKey);
+   },
   mounted () {
      window.addEventListener('resize', this.resizeQueryEditor);
   },
   destroyed () {
      window.removeEventListener('resize', this.resizeQueryEditor);
   },
-   created () {
-      window.addEventListener('keydown', this.onKey);
-   },
   beforeDestroy () {
      window.removeEventListener('keydown', this.onKey);
   },
@@ -184,19 +294,22 @@ export default {
      ...mapActions({
         addNotification: 'notifications/addNotification',
         refreshStructure: 'workspaces/refreshStructure',
-         setUnsavedChanges: 'workspaces/setUnsavedChanges',
+         renameTabs: 'workspaces/renameTabs',
+         newTab: 'workspaces/newTab',
         changeBreadcrumbs: 'workspaces/changeBreadcrumbs',
-         newTab: 'workspaces/newTab'
+         setUnsavedChanges: 'workspaces/setUnsavedChanges'
      }),
      async getRoutineData () {
         if (!this.routine) return;
+
         this.localRoutine = { sql: '' };
         this.isLoading = true;
+         this.lastRoutine = this.routine;

         const params = {
            uid: this.connection.uid,
            schema: this.schema,
-            routine: this.workspace.breadcrumbs.procedure
+            routine: this.routine
         };

         try {
@@ -227,9 +340,9 @@ export default {
         this.isSaving = true;
         const params = {
            uid: this.connection.uid,
-            schema: this.schema,
            routine: {
               ...this.localRoutine,
+               schema: this.schema,
               oldName: this.originalRoutine.name
            }
         };
@@ -243,11 +356,18 @@ export default {
               await this.refreshStructure(this.connection.uid);

               if (oldName !== this.localRoutine.name) {
-                  this.setUnsavedChanges(false);
+                  this.renameTabs({
+                     uid: this.connection.uid,
+                     schema: this.schema,
+                     elementName: oldName,
+                     elementNewName: this.localRoutine.name,
+                     elementType: 'procedure'
+                  });
+
                  this.changeBreadcrumbs({ schema: this.schema, procedure: this.localRoutine.name });
               }
-
-               this.getRoutineData();
+               else
+                  this.getRoutineData();
            }
            else
               this.addNotification({ status: 'error', message: response });
@@ -299,13 +419,7 @@ export default {
               sql = `CALL \`${this.originalRoutine.name}\`(${params.join(',')})`;
         }

-         this.newTab({ uid: this.connection.uid, content: sql, autorun: true });
-      },
-      showOptionsModal () {
-         this.isOptionsModal = true;
-      },
-      hideOptionsModal () {
-         this.isOptionsModal = false;
+         this.newTab({ uid: this.connection.uid, content: sql, type: 'query', autorun: true });
      },
      showParamsModal () {
         this.isParamsModal = true;
--- a/src/renderer/components/WorkspaceTabPropsRoutineParamsModal.vue
+++ b/src/renderer/components/WorkspaceTabPropsRoutineParamsModal.vue
@@ -176,7 +176,7 @@ import { uidGen } from 'common/libs/uidGen';
 import ConfirmModal from '@/components/BaseConfirmModal';

 export default {
-   name: 'WorkspacePropsRoutineParamsModal',
+   name: 'WorkspaceTabPropsRoutineParamsModal',
   components: {
      ConfirmModal
   },
--- a/src/renderer/components/WorkspaceTabPropsScheduler.vue
+++ b/src/renderer/components/WorkspaceTabPropsScheduler.vue
@@ -1,5 +1,5 @@
 <template>
-   <div class="workspace-query-tab column col-12 columns col-gapless">
+   <div v-show="isSelected" class="workspace-query-tab column col-12 columns col-gapless">
      <div class="workspace-query-runner column col-12">
         <div class="workspace-query-runner-footer">
            <div class="workspace-query-buttons">
@@ -29,10 +29,15 @@
                  <span>{{ $t('word.timing') }}</span>
               </button>
            </div>
+            <div class="workspace-query-info">
+               <div class="d-flex" :title="$t('word.schema')">
+                  <i class="mdi mdi-18px mdi-database mr-1" /><b>{{ schema }}</b>
+               </div>
+            </div>
         </div>
      </div>
      <div class="container">
-         <div class="columns mb-4">
+         <div class="columns">
            <div class="column col-auto">
               <div class="form-group">
                  <label class="form-label">{{ $t('word.name') }}</label>
@@ -72,7 +77,7 @@
                  </select>
               </div>
            </div>
-            <div class="column col-4">
+            <div class="column">
               <div class="form-group">
                  <label class="form-label">{{ $t('word.comment') }}</label>
                  <input
@@ -82,8 +87,6 @@
                  >
               </div>
            </div>
-         </div>
-         <div class="columns">
            <div class="column">
               <div class="form-group">
                  <label class="form-label mr-2">{{ $t('word.state') }}</label>
@@ -127,7 +130,7 @@
            :height="editorHeight"
         />
      </div>
-      <WorkspacePropsSchedulerTimingModal
+      <WorkspaceTabPropsSchedulerTimingModal
         v-if="isTimingModal"
         :local-options="localScheduler"
         :workspace="workspace"
@@ -141,23 +144,24 @@
 import { mapGetters, mapActions } from 'vuex';
 import BaseLoader from '@/components/BaseLoader';
 import QueryEditor from '@/components/QueryEditor';
-import WorkspacePropsSchedulerTimingModal from '@/components/WorkspacePropsSchedulerTimingModal';
+import WorkspaceTabPropsSchedulerTimingModal from '@/components/WorkspaceTabPropsSchedulerTimingModal';
 import Schedulers from '@/ipc-api/Schedulers';

 export default {
-   name: 'WorkspacePropsTabScheduler',
+   name: 'WorkspaceTabPropsScheduler',
   components: {
      BaseLoader,
      QueryEditor,
-      WorkspacePropsSchedulerTimingModal
+      WorkspaceTabPropsSchedulerTimingModal
   },
   props: {
      connection: Object,
-      scheduler: String
+      scheduler: String,
+      isSelected: Boolean,
+      schema: String
   },
   data () {
      return {
-         tabUid: 'prop',
         isLoading: false,
         isSaving: false,
         isTimingModal: false,
@@ -176,11 +180,8 @@ export default {
      workspace () {
         return this.getWorkspace(this.connection.uid);
      },
-      isSelected () {
-         return this.workspace.selected_tab === 'prop' && this.selectedWorkspace === this.workspace.uid && this.scheduler;
-      },
-      schema () {
-         return this.workspace.breadcrumbs.schema;
+      tabUid () {
+         return this.$vnode.key;
      },
      isChanged () {
         return JSON.stringify(this.originalScheduler) !== JSON.stringify(this.localScheduler);
@@ -197,6 +198,13 @@ export default {
      }
   },
   watch: {
+      async schema () {
+         if (this.isSelected) {
+            await this.getSchedulerData();
+            this.$refs.queryEditor.editor.session.setValue(this.localScheduler.sql);
+            this.lastScheduler = this.scheduler;
+         }
+      },
      async scheduler () {
         if (this.isSelected) {
            await this.getSchedulerData();
@@ -205,26 +213,32 @@ export default {
         }
      },
      async isSelected (val) {
-         if (val && this.lastScheduler !== this.scheduler) {
-            await this.getSchedulerData();
-            this.$refs.queryEditor.editor.session.setValue(this.localScheduler.sql);
-            this.lastScheduler = this.scheduler;
+         if (val) {
+            this.changeBreadcrumbs({ schema: this.schema, scheduler: this.scheduler });
+
+            setTimeout(() => {
+               this.resizeQueryEditor();
+            }, 200);
+
+            if (this.lastScheduler !== this.scheduler)
+               this.getSchedulerData();
         }
      },
      isChanged (val) {
-         if (this.isSelected && this.lastScheduler === this.scheduler && this.scheduler !== null)
-            this.setUnsavedChanges(val);
+         this.setUnsavedChanges({ uid: this.connection.uid, tUid: this.tabUid, isChanged: val });
      }
   },
+   async created () {
+      await this.getSchedulerData();
+      this.$refs.queryEditor.editor.session.setValue(this.localScheduler.sql);
+      window.addEventListener('keydown', this.onKey);
+   },
   mounted () {
      window.addEventListener('resize', this.resizeQueryEditor);
   },
   destroyed () {
      window.removeEventListener('resize', this.resizeQueryEditor);
   },
-   created () {
-      window.addEventListener('keydown', this.onKey);
-   },
   beforeDestroy () {
      window.removeEventListener('keydown', this.onKey);
   },
@@ -232,17 +246,21 @@ export default {
      ...mapActions({
         addNotification: 'notifications/addNotification',
         refreshStructure: 'workspaces/refreshStructure',
-         setUnsavedChanges: 'workspaces/setUnsavedChanges',
-         changeBreadcrumbs: 'workspaces/changeBreadcrumbs'
+         renameTabs: 'workspaces/renameTabs',
+         newTab: 'workspaces/newTab',
+         changeBreadcrumbs: 'workspaces/changeBreadcrumbs',
+         setUnsavedChanges: 'workspaces/setUnsavedChanges'
      }),
      async getSchedulerData () {
         if (!this.scheduler) return;
+
         this.isLoading = true;
+         this.lastScheduler = this.scheduler;

         const params = {
            uid: this.connection.uid,
            schema: this.schema,
-            scheduler: this.workspace.breadcrumbs.scheduler
+            scheduler: this.scheduler
         };

         try {
@@ -267,9 +285,9 @@ export default {
         this.isSaving = true;
         const params = {
            uid: this.connection.uid,
-            schema: this.schema,
            scheduler: {
               ...this.localScheduler,
+               schema: this.schema,
               oldName: this.originalScheduler.name
            }
         };
@@ -283,11 +301,18 @@ export default {
               await this.refreshStructure(this.connection.uid);

               if (oldName !== this.localScheduler.name) {
-                  this.setUnsavedChanges(false);
+                  this.renameTabs({
+                     uid: this.connection.uid,
+                     schema: this.schema,
+                     elementName: oldName,
+                     elementNewName: this.localScheduler.name,
+                     elementType: 'scheduler'
+                  });
+
                  this.changeBreadcrumbs({ schema: this.schema, scheduler: this.localScheduler.name });
               }
-
-               this.getSchedulerData();
+               else
+                  this.getSchedulerData();
            }
            else
               this.addNotification({ status: 'error', message: response });
--- a/src/renderer/components/WorkspaceTabPropsSchedulerTimingModal.vue
+++ b/src/renderer/components/WorkspaceTabPropsSchedulerTimingModal.vue
@@ -143,7 +143,7 @@ import { VueMaskDirective } from 'v-mask';
 import moment from 'moment';

 export default {
-   name: 'WorkspacePropsSchedulerTimingModal',
+   name: 'WorkspaceTabPropsSchedulerTimingModal',
   components: {
      ConfirmModal
   },
--- a/src/renderer/components/WorkspaceTabPropsTable.vue
+++ b/src/renderer/components/WorkspaceTabPropsTable.vue
@@ -1,5 +1,5 @@
 <template>
-   <div class="workspace-query-tab column col-12 columns col-gapless">
+   <div v-show="isSelected" class="workspace-query-tab column col-12 columns col-gapless">
      <div class="workspace-query-runner column col-12">
         <div class="workspace-query-runner-footer">
            <div class="workspace-query-buttons">
@@ -14,7 +14,7 @@
                  <span>{{ $t('word.save') }}</span>
               </button>
               <button
-                  :disabled="!isChanged"
+                  :disabled="!isChanged || isSaving"
                  class="btn btn-link btn-sm mr-0"
                  :title="$t('message.clearChanges')"
                  @click="clearChanges"
@@ -26,6 +26,7 @@
               <div class="divider-vert py-3" />

               <button
+                  :disabled="isSaving"
                  class="btn btn-dark btn-sm"
                  :title="$t('message.addNewField')"
                  @click="addField"
@@ -34,6 +35,7 @@
                  <span>{{ $t('word.add') }}</span>
               </button>
               <button
+                  :disabled="isSaving"
                  class="btn btn-dark btn-sm"
                  :title="$t('message.manageIndexes')"
                  @click="showIntdexesModal"
@@ -41,20 +43,96 @@
                  <i class="mdi mdi-24px mdi-key mdi-rotate-45 mr-1" />
                  <span>{{ $t('word.indexes') }}</span>
               </button>
-               <button class="btn btn-dark btn-sm" @click="showForeignModal">
+               <button
+                  class="btn btn-dark btn-sm"
+                  :disabled="isSaving"
+                  @click="showForeignModal"
+               >
                  <i class="mdi mdi-24px mdi-key-link mr-1" />
                  <span>{{ $t('word.foreignKeys') }}</span>
               </button>
-               <button class="btn btn-dark btn-sm" @click="showOptionsModal">
-                  <i class="mdi mdi-24px mdi-cogs mr-1" />
-                  <span>{{ $t('word.options') }}</span>
-               </button>
+            </div>
+            <div class="workspace-query-info">
+               <div class="d-flex" :title="$t('word.schema')">
+                  <i class="mdi mdi-18px mdi-database mr-1" /><b>{{ schema }}</b>
+               </div>
+            </div>
+         </div>
+      </div>
+      <div class="container">
+         <div class="columns mb-4">
+            <div class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">{{ $t('word.name') }}</label>
+                  <input
+                     v-model="localOptions.name"
+                     class="form-input"
+                     type="text"
+                  >
+               </div>
+            </div>
+            <div v-if="workspace.customizations.comment" class="column">
+               <div class="form-group">
+                  <label class="form-label">{{ $t('word.comment') }}</label>
+                  <input
+                     v-model="localOptions.comment"
+                     class="form-input"
+                     type="text"
+                  >
+               </div>
+            </div>
+
+            <div v-if="workspace.customizations.autoIncrement" class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('word.autoIncrement') }}
+                  </label>
+                  <input
+                     ref="firstInput"
+                     v-model="localOptions.autoIncrement"
+                     class="form-input"
+                     type="number"
+                     :disabled="localOptions.autoIncrement === null"
+                  >
+               </div>
+            </div>
+            <div v-if="workspace.customizations.collations" class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('word.collation') }}
+                  </label>
+                  <select v-model="localOptions.collation" class="form-select">
+                     <option
+                        v-for="collation in workspace.collations"
+                        :key="collation.id"
+                        :value="collation.collation"
+                     >
+                        {{ collation.collation }}
+                     </option>
+                  </select>
+               </div>
+            </div>
+            <div v-if="workspace.customizations.engines" class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('word.engine') }}
+                  </label>
+                  <select v-model="localOptions.engine" class="form-select">
+                     <option
+                        v-for="engine in workspace.engines"
+                        :key="engine.name"
+                        :value="engine.name"
+                     >
+                        {{ engine.name }}
+                     </option>
+                  </select>
+               </div>
            </div>
         </div>
      </div>
      <div class="workspace-query-results column col-12 p-relative">
         <BaseLoader v-if="isLoading" />
-         <WorkspacePropsTable
+         <WorkspaceTabPropsTableFields
            v-if="localFields"
            ref="indexTable"
            :fields="localFields"
@@ -66,21 +144,14 @@
            :table="table"
            :schema="schema"
            mode="table"
+            @duplicate-field="duplicateField"
            @remove-field="removeField"
            @add-new-index="addNewIndex"
            @add-to-index="addToIndex"
            @rename-field="renameField"
         />
      </div>
-      <WorkspacePropsOptionsModal
-         v-if="isOptionsModal"
-         :local-options="localOptions"
-         :table="table"
-         :workspace="workspace"
-         @hide="hideOptionsModal"
-         @options-update="optionsUpdate"
-      />
-      <WorkspacePropsIndexesModal
+      <WorkspaceTabPropsTableIndexesModal
         v-if="isIndexesModal"
         :local-indexes="localIndexes"
         :table="table"
@@ -90,7 +161,7 @@
         @hide="hideIndexesModal"
         @indexes-update="indexesUpdate"
      />
-      <WorkspacePropsForeignModal
+      <WorkspaceTabPropsTableForeignModal
         v-if="isForeignModal"
         :local-key-usage="localKeyUsage"
         :connection="connection"
@@ -110,30 +181,28 @@ import { mapGetters, mapActions } from 'vuex';
 import { uidGen } from 'common/libs/uidGen';
 import Tables from '@/ipc-api/Tables';
 import BaseLoader from '@/components/BaseLoader';
-import WorkspacePropsTable from '@/components/WorkspacePropsTable';
-import WorkspacePropsOptionsModal from '@/components/WorkspacePropsOptionsModal';
-import WorkspacePropsIndexesModal from '@/components/WorkspacePropsIndexesModal';
-import WorkspacePropsForeignModal from '@/components/WorkspacePropsForeignModal';
+import WorkspaceTabPropsTableFields from '@/components/WorkspaceTabPropsTableFields';
+import WorkspaceTabPropsTableIndexesModal from '@/components/WorkspaceTabPropsTableIndexesModal';
+import WorkspaceTabPropsTableForeignModal from '@/components/WorkspaceTabPropsTableForeignModal';

 export default {
-   name: 'WorkspacePropsTab',
+   name: 'WorkspaceTabPropsTable',
   components: {
      BaseLoader,
-      WorkspacePropsTable,
-      WorkspacePropsOptionsModal,
-      WorkspacePropsIndexesModal,
-      WorkspacePropsForeignModal
+      WorkspaceTabPropsTableFields,
+      WorkspaceTabPropsTableIndexesModal,
+      WorkspaceTabPropsTableForeignModal
   },
   props: {
      connection: Object,
-      table: String
+      isSelected: Boolean,
+      table: String,
+      schema: String
   },
   data () {
      return {
-         tabUid: 'prop',
         isLoading: false,
         isSaving: false,
-         isOptionsModal: false,
         isIndexesModal: false,
         isForeignModal: false,
         isOptionsChanging: false,
@@ -143,6 +212,7 @@ export default {
         localKeyUsage: [],
         originalIndexes: [],
         localIndexes: [],
+         tableOptions: {},
         localOptions: {},
         lastTable: null,
         newFieldsCounter: 0
@@ -157,18 +227,12 @@ export default {
      workspace () {
         return this.getWorkspace(this.connection.uid);
      },
-      tableOptions () {
-         const db = this.workspace.structure.find(db => db.name === this.schema);
-         return db && this.table ? db.tables.find(table => table.name === this.table) : {};
+      tabUid () {
+         return this.$vnode.key;
      },
      defaultEngine () {
-         return this.getDatabaseVariable(this.connection.uid, 'default_storage_engine').value || '';
-      },
-      isSelected () {
-         return this.workspace.selected_tab === 'prop' && this.selectedWorkspace === this.workspace.uid && this.table;
-      },
-      schema () {
-         return this.workspace.breadcrumbs.schema;
+         const engine = this.getDatabaseVariable(this.connection.uid, 'default_storage_engine');
+         return engine ? engine.value : '';
      },
      schemaTables () {
         const schemaTables = this.workspace.structure
@@ -185,6 +249,12 @@ export default {
      }
   },
   watch: {
+      schema () {
+         if (this.isSelected) {
+            this.getFieldsData();
+            this.lastTable = this.table;
+         }
+      },
      table () {
         if (this.isSelected) {
            this.getFieldsData();
@@ -192,17 +262,19 @@ export default {
         }
      },
      isSelected (val) {
-         if (val && this.lastTable !== this.table) {
-            this.getFieldsData();
-            this.lastTable = this.table;
+         if (val) {
+            this.changeBreadcrumbs({ schema: this.schema, table: this.table });
+
+            if (this.lastTable !== this.table)
+               this.getFieldsData();
         }
      },
      isChanged (val) {
-         if (this.isSelected && this.lastTable === this.table && this.table !== null)
-            this.setUnsavedChanges(val);
+         this.setUnsavedChanges({ uid: this.connection.uid, tUid: this.tabUid, isChanged: val });
      }
   },
   created () {
+      this.getFieldsData();
      window.addEventListener('keydown', this.onKey);
   },
   beforeDestroy () {
@@ -213,22 +285,45 @@ export default {
         addNotification: 'notifications/addNotification',
         refreshStructure: 'workspaces/refreshStructure',
         setUnsavedChanges: 'workspaces/setUnsavedChanges',
+         renameTabs: 'workspaces/renameTabs',
         changeBreadcrumbs: 'workspaces/changeBreadcrumbs'
      }),
+      async getTableOptions (params) {
+         const db = this.workspace.structure.find(db => db.name === this.schema);
+
+         if (db && db.tables.length && this.table)
+            this.tableOptions = db.tables.find(table => table.name === this.table);
+         else {
+            const { status, response } = await Tables.getTableOptions(params);
+
+            if (status === 'success')
+               this.tableOptions = response;
+            else
+               this.addNotification({ status: 'error', message: response });
+         }
+      },
      async getFieldsData () {
         if (!this.table) return;

         this.localFields = [];
+         this.lastTable = this.table;
         this.newFieldsCounter = 0;
         this.isLoading = true;
-         this.localOptions = JSON.parse(JSON.stringify(this.tableOptions));

         const params = {
            uid: this.connection.uid,
            schema: this.schema,
-            table: this.workspace.breadcrumbs.table
+            table: this.table
         };

+         try {
+            await this.getTableOptions(params);
+            this.localOptions = JSON.parse(JSON.stringify(this.tableOptions));
+         }
+         catch (err) {
+            console.error(err);
+         }
+
         try { // Columns data
            const { status, response } = await Tables.getTableColumns(params);
            if (status === 'success') {
@@ -410,7 +505,7 @@ export default {
         const params = {
            uid: this.connection.uid,
            schema: this.schema,
-            table: this.workspace.breadcrumbs.table,
+            table: this.table,
            additions,
            changes,
            deletions,
@@ -428,11 +523,18 @@ export default {
               await this.refreshStructure(this.connection.uid);

               if (oldName !== this.localOptions.name) {
-                  this.setUnsavedChanges(false);
+                  this.renameTabs({
+                     uid: this.connection.uid,
+                     schema: this.schema,
+                     elementName: oldName,
+                     elementNewName: this.localOptions.name,
+                     elementType: 'table'
+                  });
+
                  this.changeBreadcrumbs({ schema: this.schema, table: this.localOptions.name });
               }
-
-               this.getFieldsData();
+               else
+                  this.getFieldsData();
            }
            else
               this.addNotification({ status: 'error', message: response });
@@ -494,6 +596,18 @@ export default {
            return key;
         });
      },
+      duplicateField (uid) {
+         const fieldToClone = Object.assign({}, this.localFields.find(field => field._id === uid));
+         fieldToClone._id = uidGen();
+         fieldToClone.name = `${fieldToClone.name}_copy`;
+         fieldToClone.order = this.localFields.length + 1;
+         this.localFields = [...this.localFields, fieldToClone];
+
+         setTimeout(() => {
+            const scrollable = this.$refs.indexTable.$refs.tableWrapper;
+            scrollable.scrollTop = scrollable.scrollHeight + 30;
+         }, 20);
+      },
      removeField (uid) {
         this.localFields = this.localFields.filter(field => field._id !== uid);
      },
@@ -515,12 +629,6 @@ export default {
            return index;
         });
      },
-      showOptionsModal () {
-         this.isOptionsModal = true;
-      },
-      hideOptionsModal () {
-         this.isOptionsModal = false;
-      },
      optionsUpdate (options) {
         this.localOptions = options;
      },
--- a/src/renderer/components/WorkspaceTabPropsTableContext.vue
+++ b/src/renderer/components/WorkspaceTabPropsTableContext.vue
@@ -33,6 +33,9 @@
            </div>
         </div>
      </div>
+      <div class="context-element" @click="duplicateField">
+         <span class="d-flex"><i class="mdi mdi-18px mdi-content-duplicate text-light pr-1" /> {{ $t('word.duplicate') }}</span>
+      </div>
      <div class="context-element" @click="deleteField">
         <span class="d-flex"><i class="mdi mdi-18px mdi-delete text-light pr-1" /> {{ $t('message.deleteField') }}</span>
      </div>
@@ -43,7 +46,7 @@
 import BaseContextMenu from '@/components/BaseContextMenu';

 export default {
-   name: 'WorkspaceQueryTableContext',
+   name: 'WorkspaceTabQueryTableContext',
   components: {
      BaseContextMenu
   },
@@ -62,6 +65,10 @@ export default {
      closeContext () {
         this.$emit('close-context');
      },
+      duplicateField () {
+         this.$emit('duplicate-selected');
+         this.closeContext();
+      },
      deleteField () {
         this.$emit('delete-selected');
         this.closeContext();
--- a/src/renderer/components/WorkspaceTabPropsTableFields.vue
+++ b/src/renderer/components/WorkspaceTabPropsTableFields.vue
@@ -11,6 +11,7 @@
         :index-types="indexTypes"
         :indexes="indexes"
         @delete-selected="removeField"
+         @duplicate-selected="duplicateField"
         @close-context="isContext = false"
         @add-new-index="$emit('add-new-index', $event)"
         @add-to-index="$emit('add-to-index', $event)"
@@ -100,7 +101,7 @@
               </div>
            </div>
         </div>
-         <draggable
+         <Draggable
            ref="resultTable"
            :list="fields"
            class="tbody"
@@ -117,23 +118,23 @@
               @contextmenu="contextMenu"
               @rename-field="$emit('rename-field', $event)"
            />
-         </draggable>
+         </Draggable>
      </div>
   </div>
 </template>

 <script>
 import { mapActions, mapGetters } from 'vuex';
-import draggable from 'vuedraggable';
-import TableRow from '@/components/WorkspacePropsTableRow';
-import TableContext from '@/components/WorkspacePropsTableContext';
+import Draggable from 'vuedraggable';
+import TableRow from '@/components/WorkspaceTabPropsTableRow';
+import TableContext from '@/components/WorkspaceTabPropsTableContext';

 export default {
-   name: 'WorkspacePropsTable',
+   name: 'WorkspaceTabPropsTableFields',
   components: {
      TableRow,
      TableContext,
-      draggable
+      Draggable
   },
   props: {
      fields: Array,
@@ -220,6 +221,9 @@ export default {
         this.contextEvent = event;
         this.isContext = true;
      },
+      duplicateField () {
+         this.$emit('duplicate-field', this.selectedField._id);
+      },
      removeField () {
         this.$emit('remove-field', this.selectedField._id);
      },
--- a/src/renderer/components/WorkspaceTabPropsTableForeignModal.vue
+++ b/src/renderer/components/WorkspaceTabPropsTableForeignModal.vue
@@ -208,7 +208,7 @@ import Tables from '@/ipc-api/Tables';
 import ConfirmModal from '@/components/BaseConfirmModal';

 export default {
-   name: 'WorkspacePropsForeignModal',
+   name: 'WorkspaceTabPropsTableForeignModal',
   components: {
      ConfirmModal
   },
@@ -267,6 +267,12 @@ export default {
         addNotification: 'notifications/addNotification'
      }),
      confirmForeignsChange () {
+         this.foreignProxy = this.foreignProxy.filter(foreign =>
+            foreign.field &&
+            foreign.refField &&
+            foreign.table &&
+            foreign.refTable
+         );
         this.$emit('foreigns-update', this.foreignProxy);
      },
      selectForeign (event, id) {
@@ -331,6 +337,8 @@ export default {
         this.selectedForeignID = this.foreignProxy.length ? this.foreignProxy[0]._id : '';
      },
      async getRefFields () {
+         if (!this.selectedForeignObj.refTable) return;
+
         const params = {
            uid: this.connection.uid,
            schema: this.selectedForeignObj.refSchema,
--- a/src/renderer/components/WorkspaceTabPropsTableIndexesModal.vue
+++ b/src/renderer/components/WorkspaceTabPropsTableIndexesModal.vue
@@ -142,7 +142,7 @@ import { uidGen } from 'common/libs/uidGen';
 import ConfirmModal from '@/components/BaseConfirmModal';

 export default {
-   name: 'WorkspacePropsIndexesModal',
+   name: 'WorkspaceTabPropsTableIndexesModal',
   components: {
      ConfirmModal
   },
@@ -186,6 +186,7 @@ export default {
   },
   methods: {
      confirmIndexesChange () {
+         this.indexesProxy = this.indexesProxy.filter(index => index.fields.length);
         this.$emit('indexes-update', this.indexesProxy);
      },
      selectIndex (event, id) {
--- a/src/renderer/components/WorkspaceTabPropsTableRow.vue
+++ b/src/renderer/components/WorkspaceTabPropsTableRow.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="tr" @contextmenu.prevent="$emit('contextmenu', $event, localRow._id)">
-      <div class="td" tabindex="0">
+      <div class="td p-0" tabindex="0">
         <div :class="customizations.sortableFields ? 'row-draggable' : 'text-center'">
            <i v-if="customizations.sortableFields" class="mdi mdi-drag-horizontal row-draggable-icon" />
            {{ localRow.order }}
         </div>
      </div>
-      <div class="td" tabindex="0">
+      <div class="td p-0" tabindex="0">
         <div class="text-center">
            <i
               v-for="(index, i) in indexes"
@@ -23,7 +23,7 @@
            />
         </div>
      </div>
-      <div class="td" tabindex="0">
+      <div class="td p-0" tabindex="0">
         <span
            v-if="!isInlineEditor.name"
            class="cell-content"
@@ -37,12 +37,12 @@
            v-model="editingContent"
            type="text"
            autofocus
-            class="editable-field px-2"
+            class="editable-field form-input input-sm px-1"
            @blur="editOFF"
         >
      </div>
      <div
-         class="td text-uppercase"
+         class="td p-0 text-uppercase"
         tabindex="0"
      >
         <span
@@ -57,7 +57,7 @@
            v-else
            ref="editField"
            v-model="editingContent"
-            class="form-select editable-field small-select text-uppercase"
+            class="form-select editable-field pl-1 pr-4 small-select text-uppercase"
            @blur="editOFF"
         >
            <option v-if="!isInDataTypes">
@@ -81,7 +81,7 @@
      </div>
      <div
         v-if="customizations.tableArray"
-         class="td"
+         class="td p-0"
         tabindex="0"
      >
         <label class="form-checkbox">
@@ -89,7 +89,7 @@
            <i class="form-icon" />
         </label>
      </div>
-      <div class="td type-int" tabindex="0">
+      <div class="td p-0 type-int" tabindex="0">
         <template v-if="fieldType.length">
            <span
               v-if="!isInlineEditor.length"
@@ -109,7 +109,7 @@
               v-model="editingContent"
               type="text"
               autofocus
-               class="editable-field px-2"
+               class="editable-field form-input input-sm px-1"
               @blur="editOFF"
            >
            <input
@@ -118,14 +118,14 @@
               v-model="editingContent"
               type="number"
               autofocus
-               class="editable-field px-2"
+               class="editable-field form-input input-sm px-1"
               @blur="editOFF"
            >
         </template>
      </div>
      <div
         v-if="customizations.unsigned"
-         class="td"
+         class="td p-0"
         tabindex="0"
      >
         <label class="form-checkbox">
@@ -139,7 +139,7 @@
      </div>
      <div
         v-if="customizations.nullable"
-         class="td"
+         class="td p-0"
         tabindex="0"
      >
         <label class="form-checkbox">
@@ -153,7 +153,7 @@
      </div>
      <div
         v-if="customizations.zerofill"
-         class="td"
+         class="td p-0"
         tabindex="0"
      >
         <label class="form-checkbox">
@@ -165,14 +165,14 @@
            <i class="form-icon" />
         </label>
      </div>
-      <div class="td" tabindex="0">
+      <div class="td p-0" tabindex="0">
         <span class="cell-content" @dblclick="editON($event, localRow.default, 'default')">
            {{ fieldDefault }}
         </span>
      </div>
      <div
         v-if="customizations.comment"
-         class="td type-varchar"
+         class="td p-0 type-varchar"
         tabindex="0"
      >
         <span
@@ -188,13 +188,13 @@
            v-model="editingContent"
            type="text"
            autofocus
-            class="editable-field px-2"
+            class="editable-field form-input input-sm px-1"
            @blur="editOFF"
         >
      </div>
      <div
         v-if="customizations.collation"
-         class="td"
+         class="td p-0"
         tabindex="0"
      >
         <template v-if="fieldType.collation">
@@ -209,7 +209,7 @@
               v-else
               ref="editField"
               v-model="editingContent"
-               class="form-select small-select editable-field"
+               class="form-select small-select pl-1 pr-4 editable-field"
               @blur="editOFF"
            >
               <option
@@ -334,7 +334,7 @@ import { mapGetters } from 'vuex';
 import ConfirmModal from '@/components/BaseConfirmModal';

 export default {
-   name: 'WorkspacePropsTableRow',
+   name: 'WorkspaceTabPropsTableRow',
   components: {
      ConfirmModal
   },
@@ -450,7 +450,7 @@ export default {
         });

         this.defaultValue.onUpdate = this.localRow.onUpdate;
-         this.defaultValue.type = this.localRow.defaultType;
+         this.defaultValue.type = this.localRow.defaultType || 'noval';
         if (this.defaultValue.type === 'custom') {
            this.defaultValue.custom = this.localRow.default
               ? this.localRow.default.includes('\'')
@@ -458,8 +458,12 @@ export default {
                  : this.localRow.default
               : '';
         }
-         if (this.defaultValue.type === 'expression')
-            this.defaultValue.expression = this.localRow.default;
+         else if (this.defaultValue.type === 'expression') {
+            if (this.localRow.default.toUpperCase().includes('ON UPDATE'))
+               this.defaultValue.expression = this.localRow.default.replace(/ on update.*$/i, '');
+            else
+               this.defaultValue.expression = this.localRow.default;
+         }
      },
      editON (event, content, field) {
         if (field === 'length') {
@@ -571,12 +575,16 @@ export default {
  position: absolute;
  left: 0;
  right: 0;
+  max-height: 21px;
+  border-radius: 3px;
+  font-size: 0.7rem;
 }

 .row-draggable {
  position: relative;
  text-align: right;
  padding-left: 28px;
+  padding-right: 2px;
  cursor: grab;

  .row-draggable-icon {
@@ -598,13 +606,14 @@ export default {
  min-height: auto;

  .form-icon {
-    top: 0.15rem;
+    top: -0.65rem;
    left: calc(50% - 8px);
  }
 }

 .cell-content {
  display: block;
+  padding: 0 0.2rem;
  min-height: 0.8rem;
  text-overflow: ellipsis;
  white-space: nowrap;
--- a/src/renderer/components/WorkspaceTabPropsTrigger.vue
+++ b/src/renderer/components/WorkspaceTabPropsTrigger.vue
@@ -1,5 +1,5 @@
 <template>
-   <div class="workspace-query-tab column col-12 columns col-gapless">
+   <div v-show="isSelected" class="workspace-query-tab column col-12 columns col-gapless">
      <div class="workspace-query-runner column col-12">
         <div class="workspace-query-runner-footer">
            <div class="workspace-query-buttons">
@@ -23,10 +23,15 @@
                  <span>{{ $t('word.clear') }}</span>
               </button>
            </div>
+            <div class="workspace-query-info">
+               <div class="d-flex" :title="$t('word.schema')">
+                  <i class="mdi mdi-18px mdi-database mr-1" /><b>{{ schema }}</b>
+               </div>
+            </div>
         </div>
      </div>
      <div class="container">
-         <div class="columns mb-4">
+         <div class="columns">
            <div class="column col-auto">
               <div class="form-group">
                  <label class="form-label">{{ $t('word.name') }}</label>
@@ -66,49 +71,49 @@
                  </select>
               </div>
            </div>
-         </div>
-         <fieldset class="columns" :disabled="customizations.triggerOnlyRename">
-            <div class="column col-auto">
-               <div class="form-group">
-                  <label class="form-label">{{ $t('word.table') }}</label>
-                  <select v-model="localTrigger.table" class="form-select">
-                     <option v-for="table in schemaTables" :key="table.name">
-                        {{ table.name }}
-                     </option>
-                  </select>
-               </div>
-            </div>
-            <div class="column col-auto">
-               <div class="form-group">
-                  <label class="form-label">{{ $t('word.event') }}</label>
-                  <div class="input-group">
-                     <select v-model="localTrigger.activation" class="form-select">
-                        <option>BEFORE</option>
-                        <option>AFTER</option>
-                     </select>
-                     <select
-                        v-if="!customizations.triggerMultipleEvents"
-                        v-model="localTrigger.event"
-                        class="form-select"
-                     >
-                        <option v-for="event in Object.keys(localEvents)" :key="event">
-                           {{ event }}
+            <fieldset class="column columns mb-0" :disabled="customizations.triggerOnlyRename">
+               <div class="column col-auto">
+                  <div class="form-group">
+                     <label class="form-label">{{ $t('word.table') }}</label>
+                     <select v-model="localTrigger.table" class="form-select">
+                        <option v-for="table in schemaTables" :key="table.name">
+                           {{ table.name }}
                        </option>
                     </select>
-                     <div v-if="customizations.triggerMultipleEvents" class="px-4">
-                        <label
-                           v-for="event in Object.keys(localEvents)"
-                           :key="event"
-                           class="form-checkbox form-inline"
-                           @change.prevent="changeEvents(event)"
+                  </div>
+               </div>
+               <div class="column col-auto">
+                  <div class="form-group">
+                     <label class="form-label">{{ $t('word.event') }}</label>
+                     <div class="input-group">
+                        <select v-model="localTrigger.activation" class="form-select">
+                           <option>BEFORE</option>
+                           <option>AFTER</option>
+                        </select>
+                        <select
+                           v-if="!customizations.triggerMultipleEvents"
+                           v-model="localTrigger.event"
+                           class="form-select"
                        >
-                           <input :checked="localEvents[event]" type="checkbox"><i class="form-icon" /> {{ event }}
-                        </label>
+                           <option v-for="event in Object.keys(localEvents)" :key="event">
+                              {{ event }}
+                           </option>
+                        </select>
+                        <div v-if="customizations.triggerMultipleEvents" class="px-4">
+                           <label
+                              v-for="event in Object.keys(localEvents)"
+                              :key="event"
+                              class="form-checkbox form-inline"
+                              @change.prevent="changeEvents(event)"
+                           >
+                              <input :checked="localEvents[event]" type="checkbox"><i class="form-icon" /> {{ event }}
+                           </label>
+                        </div>
                     </div>
                  </div>
               </div>
-            </div>
-         </fieldset>
+            </fieldset>
+         </div>
      </div>
      <div class="workspace-query-results column col-12 mt-2 p-relative">
         <BaseLoader v-if="isLoading" />
@@ -132,18 +137,19 @@ import BaseLoader from '@/components/BaseLoader';
 import Triggers from '@/ipc-api/Triggers';

 export default {
-   name: 'WorkspacePropsTabTrigger',
+   name: 'WorkspaceTabPropsTrigger',
   components: {
      BaseLoader,
      QueryEditor
   },
   props: {
      connection: Object,
-      trigger: String
+      trigger: String,
+      isSelected: Boolean,
+      schema: String
   },
   data () {
      return {
-         tabUid: 'prop',
         isLoading: false,
         isSaving: false,
         originalTrigger: null,
@@ -162,15 +168,12 @@ export default {
      workspace () {
         return this.getWorkspace(this.connection.uid);
      },
+      tabUid () {
+         return this.$vnode.key;
+      },
      customizations () {
         return this.workspace.customizations;
      },
-      isSelected () {
-         return this.workspace.selected_tab === 'prop' && this.selectedWorkspace === this.workspace.uid && this.trigger;
-      },
-      schema () {
-         return this.workspace.breadcrumbs.schema;
-      },
      isChanged () {
         return JSON.stringify(this.originalTrigger) !== JSON.stringify(this.localTrigger);
      },
@@ -186,6 +189,13 @@ export default {
      }
   },
   watch: {
+      async schema () {
+         if (this.isSelected) {
+            await this.getTriggerData();
+            this.$refs.queryEditor.editor.session.setValue(this.localTrigger.sql);
+            this.lastTrigger = this.trigger;
+         }
+      },
      async trigger () {
         if (this.isSelected) {
            await this.getTriggerData();
@@ -194,26 +204,32 @@ export default {
         }
      },
      async isSelected (val) {
-         if (val && this.lastTrigger !== this.trigger) {
-            await this.getTriggerData();
-            this.$refs.queryEditor.editor.session.setValue(this.localTrigger.sql);
-            this.lastTrigger = this.trigger;
+         if (val) {
+            this.changeBreadcrumbs({ schema: this.schema, trigger: this.trigger });
+
+            setTimeout(() => {
+               this.resizeQueryEditor();
+            }, 200);
+
+            if (this.lastTrigger !== this.trigger)
+               this.getTriggerData();
         }
      },
      isChanged (val) {
-         if (this.isSelected && this.lastTrigger === this.trigger && this.trigger !== null)
-            this.setUnsavedChanges(val);
+         this.setUnsavedChanges({ uid: this.connection.uid, tUid: this.tabUid, isChanged: val });
      }
   },
+   async created () {
+      await this.getTriggerData();
+      this.$refs.queryEditor.editor.session.setValue(this.localTrigger.sql);
+      window.addEventListener('keydown', this.onKey);
+   },
   mounted () {
      window.addEventListener('resize', this.resizeQueryEditor);
   },
   destroyed () {
      window.removeEventListener('resize', this.resizeQueryEditor);
   },
-   created () {
-      window.addEventListener('keydown', this.onKey);
-   },
   beforeDestroy () {
      window.removeEventListener('keydown', this.onKey);
   },
@@ -221,8 +237,10 @@ export default {
      ...mapActions({
         addNotification: 'notifications/addNotification',
         refreshStructure: 'workspaces/refreshStructure',
-         setUnsavedChanges: 'workspaces/setUnsavedChanges',
-         changeBreadcrumbs: 'workspaces/changeBreadcrumbs'
+         renameTabs: 'workspaces/renameTabs',
+         newTab: 'workspaces/newTab',
+         changeBreadcrumbs: 'workspaces/changeBreadcrumbs',
+         setUnsavedChanges: 'workspaces/setUnsavedChanges'
      }),
      async getTriggerData () {
         if (!this.trigger) return;
@@ -233,11 +251,12 @@ export default {

         this.localTrigger = { sql: '' };
         this.isLoading = true;
+         this.lastTrigger = this.trigger;

         const params = {
            uid: this.connection.uid,
            schema: this.schema,
-            trigger: this.workspace.breadcrumbs.trigger
+            trigger: this.trigger
         };

         try {
@@ -278,9 +297,9 @@ export default {
         this.isSaving = true;
         const params = {
            uid: this.connection.uid,
-            schema: this.schema,
            trigger: {
               ...this.localTrigger,
+               schema: this.schema,
               oldName: this.originalTrigger.name
            }
         };
@@ -289,17 +308,24 @@ export default {
            const { status, response } = await Triggers.alterTrigger(params);

            if (status === 'success') {
-               const oldName = this.originalTrigger.name;
-
               await this.refreshStructure(this.connection.uid);

-               if (oldName !== this.localTrigger.name) {
-                  this.setUnsavedChanges(false);
+               if (this.originalTrigger.name !== this.localTrigger.name) {
                  const triggerName = this.customizations.triggerTableInName ? `${this.localTrigger.table}.${this.localTrigger.name}` : this.localTrigger.name;
+                  const triggerOldName = this.customizations.triggerTableInName ? `${this.originalTrigger.table}.${this.originalTrigger.name}` : this.originalTrigger.name;
+
+                  this.renameTabs({
+                     uid: this.connection.uid,
+                     schema: this.schema,
+                     elementName: triggerOldName,
+                     elementNewName: triggerName,
+                     elementType: 'trigger'
+                  });
+
                  this.changeBreadcrumbs({ schema: this.schema, trigger: triggerName });
               }
-
-               this.getTriggerData();
+               else
+                  this.getTriggerData();
            }
            else
               this.addNotification({ status: 'error', message: response });
--- a/src/renderer/components/WorkspaceTabPropsTriggerFunction.vue
+++ b/src/renderer/components/WorkspaceTabPropsTriggerFunction.vue
@@ -1,5 +1,5 @@
 <template>
-   <div class="workspace-query-tab column col-12 columns col-gapless">
+   <div v-show="isSelected" class="workspace-query-tab column col-12 columns col-gapless">
      <div class="workspace-query-runner column col-12">
         <div class="workspace-query-runner-footer">
            <div class="workspace-query-buttons">
@@ -22,13 +22,60 @@
                  <i class="mdi mdi-24px mdi-delete-sweep mr-1" />
                  <span>{{ $t('word.clear') }}</span>
               </button>
-
-               <div class="divider-vert py-3" />
-
-               <button class="btn btn-dark btn-sm" @click="showOptionsModal">
-                  <i class="mdi mdi-24px mdi-cogs mr-1" />
-                  <span>{{ $t('word.options') }}</span>
-               </button>
+            </div>
+         </div>
+      </div>
+      <div class="container">
+         <div class="columns">
+            <div v-if="customizations.triggerFunctionlanguages" class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('word.language') }}
+                  </label>
+                  <select v-model="localFunction.language" class="form-select">
+                     <option v-for="language in customizations.triggerFunctionlanguages" :key="language">
+                        {{ language }}
+                     </option>
+                  </select>
+               </div>
+            </div>
+            <div v-if="customizations.definer" class="column col-auto">
+               <div class="form-group">
+                  <label class="form-label">
+                     {{ $t('word.definer') }}
+                  </label>
+                  <select
+                     v-if="workspace.users.length"
+                     v-model="localFunction.definer"
+                     class="form-select"
+                  >
+                     <option value="">
+                        {{ $t('message.currentUser') }}
+                     </option>
+                     <option
+                        v-for="user in workspace.users"
+                        :key="`${user.name}@${user.host}`"
+                        :value="`\`${user.name}\`@\`${user.host}\``"
+                     >
+                        {{ user.name }}@{{ user.host }}
+                     </option>
+                  </select>
+                  <select v-if="!workspace.users.length" class="form-select">
+                     <option value="">
+                        {{ $t('message.currentUser') }}
+                     </option>
+                  </select>
+               </div>
+            </div>
+            <div v-if="customizations.comment" class="form-group">
+               <label class="form-label">
+                  {{ $t('word.comment') }}
+               </label>
+               <input
+                  v-model="localFunction.comment"
+                  class="form-input"
+                  type="text"
+               >
            </div>
         </div>
      </div>
@@ -44,13 +91,6 @@
            :height="editorHeight"
         />
      </div>
-      <WorkspacePropsTriggerFunctionOptionsModal
-         v-if="isOptionsModal"
-         :local-options="localFunction"
-         :workspace="workspace"
-         @hide="hideOptionsModal"
-         @options-update="optionsUpdate"
-      />
      <ModalAskParameters
         v-if="isAskingParameters"
         :local-routine="localFunction"
@@ -66,28 +106,26 @@ import { mapGetters, mapActions } from 'vuex';
 import { uidGen } from 'common/libs/uidGen';
 import BaseLoader from '@/components/BaseLoader';
 import QueryEditor from '@/components/QueryEditor';
-import WorkspacePropsTriggerFunctionOptionsModal from '@/components/WorkspacePropsTriggerFunctionOptionsModal';
 import ModalAskParameters from '@/components/ModalAskParameters';
 import Functions from '@/ipc-api/Functions';

 export default {
-   name: 'WorkspacePropsTabTriggerFunction',
+   name: 'WorkspaceTabPropsTriggerFunction',
   components: {
      BaseLoader,
      QueryEditor,
-      WorkspacePropsTriggerFunctionOptionsModal,
      ModalAskParameters
   },
   props: {
      connection: Object,
-      function: String
+      function: String,
+      isSelected: Boolean,
+      schema: String
   },
   data () {
      return {
-         tabUid: 'prop',
         isLoading: false,
         isSaving: false,
-         isOptionsModal: false,
         isParamsModal: false,
         isAskingParameters: false,
         originalFunction: null,
@@ -105,11 +143,11 @@ export default {
      workspace () {
         return this.getWorkspace(this.connection.uid);
      },
-      isSelected () {
-         return this.workspace.selected_tab === 'prop' && this.selectedWorkspace === this.workspace.uid && this.function;
+      customizations () {
+         return this.workspace.customizations;
      },
-      schema () {
-         return this.workspace.breadcrumbs.schema;
+      tabUid () {
+         return this.$vnode.key;
      },
      isChanged () {
         return JSON.stringify(this.originalFunction) !== JSON.stringify(this.localFunction);
@@ -128,6 +166,13 @@ export default {
      }
   },
   watch: {
+      async schema () {
+         if (this.isSelected) {
+            await this.getFunctionData();
+            this.$refs.queryEditor.editor.session.setValue(this.localFunction.sql);
+            this.lastFunction = this.function;
+         }
+      },
      async function () {
         if (this.isSelected) {
            await this.getFunctionData();
@@ -136,26 +181,32 @@ export default {
         }
      },
      async isSelected (val) {
-         if (val && this.lastFunction !== this.function) {
-            await this.getFunctionData();
-            this.$refs.queryEditor.editor.session.setValue(this.localFunction.sql);
-            this.lastFunction = this.function;
+         if (val) {
+            this.changeBreadcrumbs({ schema: this.schema, triggerFunction: this.function });
+
+            setTimeout(() => {
+               this.resizeQueryEditor();
+            }, 200);
+
+            if (this.lastFunction !== this.function)
+               await this.getFunctionData();
         }
      },
      isChanged (val) {
-         if (this.isSelected && this.lastFunction === this.function && this.function !== null)
-            this.setUnsavedChanges(val);
+         this.setUnsavedChanges({ uid: this.connection.uid, tUid: this.tabUid, isChanged: val });
      }
   },
+   async created () {
+      await this.getFunctionData();
+      this.$refs.queryEditor.editor.session.setValue(this.localFunction.sql);
+      window.addEventListener('keydown', this.onKey);
+   },
   mounted () {
      window.addEventListener('resize', this.resizeQueryEditor);
   },
   destroyed () {
      window.removeEventListener('resize', this.resizeQueryEditor);
   },
-   created () {
-      window.addEventListener('keydown', this.onKey);
-   },
   beforeDestroy () {
      window.removeEventListener('keydown', this.onKey);
   },
@@ -163,20 +214,22 @@ export default {
      ...mapActions({
         addNotification: 'notifications/addNotification',
         refreshStructure: 'workspaces/refreshStructure',
-         setUnsavedChanges: 'workspaces/setUnsavedChanges',
+         renameTabs: 'workspaces/renameTabs',
+         newTab: 'workspaces/newTab',
         changeBreadcrumbs: 'workspaces/changeBreadcrumbs',
-         newTab: 'workspaces/newTab'
+         setUnsavedChanges: 'workspaces/setUnsavedChanges'
      }),
      async getFunctionData () {
         if (!this.function) return;

         this.isLoading = true;
         this.localFunction = { sql: '' };
+         this.lastFunction = this.function;

         const params = {
            uid: this.connection.uid,
            schema: this.schema,
-            func: this.workspace.breadcrumbs.triggerFunction
+            func: this.function
         };

         try {
@@ -207,9 +260,9 @@ export default {
         this.isSaving = true;
         const params = {
            uid: this.connection.uid,
-            schema: this.schema,
            func: {
               ...this.localFunction,
+               schema: this.schema,
               oldName: this.originalFunction.name
            }
         };
@@ -223,11 +276,18 @@ export default {
               await this.refreshStructure(this.connection.uid);

               if (oldName !== this.localFunction.name) {
-                  this.setUnsavedChanges(false);
-                  this.changeBreadcrumbs({ schema: this.schema, function: this.localFunction.name });
-               }
+                  this.renameTabs({
+                     uid: this.connection.uid,
+                     schema: this.schema,
+                     elementName: oldName,
+                     elementNewName: this.localFunction.name,
+                     elementType: 'triggerFunction'
+                  });

-               this.getFunctionData();
+                  this.changeBreadcrumbs({ schema: this.schema, triggerFunction: this.localFunction.name });
+               }
+               else
+                  this.getFunctionData();
            }
            else
               this.addNotification({ status: 'error', message: response });
@@ -281,13 +341,7 @@ export default {
               sql = `SELECT \`${this.originalFunction.name}\` (${params.join(',')})`;
         }

-         this.newTab({ uid: this.connection.uid, content: sql, autorun: true });
-      },
-      showOptionsModal () {
-         this.isOptionsModal = true;
-      },
-      hideOptionsModal () {
-         this.isOptionsModal = false;
+         this.newTab({ uid: this.connection.uid, content: sql, type: 'query', autorun: true });
      },
      showParamsModal () {
         this.isParamsModal = true;
--- a/src/renderer/components/WorkspaceTabPropsView.vue
+++ b/src/renderer/components/WorkspaceTabPropsView.vue
@@ -1,5 +1,5 @@
 <template>
-   <div class="workspace-query-tab column col-12 columns col-gapless">
+   <div v-show="isSelected" class="workspace-query-tab column col-12 columns col-gapless">
      <div class="workspace-query-runner column col-12">
         <div class="workspace-query-runner-footer">
            <div class="workspace-query-buttons">
@@ -23,10 +23,15 @@
                  <span>{{ $t('word.clear') }}</span>
               </button>
            </div>
+            <div class="workspace-query-info">
+               <div class="d-flex" :title="$t('word.schema')">
+                  <i class="mdi mdi-18px mdi-database mr-1" /><b>{{ schema }}</b>
+               </div>
+            </div>
         </div>
      </div>
      <div class="container">
-         <div class="columns mb-4">
+         <div class="columns">
            <div class="column col-auto">
               <div class="form-group">
                  <label class="form-label">{{ $t('word.name') }}</label>
@@ -66,93 +71,35 @@
                  </select>
               </div>
            </div>
-         </div>
-         <div class="columns">
            <div class="column col-auto mr-2">
               <div v-if="workspace.customizations.viewSqlSecurity" class="form-group">
                  <label class="form-label">{{ $t('message.sqlSecurity') }}</label>
-                  <label class="form-radio">
-                     <input
-                        v-model="localView.security"
-                        type="radio"
-                        name="security"
-                        value="DEFINER"
-                     >
-                     <i class="form-icon" /> DEFINER
-                  </label>
-                  <label class="form-radio">
-                     <input
-                        v-model="localView.security"
-                        type="radio"
-                        name="security"
-                        value="INVOKER"
-                     >
-                     <i class="form-icon" /> INVOKER
-                  </label>
+                  <select v-model="localView.security" class="form-select">
+                     <option>DEFINER</option>
+                     <option>INVOKER</option>
+                  </select>
               </div>
            </div>
            <div class="column col-auto mr-2">
               <div v-if="workspace.customizations.viewAlgorithm" class="form-group">
                  <label class="form-label">{{ $t('word.algorithm') }}</label>
-                  <label class="form-radio">
-                     <input
-                        v-model="localView.algorithm"
-                        type="radio"
-                        name="algorithm"
-                        value="UNDEFINED"
-                     >
-                     <i class="form-icon" /> UNDEFINED
-                  </label>
-                  <label class="form-radio">
-                     <input
-                        v-model="localView.algorithm"
-                        type="radio"
-                        value="MERGE"
-                        name="algorithm"
-                     >
-                     <i class="form-icon" /> MERGE
-                  </label>
-                  <label class="form-radio">
-                     <input
-                        v-model="localView.algorithm"
-                        type="radio"
-                        value="TEMPTABLE"
-                        name="algorithm"
-                     >
-                     <i class="form-icon" /> TEMPTABLE
-                  </label>
+                  <select v-model="localView.algorithm" class="form-select">
+                     <option>UNDEFINED</option>
+                     <option>MERGE</option>
+                     <option>TEMPTABLE</option>
+                  </select>
               </div>
            </div>
            <div v-if="workspace.customizations.viewUpdateOption" class="column col-auto mr-2">
               <div class="form-group">
                  <label class="form-label">{{ $t('message.updateOption') }}</label>
-                  <label class="form-radio">
-                     <input
-                        v-model="localView.updateOption"
-                        type="radio"
-                        name="update"
-                        value=""
-                     >
-                     <i class="form-icon" /> None
-                  </label>
-                  <label class="form-radio">
-                     <input
-                        v-model="localView.updateOption"
-                        type="radio"
-                        name="update"
-                        value="CASCADED"
-                     >
-                     <i class="form-icon" /> CASCADED
-                  </label>
-                  <label class="form-radio">
-                     <input
-                        v-model="localView.updateOption"
-                        type="radio"
-                        name="update"
-                        value="LOCAL"
-                     >
-                     <i class="form-icon" /> LOCAL
-                  </label>
+                  <select v-model="localView.updateOption" class="form-select">
+                     <option value="">
+                        None
+                     </option>
+                     <option>CASCADED</option>
+                     <option>LOCAL</option>
+                  </select>
               </div>
            </div>
         </div>
@@ -161,7 +108,7 @@
         <BaseLoader v-if="isLoading" />
         <label class="form-label ml-2">{{ $t('message.selectStatement') }}</label>
         <QueryEditor
-            v-if="isSelected"
+            v-show="isSelected"
            ref="queryEditor"
            :value.sync="localView.sql"
            :workspace="workspace"
@@ -179,18 +126,19 @@ import QueryEditor from '@/components/QueryEditor';
 import Views from '@/ipc-api/Views';

 export default {
-   name: 'WorkspacePropsTabView',
+   name: 'WorkspaceTabPropsView',
   components: {
      BaseLoader,
      QueryEditor
   },
   props: {
      connection: Object,
+      isSelected: Boolean,
+      schema: String,
      view: String
   },
   data () {
      return {
-         tabUid: 'prop',
         isLoading: false,
         isSaving: false,
         originalView: null,
@@ -208,11 +156,8 @@ export default {
      workspace () {
         return this.getWorkspace(this.connection.uid);
      },
-      isSelected () {
-         return this.workspace.selected_tab === 'prop' && this.selectedWorkspace === this.workspace.uid && this.view;
-      },
-      schema () {
-         return this.workspace.breadcrumbs.schema;
+      tabUid () {
+         return this.$vnode.key;
      },
      isChanged () {
         return JSON.stringify(this.originalView) !== JSON.stringify(this.localView);
@@ -222,6 +167,13 @@ export default {
      }
   },
   watch: {
+      async schema () {
+         if (this.isSelected) {
+            await this.getViewData();
+            this.$refs.queryEditor.editor.session.setValue(this.localView.sql);
+            this.lastView = this.view;
+         }
+      },
      async view () {
         if (this.isSelected) {
            await this.getViewData();
@@ -229,27 +181,33 @@ export default {
            this.lastView = this.view;
         }
      },
-      async isSelected (val) {
-         if (val && this.lastView !== this.view) {
-            await this.getViewData();
-            this.$refs.queryEditor.editor.session.setValue(this.localView.sql);
-            this.lastView = this.view;
+      isSelected (val) {
+         if (val) {
+            this.changeBreadcrumbs({ schema: this.schema, view: this.view });
+
+            setTimeout(() => {
+               this.resizeQueryEditor();
+            }, 200);
+
+            if (this.lastView !== this.view)
+               this.getViewData();
         }
      },
      isChanged (val) {
-         if (this.isSelected && this.lastView === this.view && this.view !== null)
-            this.setUnsavedChanges(val);
+         this.setUnsavedChanges({ uid: this.connection.uid, tUid: this.tabUid, isChanged: val });
      }
   },
+   async created () {
+      await this.getViewData();
+      this.$refs.queryEditor.editor.session.setValue(this.localView.sql);
+      window.addEventListener('keydown', this.onKey);
+   },
   mounted () {
      window.addEventListener('resize', this.resizeQueryEditor);
   },
   destroyed () {
      window.removeEventListener('resize', this.resizeQueryEditor);
   },
-   created () {
-      window.addEventListener('keydown', this.onKey);
-   },
   beforeDestroy () {
      window.removeEventListener('keydown', this.onKey);
   },
@@ -258,17 +216,19 @@ export default {
         addNotification: 'notifications/addNotification',
         refreshStructure: 'workspaces/refreshStructure',
         setUnsavedChanges: 'workspaces/setUnsavedChanges',
-         changeBreadcrumbs: 'workspaces/changeBreadcrumbs'
+         changeBreadcrumbs: 'workspaces/changeBreadcrumbs',
+         renameTabs: 'workspaces/renameTabs'
      }),
      async getViewData () {
         if (!this.view) return;
         this.isLoading = true;
         this.localView = { sql: '' };
+         this.lastView = this.view;

         const params = {
            uid: this.connection.uid,
            schema: this.schema,
-            view: this.workspace.breadcrumbs.view
+            view: this.view
         };

         try {
@@ -293,9 +253,9 @@ export default {
         this.isSaving = true;
         const params = {
            uid: this.connection.uid,
-            schema: this.schema,
            view: {
               ...this.localView,
+               schema: this.schema,
               oldName: this.originalView.name
            }
         };
@@ -309,11 +269,18 @@ export default {
               await this.refreshStructure(this.connection.uid);

               if (oldName !== this.localView.name) {
-                  this.setUnsavedChanges(false);
+                  this.renameTabs({
+                     uid: this.connection.uid,
+                     schema: this.schema,
+                     elementName: oldName,
+                     elementNewName: this.localView.name,
+                     elementType: 'view'
+                  });
+
                  this.changeBreadcrumbs({ schema: this.schema, view: this.localView.name });
               }
-
-               this.getViewData();
+               else
+                  this.getViewData();
            }
            else
               this.addNotification({ status: 'error', message: response });
--- a/src/renderer/components/WorkspaceTabQuery.vue
+++ b/src/renderer/components/WorkspaceTabQuery.vue
@@ -1,11 +1,12 @@
 <template>
   <div
      v-show="isSelected"
-      class="workspace-query-tab column col-12 columns col-gapless no-outline"
+      class="workspace-query-tab column col-12 columns col-gapless no-outline p-0"
      tabindex="0"
      @keydown.116="runQuery(query)"
      @keydown.ctrl.87="clear"
-      @keydown.ctrl.119="beautify"
+      @keydown.ctrl.66="beautify"
+      @keydown.ctrl.71="openHistoryModal"
   >
      <div class="workspace-query-runner column col-12">
         <QueryEditor
@@ -14,7 +15,7 @@
            :auto-focus="true"
            :value.sync="query"
            :workspace="workspace"
-            :schema="schema"
+            :schema="breadcrumbsSchema"
            :is-selected="isSelected"
            :height="editorHeight"
         />
@@ -32,16 +33,7 @@
                  <span>{{ $t('word.run') }}</span>
               </button>
               <button
-                  class="btn btn-dark btn-sm"
-                  :disabled="!query || isQuering"
-                  title="CTRL+F8"
-                  @click="beautify()"
-               >
-                  <i class="mdi mdi-24px mdi-brush pr-1" />
-                  <span>{{ $t('word.format') }}</span>
-               </button>
-               <button
-                  class="btn btn-link btn-sm"
+                  class="btn btn-link btn-sm mr-0"
                  :disabled="!query || isQuering"
                  title="CTRL+W"
                  @click="clear()"
@@ -52,6 +44,24 @@

               <div class="divider-vert py-3" />

+               <button
+                  class="btn btn-dark btn-sm"
+                  :disabled="!query || isQuering"
+                  title="CTRL+B"
+                  @click="beautify()"
+               >
+                  <i class="mdi mdi-24px mdi-brush pr-1" />
+                  <span>{{ $t('word.format') }}</span>
+               </button>
+               <button
+                  class="btn btn-dark btn-sm"
+                  :disabled="isQuering"
+                  title="CTRL+G"
+                  @click="openHistoryModal()"
+               >
+                  <i class="mdi mdi-24px mdi-history pr-1" />
+                  <span>{{ $t('word.history') }}</span>
+               </button>
               <div class="dropdown table-dropdown pr-2">
                  <button
                     :disabled="!results.length || isQuering"
@@ -86,19 +96,24 @@
               <div v-if="affectedCount">
                  {{ $t('message.affectedRows') }}: <b>{{ affectedCount }}</b>
               </div>
-               <div
-                  v-if="workspace.breadcrumbs.schema"
-                  class="d-flex"
-                  :title="$t('word.schema')"
-               >
-                  <i class="mdi mdi-18px mdi-database mr-1" /><b>{{ workspace.breadcrumbs.schema }}</b>
+               <div class="input-group" :title="$t('word.schema')">
+                  <i class="input-group-addon addon-sm mdi mdi-24px mdi-database" />
+                  <select v-model="selectedSchema" class="form-select select-sm text-bold">
+                     <option :value="null">
+                        {{ $t('message.noSchema') }}
+                     </option>
+                     <option v-for="schemaName in databaseSchemas" :key="schemaName">
+                        {{ schemaName }}
+                     </option>
+                  </select>
               </div>
            </div>
         </div>
      </div>
+      <WorkspaceTabQueryEmptyState v-if="!results.length && !isQuering" />
      <div class="workspace-query-results p-relative column col-12">
         <BaseLoader v-if="isQuering" />
-         <WorkspaceQueryTable
+         <WorkspaceTabQueryTable
            v-if="results"
            v-show="!isQuering"
            ref="queryTable"
@@ -111,24 +126,34 @@
            @delete-selected="deleteSelected"
         />
      </div>
+      <ModalHistory
+         v-if="isHistoryOpen"
+         :connection="connection"
+         @select-query="selectQuery"
+         @close="isHistoryOpen = false"
+      />
   </div>
 </template>

 <script>
 import { format } from 'sql-formatter';
+import { mapGetters, mapActions } from 'vuex';
 import Schema from '@/ipc-api/Schema';
 import QueryEditor from '@/components/QueryEditor';
 import BaseLoader from '@/components/BaseLoader';
-import WorkspaceQueryTable from '@/components/WorkspaceQueryTable';
-import { mapGetters, mapActions } from 'vuex';
+import WorkspaceTabQueryTable from '@/components/WorkspaceTabQueryTable';
+import WorkspaceTabQueryEmptyState from '@/components/WorkspaceTabQueryEmptyState';
+import ModalHistory from '@/components/ModalHistory';
 import tableTabs from '@/mixins/tableTabs';

 export default {
-   name: 'WorkspaceQueryTab',
+   name: 'WorkspaceTabQuery',
   components: {
      BaseLoader,
      QueryEditor,
-      WorkspaceQueryTable
+      WorkspaceTabQueryTable,
+      WorkspaceTabQueryEmptyState,
+      ModalHistory
   },
   mixins: [tableTabs],
   props: {
@@ -142,26 +167,51 @@ export default {
         lastQuery: '',
         isQuering: false,
         results: [],
+         selectedSchema: null,
         resultsCount: 0,
         durationsCount: 0,
         affectedCount: 0,
-         editorHeight: 200
+         editorHeight: 200,
+         isHistoryOpen: false
      };
   },
   computed: {
      ...mapGetters({
         getWorkspace: 'workspaces/getWorkspace',
-         selectedWorkspace: 'workspaces/getSelected'
+         selectedWorkspace: 'workspaces/getSelected',
+         getHistoryByWorkspace: 'history/getHistoryByWorkspace'
      }),
      workspace () {
         return this.getWorkspace(this.connection.uid);
      },
+      breadcrumbsSchema () {
+         return this.workspace.breadcrumbs.schema || null;
+      },
+      databaseSchemas () {
+         return this.workspace.structure.reduce((acc, curr) => {
+            acc.push(curr.name);
+            return acc;
+         }, []);
+      },
      isWorkspaceSelected () {
         return this.workspace.uid === this.selectedWorkspace;
+      },
+      history () {
+         return this.getHistoryByWorkspace(this.connection.uid) || [];
+      }
+   },
+   watch: {
+      isSelected (val) {
+         if (val)
+            this.changeBreadcrumbs({ schema: this.selectedSchema, query: `Query #${this.tab.index}` });
+      },
+      selectedSchema () {
+         this.changeBreadcrumbs({ schema: this.selectedSchema, query: `Query #${this.tab.index}` });
      }
   },
   created () {
      this.query = this.tab.content;
+      this.selectedSchema = this.tab.schema || this.breadcrumbsSchema;

      window.addEventListener('keydown', this.onKey);
   },
@@ -183,7 +233,10 @@ export default {
   },
   methods: {
      ...mapActions({
-         addNotification: 'notifications/addNotification'
+         addNotification: 'notifications/addNotification',
+         changeBreadcrumbs: 'workspaces/changeBreadcrumbs',
+         updateTabContent: 'workspaces/updateTabContent',
+         saveHistory: 'history/saveHistory'
      }),
      async runQuery (query) {
         if (!query || this.isQuering) return;
@@ -194,7 +247,7 @@ export default {
         try { // Query Data
            const params = {
               uid: this.connection.uid,
-               schema: this.schema,
+               schema: this.selectedSchema,
               query
            };

@@ -205,6 +258,15 @@ export default {
               this.resultsCount += this.results.reduce((acc, curr) => acc + (curr.rows ? curr.rows.length : 0), 0);
               this.durationsCount += this.results.reduce((acc, curr) => acc + curr.duration, 0);
               this.affectedCount += this.results.reduce((acc, curr) => acc + (curr.report ? curr.report.affectedRows : 0), 0);
+
+               this.updateTabContent({
+                  uid: this.connection.uid,
+                  tab: this.tab.uid,
+                  type: 'query',
+                  schema: this.selectedSchema,
+                  content: query
+               });
+               this.saveHistory(params);
            }
            else
               this.addNotification({ status: 'error', message: response });
@@ -263,6 +325,15 @@ export default {
            this.$refs.queryEditor.editor.session.setValue(formattedQuery);
         }
      },
+      openHistoryModal () {
+         this.isHistoryOpen = true;
+      },
+      selectQuery (sql) {
+         if (this.$refs.queryEditor)
+            this.$refs.queryEditor.editor.session.setValue(sql);
+
+         this.isHistoryOpen = false;
+      },
      clear () {
         if (this.$refs.queryEditor)
            this.$refs.queryEditor.editor.session.setValue('');
@@ -303,8 +374,10 @@ export default {
      align-items: center;
      height: 42px;

-      .workspace-query-buttons {
+      .workspace-query-buttons,
+      .workspace-query-info {
        display: flex;
+        align-items: center;

        .btn {
          display: flex;
@@ -314,7 +387,7 @@ export default {
      }

      .workspace-query-info {
-        display: flex;
+        overflow: visible;

        > div + div {
          padding-left: 0.6rem;
--- a/src/renderer/components/WorkspaceTabQueryEmptyState.vue
+++ b/src/renderer/components/WorkspaceTabQueryEmptyState.vue
@@ -0,0 +1,47 @@
+<template>
+   <div class="container">
+      <div class="columns">
+         <div class="column col-16 text-right">
+            <div class="mb-4">
+               {{ $t('message.runQuery') }}
+            </div>
+            <div class="mb-4">
+               {{ $t('word.format') }}
+            </div>
+            <div class="mb-4">
+               {{ $t('word.clear') }}
+            </div>
+            <div class="mb-4">
+               {{ $t('word.history') }}
+            </div>
+         </div>
+         <div class="column col-16">
+            <div class="mb-4">
+               <code>F5</code>
+            </div>
+            <div class="mb-4">
+               <code>CTRL</code> + <code>B</code>
+            </div>
+            <div class="mb-4">
+               <code>CTRL</code> + <code>W</code>
+            </div>
+            <div class="mb-4">
+               <code>CTRL</code> + <code>G</code>
+            </div>
+         </div>
+      </div>
+   </div>
+</template>
+
+<script>
+export default {
+   name: 'WorkspaceTabQueryEmptyState'
+};
+</script>
+
+<style scoped>
+.container {
+  padding-top: 15vh;
+  opacity: 0.6;
+}
+</style>
--- a/src/renderer/components/WorkspaceTabQueryTable.vue
+++ b/src/renderer/components/WorkspaceTabQueryTable.vue
@@ -10,6 +10,7 @@
         v-if="isContext"
         :context-event="contextEvent"
         :selected-rows="selectedRows"
+         :selected-cell="selectedCell"
         @show-delete-modal="showDeleteConfirmModal"
         @set-null="setNull"
         @copy-cell="copyCell"
@@ -65,12 +66,13 @@
            :scroll-element="scrollElement"
         >
            <template slot-scope="{ items }">
-               <WorkspaceQueryTableRow
+               <WorkspaceTabQueryTableRow
                  v-for="row in items"
                  :key="row._id"
                  :row="row"
                  :fields="fieldsObj"
                  :key-usage="keyUsage"
+                  :element-type="elementType"
                  :class="{'selected': selectedRows.includes(row._id)}"
                  @select-row="selectRow($event, row._id)"
                  @update-field="updateField($event, row)"
@@ -105,17 +107,17 @@ import { uidGen } from 'common/libs/uidGen';
 import arrayToFile from '../libs/arrayToFile';
 import { TEXT, LONG_TEXT, BLOB } from 'common/fieldTypes';
 import BaseVirtualScroll from '@/components/BaseVirtualScroll';
-import WorkspaceQueryTableRow from '@/components/WorkspaceQueryTableRow';
-import TableContext from '@/components/WorkspaceQueryTableContext';
+import WorkspaceTabQueryTableRow from '@/components/WorkspaceTabQueryTableRow';
+import TableContext from '@/components/WorkspaceTabQueryTableContext';
 import ConfirmModal from '@/components/BaseConfirmModal';
 import { mapActions, mapGetters } from 'vuex';
 import moment from 'moment';

 export default {
-   name: 'WorkspaceQueryTable',
+   name: 'WorkspaceTabQueryTable',
   components: {
      BaseVirtualScroll,
-      WorkspaceQueryTableRow,
+      WorkspaceTabQueryTableRow,
      TableContext,
      ConfirmModal
   },
@@ -123,11 +125,12 @@ export default {
      results: Array,
      connUid: String,
      mode: String,
-      isSelected: Boolean
+      isSelected: Boolean,
+      elementType: { type: String, default: 'table' }
   },
   data () {
      return {
-         resultsSize: 1000,
+         resultsSize: 0,
         localResults: [],
         isContext: false,
         isDeleteConfirmModal: false,
@@ -226,6 +229,9 @@ export default {
      },
      resultsetIndex () {
         this.setLocalResults();
+      },
+      isSelected (val) {
+         if (val) this.refreshScroller();
      }
   },
   updated () {
--- a/src/renderer/components/WorkspaceTabQueryTableContext.vue
+++ b/src/renderer/components/WorkspaceTabQueryTableContext.vue
@@ -28,7 +28,7 @@
         </div>
      </div>
      <div
-         v-if="selectedRows.length === 1"
+         v-if="selectedRows.length === 1 && selectedCell.isEditable"
         class="context-element"
         @click="setNull"
      >
@@ -36,7 +36,11 @@
            <i class="mdi mdi-18px mdi-null text-light pr-1" /> {{ $t('message.setNull') }}
         </span>
      </div>
-      <div class="context-element" @click="showConfirmModal">
+      <div
+         v-if="selectedCell.isEditable"
+         class="context-element"
+         @click="showConfirmModal"
+      >
         <span class="d-flex">
            <i class="mdi mdi-18px mdi-delete text-light pr-1" /> {{ $tc('message.deleteRows', selectedRows.length) }}
         </span>
@@ -48,13 +52,14 @@
 import BaseContextMenu from '@/components/BaseContextMenu';

 export default {
-   name: 'WorkspaceQueryTableContext',
+   name: 'WorkspaceTabQueryTableContext',
   components: {
      BaseContextMenu
   },
   props: {
      contextEvent: MouseEvent,
-      selectedRows: Array
+      selectedRows: Array,
+      selectedCell: Object
   },
   computed: {
   },
--- a/src/renderer/components/WorkspaceTabQueryTableRow.vue
+++ b/src/renderer/components/WorkspaceTabQueryTableRow.vue
@@ -11,7 +11,7 @@
         <template v-if="cKey !== '_id'">
            <span
               v-if="!isInlineEditor[cKey] && fields[cKey]"
-               class="cell-content px-2"
+               class="cell-content"
               :class="`${isNull(col)} ${typeClass(fields[cKey].type)}`"
               @dblclick="editON($event, col, cKey)"
            >{{ col | typeFormat(fields[cKey].type.toLowerCase(), fields[cKey].length) | cutText }}</span>
@@ -31,7 +31,7 @@
                  v-mask="inputProps.mask"
                  :type="inputProps.type"
                  autofocus
-                  class="editable-field px-2"
+                  class="editable-field form-input input-sm px-1"
                  @blur="editOFF"
               >
               <select
@@ -59,7 +59,7 @@
                  v-model="editingContent"
                  :type="inputProps.type"
                  autofocus
-                  class="editable-field px-2"
+                  class="editable-field form-input input-sm px-1"
                  @blur="editOFF"
               >
            </template>
@@ -200,7 +200,7 @@ import TextEditor from '@/components/BaseTextEditor';
 import ForeignKeySelect from '@/components/ForeignKeySelect';

 export default {
-   name: 'WorkspaceQueryTableRow',
+   name: 'WorkspaceTabQueryTableRow',
   components: {
      ConfirmModal,
      TextEditor,
@@ -260,7 +260,8 @@ export default {
   props: {
      row: Object,
      fields: Object,
-      keyUsage: Array
+      keyUsage: Array,
+      elementType: { type: String, default: 'table' }
   },
   data () {
      return {
@@ -334,6 +335,8 @@ export default {
         return this.keyUsage.map(key => key.field);
      },
      isEditable () {
+         if (this.elementType === 'view') return false;
+
         if (this.fields) {
            const nElements = Object.keys(this.fields).reduce((acc, curr) => {
               acc.add(this.fields[curr].table);
@@ -503,10 +506,9 @@ export default {
         return this.keyUsage.find(key => key.field === keyName);
      },
      openContext (event, payload) {
-         if (this.isEditable) {
-            payload.field = this.fields[payload.field].name;// Ensures field name only
-            this.$emit('contextmenu', event, payload);
-         }
+         payload.field = this.fields[payload.field].name;// Ensures field name only
+         payload.isEditable = this.isEditable;
+         this.$emit('contextmenu', event, payload);
      },
      onKey (e) {
         e.stopPropagation();
@@ -526,6 +528,9 @@ export default {
  border: none;
  line-height: 1;
  width: 100%;
+  max-height: 21px;
+  border-radius: 3px;
+  font-size: 0.7rem;
  position: absolute;
  left: 0;
  right: 0;
@@ -533,6 +538,7 @@ export default {

 .cell-content {
  display: block;
+  padding: 0 0.2rem;
  min-height: 0.8rem;
  text-overflow: ellipsis;
  white-space: nowrap;
--- a/src/renderer/components/WorkspaceTabTable.vue
+++ b/src/renderer/components/WorkspaceTabTable.vue
@@ -1,5 +1,5 @@
 <template>
-   <div v-show="isSelected" class="workspace-query-tab column col-12 columns col-gapless">
+   <div v-show="isSelected" class="workspace-query-tab column col-12 columns col-gapless no-outline p-0">
      <div class="workspace-query-runner column col-12">
         <div class="workspace-query-runner-footer">
            <div class="workspace-query-buttons">
@@ -112,18 +112,18 @@
               <div v-if="results.length && results[0].rows">
                  {{ $t('word.results') }}: <b>{{ results[0].rows.length | localeString }}</b>
               </div>
-               <div v-if="hasApproximately || (page > 1 && tableInfo.rows)">
-                  {{ $t('word.total') }}: <b>{{ tableInfo.rows | localeString }}</b> <small>({{ $t('word.approximately') }})</small>
+               <div v-if="hasApproximately || (page > 1 && approximateCount)">
+                  {{ $t('word.total') }}: <b :title="$t('word.approximately')">≈ {{ approximateCount | localeString }}</b>
               </div>
-               <div v-if="workspace.breadcrumbs.database">
-                  {{ $t('word.schema') }}: <b>{{ workspace.breadcrumbs.database }}</b>
+               <div class="d-flex" :title="$t('word.schema')">
+                  <i class="mdi mdi-18px mdi-database mr-1" /><b>{{ schema }}</b>
               </div>
            </div>
         </div>
      </div>
      <div class="workspace-query-results p-relative column col-12">
         <BaseLoader v-if="isQuering" />
-         <WorkspaceQueryTable
+         <WorkspaceTabQueryTable
            v-if="results"
            ref="queryTable"
            :results="results"
@@ -131,6 +131,7 @@
            :conn-uid="connection.uid"
            :is-selected="isSelected"
            mode="table"
+            :element-type="elementType"
            @update-field="updateField"
            @delete-selected="deleteSelected"
            @hard-sort="hardSort"
@@ -158,34 +159,37 @@
 <script>
 import Tables from '@/ipc-api/Tables';
 import BaseLoader from '@/components/BaseLoader';
-import WorkspaceQueryTable from '@/components/WorkspaceQueryTable';
+import WorkspaceTabQueryTable from '@/components/WorkspaceTabQueryTable';
 import ModalNewTableRow from '@/components/ModalNewTableRow';
 import ModalFakerRows from '@/components/ModalFakerRows';
 import { mapGetters, mapActions } from 'vuex';
 import tableTabs from '@/mixins/tableTabs';

 export default {
-   name: 'WorkspaceTableTab',
+   name: 'WorkspaceTabTable',
   components: {
      BaseLoader,
-      WorkspaceQueryTable,
+      WorkspaceTabQueryTable,
      ModalNewTableRow,
      ModalFakerRows
   },
   filters: {
      localeString (val) {
-         if (val)
+         if (val !== null)
            return val.toLocaleString();
      }
   },
   mixins: [tableTabs],
   props: {
      connection: Object,
-      table: String
+      isSelected: Boolean,
+      table: String,
+      schema: String,
+      elementType: String
   },
   data () {
      return {
-         tabUid: 'data',
+         tabUid: 'data', // ???
         isQuering: false,
         isPageMenu: false,
         results: [],
@@ -196,7 +200,8 @@ export default {
         refreshInterval: null,
         sortParams: {},
         page: 1,
-         pageProxy: 1
+         pageProxy: 1,
+         approximateCount: 0
      };
   },
   computed: {
@@ -208,9 +213,6 @@ export default {
      workspace () {
         return this.getWorkspace(this.connection.uid);
      },
-      isSelected () {
-         return this.workspace.selected_tab === 'data' && this.workspace.uid === this.selectedWorkspace;
-      },
      isTable () {
         return !!this.workspace.breadcrumbs.table;
      },
@@ -231,15 +233,25 @@ export default {
      hasApproximately () {
         return this.results.length &&
            this.results[0].rows &&
-            this.tableInfo &&
            this.results[0].rows.length === this.limit &&
-            this.results[0].rows.length < this.tableInfo.rows;
+            this.results[0].rows.length < this.approximateCount;
      }
   },
   watch: {
+      schema () {
+         if (this.isSelected) {
+            this.page = 1;
+            this.approximateCount = 0;
+            this.sortParams = {};
+            this.getTableData();
+            this.lastTable = this.table;
+            this.$refs.queryTable.resetSort();
+         }
+      },
      table () {
         if (this.isSelected) {
            this.page = 1;
+            this.approximateCount = 0;
            this.sortParams = {};
            this.getTableData();
            this.lastTable = this.table;
@@ -253,9 +265,11 @@ export default {
         }
      },
      isSelected (val) {
-         if (val && this.lastTable !== this.table) {
-            this.getTableData();
-            this.lastTable = this.table;
+         if (val) {
+            this.changeBreadcrumbs({ schema: this.schema, [this.elementType]: this.table });
+
+            if (this.lastTable !== this.table)
+               this.getTableData();
         }
      }
   },
@@ -269,23 +283,26 @@ export default {
   },
   methods: {
      ...mapActions({
-         addNotification: 'notifications/addNotification'
+         addNotification: 'notifications/addNotification',
+         changeBreadcrumbs: 'workspaces/changeBreadcrumbs'
      }),
-      async getTableData (sortParams) {
-         if (!this.table) return;
+      async getTableData () {
+         if (!this.table || !this.isSelected) return;
         this.isQuering = true;

         // if table changes clear cached values
         if (this.lastTable !== this.table)
            this.results = [];

+         this.lastTable = this.table;
+
         const params = {
            uid: this.connection.uid,
            schema: this.schema,
-            table: this.workspace.breadcrumbs.table || this.workspace.breadcrumbs.view,
+            table: this.table,
            limit: this.limit,
            page: this.page,
-            sortParams
+            sortParams: this.sortParams
         };

         try { // Table data
@@ -300,20 +317,34 @@ export default {
            this.addNotification({ status: 'error', message: err.stack });
         }

+         if (this.results.length && this.results[0].rows.length === this.limit) {
+            try { // Table approximate count
+               const { status, response } = await Tables.getTableApproximateCount(params);
+
+               if (status === 'success')
+                  this.approximateCount = response;
+               else
+                  this.addNotification({ status: 'error', message: response });
+            }
+            catch (err) {
+               this.addNotification({ status: 'error', message: err.stack });
+            }
+         }
+
         this.isQuering = false;
      },
      getTable () {
         return this.table;
      },
      reloadTable () {
-         this.getTableData(this.sortParams);
+         this.getTableData();
      },
      hardSort (sortParams) {
         this.sortParams = sortParams;
-         this.getTableData(sortParams);
+         this.getTableData();
      },
      openPageMenu () {
-         if (this.isQuering) return;
+         if (this.isQuering || (this.results.length && this.results[0].rows.length < this.limit && this.page === 1)) return;

         this.isPageMenu = true;
         if (this.isPageMenu)
--- a/src/renderer/components/old/ModalEditConnection.vue
+++ b/src/renderer/components/old/ModalEditConnection.vue
@@ -1,489 +0,0 @@
-<template>
-   <div class="modal active">
-      <a class="modal-overlay c-hand" @click="closeModal" />
-      <div class="modal-container">
-         <div class="modal-header pl-2">
-            <div class="modal-title h6">
-               <div class="d-flex">
-                  <i class="mdi mdi-24px mdi-server mr-1" /> {{ $t('message.editConnection') }}
-               </div>
-            </div>
-            <a class="btn btn-clear c-hand" @click="closeModal" />
-         </div>
-         <div class="modal-body p-0">
-            <div class="panel">
-               <div class="panel-nav">
-                  <ul class="tab tab-block">
-                     <li
-                        class="tab-item c-hand"
-                        :class="{'active': selectedTab === 'general'}"
-                        @click="selectTab('general')"
-                     >
-                        <a class="tab-link">{{ $t('word.general') }}</a>
-                     </li>
-                     <li
-                        class="tab-item c-hand"
-                        :class="{'active': selectedTab === 'ssl'}"
-                        @click="selectTab('ssl')"
-                     >
-                        <a class="tab-link">{{ $t('word.ssl') }}</a>
-                     </li>
-                     <li
-                        class="tab-item"
-                        :class="{'active': selectedTab === 'ssh'}"
-                        @click="selectTab('ssh')"
-                     >
-                        <a class="c-hand">{{ $t('word.sshTunnel') }}</a>
-                     </li>
-                  </ul>
-               </div>
-               <div v-if="selectedTab === 'general'" class="panel-body py-0">
-                  <div class="container">
-                     <form class="form-horizontal">
-                        <fieldset class="m-0" :disabled="isTesting">
-                           <div class="form-group">
-                              <div class="col-4 col-sm-12">
-                                 <label class="form-label">{{ $t('word.connectionName') }}</label>
-                              </div>
-                              <div class="col-8 col-sm-12">
-                                 <input
-                                    ref="firstInput"
-                                    v-model="localConnection.name"
-                                    class="form-input"
-                                    type="text"
-                                 >
-                              </div>
-                           </div>
-                           <div class="form-group">
-                              <div class="col-4 col-sm-12">
-                                 <label class="form-label">{{ $t('word.client') }}</label>
-                              </div>
-                              <div class="col-8 col-sm-12">
-                                 <select v-model="localConnection.client" class="form-select">
-                                    <option value="mysql">
-                                       MySQL
-                                    </option>
-                                    <option value="maria">
-                                       MariaDB
-                                    </option>
-                                    <option value="pg">
-                                       PostgreSQL
-                                    </option>
-                                    <!-- <option value="mssql">
-                                       Microsoft SQL
-                                    </option>
-                                    <option value="oracledb">
-                                       Oracle DB
-                                    </option> -->
-                                 </select>
-                              </div>
-                           </div>
-                           <div class="form-group">
-                              <div class="col-4 col-sm-12">
-                                 <label class="form-label">{{ $t('word.hostName') }}/IP</label>
-                              </div>
-                              <div class="col-8 col-sm-12">
-                                 <input
-                                    v-model="localConnection.host"
-                                    class="form-input"
-                                    type="text"
-                                 >
-                              </div>
-                           </div>
-                           <div class="form-group">
-                              <div class="col-4 col-sm-12">
-                                 <label class="form-label">{{ $t('word.port') }}</label>
-                              </div>
-                              <div class="col-8 col-sm-12">
-                                 <input
-                                    v-model="localConnection.port"
-                                    class="form-input"
-                                    type="number"
-                                    min="1"
-                                    max="65535"
-                                 >
-                              </div>
-                           </div>
-                           <div v-if="customizations.database" class="form-group">
-                              <div class="col-4 col-sm-12">
-                                 <label class="form-label">{{ $t('word.database') }}</label>
-                              </div>
-                              <div class="col-8 col-sm-12">
-                                 <input
-                                    v-model="localConnection.database"
-                                    class="form-input"
-                                    type="text"
-                                 >
-                              </div>
-                           </div>
-                           <div class="form-group">
-                              <div class="col-4 col-sm-12">
-                                 <label class="form-label">{{ $t('word.user') }}</label>
-                              </div>
-                              <div class="col-8 col-sm-12">
-                                 <input
-                                    v-model="localConnection.user"
-                                    class="form-input"
-                                    type="text"
-                                    :disabled="localConnection.ask"
-                                 >
-                              </div>
-                           </div>
-                           <div class="form-group">
-                              <div class="col-4 col-sm-12">
-                                 <label class="form-label">{{ $t('word.password') }}</label>
-                              </div>
-                              <div class="col-8 col-sm-12">
-                                 <input
-                                    v-model="localConnection.password"
-                                    class="form-input"
-                                    type="password"
-                                    :disabled="localConnection.ask"
-                                 >
-                              </div>
-                           </div>
-                           <div class="form-group">
-                              <div class="col-4 col-sm-12" />
-                              <div class="col-8 col-sm-12">
-                                 <label class="form-checkbox form-inline">
-                                    <input v-model="localConnection.ask" type="checkbox"><i class="form-icon" /> {{ $t('message.askCredentials') }}
-                                 </label>
-                              </div>
-                           </div>
-                        </fieldset>
-                     </form>
-                  </div>
-                  <BaseToast
-                     class="mb-2"
-                     :message="toast.message"
-                     :status="toast.status"
-                  />
-               </div>
-               <div v-if="selectedTab === 'ssl'" class="panel-body py-0">
-                  <div class="container">
-                     <form class="form-horizontal">
-                        <div class="form-group">
-                           <div class="col-4 col-sm-12">
-                              <label class="form-label">
-                                 {{ $t('message.enableSsl') }}
-                              </label>
-                           </div>
-                           <div class="col-8 col-sm-12">
-                              <label class="form-switch d-inline-block" @click.prevent="toggleSsl">
-                                 <input type="checkbox" :checked="localConnection.ssl">
-                                 <i class="form-icon" />
-                              </label>
-                           </div>
-                        </div>
-                        <fieldset class="m-0" :disabled="isTesting || !localConnection.ssl">
-                           <div class="form-group">
-                              <div class="col-4 col-sm-12">
-                                 <label class="form-label">{{ $t('word.privateKey') }}</label>
-                              </div>
-                              <div class="col-8 col-sm-12">
-                                 <BaseUploadInput
-                                    :value="localConnection.key"
-                                    :message="$t('word.browse')"
-                                    @clear="pathClear('key')"
-                                    @change="pathSelection($event, 'key')"
-                                 />
-                              </div>
-                           </div>
-                           <div class="form-group">
-                              <div class="col-4 col-sm-12">
-                                 <label class="form-label">{{ $t('word.certificate') }}</label>
-                              </div>
-                              <div class="col-8 col-sm-12">
-                                 <BaseUploadInput
-                                    :value="localConnection.cert"
-                                    :message="$t('word.browse')"
-                                    @clear="pathClear('cert')"
-                                    @change="pathSelection($event, 'cert')"
-                                 />
-                              </div>
-                           </div>
-                           <div class="form-group">
-                              <div class="col-4 col-sm-12">
-                                 <label class="form-label">{{ $t('word.caCertificate') }}</label>
-                              </div>
-                              <div class="col-8 col-sm-12">
-                                 <BaseUploadInput
-                                    :value="localConnection.ca"
-                                    :message="$t('word.browse')"
-                                    @clear="pathClear('ca')"
-                                    @change="pathSelection($event, 'ca')"
-                                 />
-                              </div>
-                           </div>
-                           <div class="form-group">
-                              <div class="col-4 col-sm-12">
-                                 <label class="form-label">{{ $t('word.ciphers') }}</label>
-                              </div>
-                              <div class="col-8 col-sm-12">
-                                 <input
-                                    ref="firstInput"
-                                    v-model="localConnection.ciphers"
-                                    class="form-input"
-                                    type="text"
-                                 >
-                              </div>
-                           </div>
-                        </fieldset>
-                     </form>
-                  </div>
-                  <BaseToast
-                     class="mb-2"
-                     :message="toast.message"
-                     :status="toast.status"
-                  />
-               </div>
-               <div v-if="selectedTab === 'ssh'" class="panel-body py-0">
-                  <div class="container">
-                     <form class="form-horizontal">
-                        <div class="form-group">
-                           <div class="col-4 col-sm-12">
-                              <label class="form-label">
-                                 {{ $t('message.enableSsh') }}
-                              </label>
-                           </div>
-                           <div class="col-8 col-sm-12">
-                              <label class="form-switch d-inline-block" @click.prevent="toggleSsh">
-                                 <input type="checkbox" :checked="localConnection.ssh">
-                                 <i class="form-icon" />
-                              </label>
-                           </div>
-                        </div>
-                        <fieldset class="m-0" :disabled="isTesting || !localConnection.ssh">
-                           <div class="form-group">
-                              <div class="col-4 col-sm-12">
-                                 <label class="form-label">{{ $t('word.hostName') }}/IP</label>
-                              </div>
-                              <div class="col-8 col-sm-12">
-                                 <input
-                                    v-model="localConnection.sshHost"
-                                    class="form-input"
-                                    type="text"
-                                 >
-                              </div>
-                           </div>
-                           <div class="form-group">
-                              <div class="col-4 col-sm-12">
-                                 <label class="form-label">{{ $t('word.user') }}</label>
-                              </div>
-                              <div class="col-8 col-sm-12">
-                                 <input
-                                    v-model="localConnection.sshUser"
-                                    class="form-input"
-                                    type="text"
-                                 >
-                              </div>
-                           </div>
-                           <div class="form-group">
-                              <div class="col-4 col-sm-12">
-                                 <label class="form-label">{{ $t('word.password') }}</label>
-                              </div>
-                              <div class="col-8 col-sm-12">
-                                 <input
-                                    v-model="localConnection.sshPass"
-                                    class="form-input"
-                                    type="password"
-                                 >
-                              </div>
-                           </div>
-                           <div class="form-group">
-                              <div class="col-4 col-sm-12">
-                                 <label class="form-label">{{ $t('word.port') }}</label>
-                              </div>
-                              <div class="col-8 col-sm-12">
-                                 <input
-                                    v-model="localConnection.sshPort"
-                                    class="form-input"
-                                    type="number"
-                                    min="1"
-                                    max="65535"
-                                 >
-                              </div>
-                           </div>
-                           <div class="form-group">
-                              <div class="col-4 col-sm-12">
-                                 <label class="form-label">{{ $t('word.privateKey') }}</label>
-                              </div>
-                              <div class="col-8 col-sm-12">
-                                 <BaseUploadInput
-                                    :value="localConnection.sshKey"
-                                    :message="$t('word.browse')"
-                                    @clear="pathClear('sshKey')"
-                                    @change="pathSelection($event, 'sshKey')"
-                                 />
-                              </div>
-                           </div>
-                        </fieldset>
-                     </form>
-                  </div>
-                  <BaseToast
-                     class="mb-2"
-                     :message="toast.message"
-                     :status="toast.status"
-                  />
-               </div>
-               <div class="modal-footer text-light">
-                  <button
-                     class="btn btn-gray mr-2"
-                     :class="{'loading': isTesting}"
-                     @click="startTest"
-                  >
-                     {{ $t('message.testConnection') }}
-                  </button>
-                  <button class="btn btn-primary mr-2" @click="saveEditConnection">
-                     {{ $t('word.save') }}
-                  </button>
-                  <button class="btn btn-link" @click="closeModal">
-                     {{ $t('word.close') }}
-                  </button>
-               </div>
-            </div>
-            <ModalAskCredentials
-               v-if="isAsking"
-               @close-asking="closeAsking"
-               @credentials="continueTest"
-            />
-         </div>
-      </div>
-   </div>
-</template>
-
-<script>
-import { mapActions } from 'vuex';
-import customizations from 'common/customizations';
-import Connection from '@/ipc-api/Connection';
-import ModalAskCredentials from '@/components/ModalAskCredentials';
-import BaseToast from '@/components/BaseToast';
-import BaseUploadInput from '@/components/BaseUploadInput';
-
-export default {
-   name: 'ModalEditConnection',
-   components: {
-      ModalAskCredentials,
-      BaseToast,
-      BaseUploadInput
-   },
-   props: {
-      connection: Object
-   },
-   data () {
-      return {
-         toast: {
-            status: '',
-            message: ''
-         },
-         isTesting: false,
-         isAsking: false,
-         localConnection: null,
-         selectedTab: 'general'
-      };
-   },
-   computed: {
-      customizations () {
-         return customizations[this.connection.client];
-      }
-   },
-   created () {
-      this.localConnection = Object.assign({}, this.connection);
-      window.addEventListener('keydown', this.onKey);
-
-      setTimeout(() => {
-         this.$refs.firstInput.focus();
-      }, 20);
-   },
-   beforeDestroy () {
-      window.removeEventListener('keydown', this.onKey);
-   },
-   methods: {
-      ...mapActions({
-         editConnection: 'connections/editConnection'
-      }),
-      async startTest () {
-         this.isTesting = true;
-         this.toast = {
-            status: '',
-            message: ''
-         };
-
-         if (this.localConnection.ask)
-            this.isAsking = true;
-         else {
-            try {
-               const res = await Connection.makeTest(this.localConnection);
-               if (res.status === 'error')
-                  this.toast = { status: 'error', message: res.response.message };
-               else
-                  this.toast = { status: 'success', message: this.$t('message.connectionSuccessfullyMade') };
-            }
-            catch (err) {
-               this.toast = { status: 'error', message: err.stack };
-            }
-
-            this.isTesting = false;
-         }
-      },
-      async continueTest (credentials) { // if "Ask for credentials" is true
-         this.isAsking = false;
-         const params = Object.assign({}, this.localConnection, credentials);
-         try {
-            const res = await Connection.makeTest(params);
-            if (res.status === 'error')
-               this.toast = { status: 'error', message: res.response.message };
-            else
-               this.toast = { status: 'success', message: this.$t('message.connectionSuccessfullyMade') };
-         }
-         catch (err) {
-            this.toast = { status: 'error', message: err.stack };
-         }
-
-         this.isTesting = false;
-      },
-      saveEditConnection () {
-         this.editConnection(this.localConnection);
-         this.closeModal();
-      },
-      closeAsking () {
-         this.isTesting = false;
-         this.isAsking = false;
-      },
-      closeModal () {
-         this.$emit('close');
-      },
-      onKey (e) {
-         e.stopPropagation();
-         if (e.key === 'Escape')
-            this.closeModal();
-      },
-      selectTab (tab) {
-         this.selectedTab = tab;
-      },
-      toggleSsl () {
-         this.localConnection.ssl = !this.localConnection.ssl;
-      },
-      toggleSsh () {
-         this.localConnection.ssh = !this.localConnection.ssh;
-      },
-      pathSelection (event, name) {
-         const { files } = event.target;
-         if (!files.length) return;
-
-         this.localConnection[name] = files[0].path;
-      },
-      pathClear (name) {
-         this.localConnection[name] = '';
-      }
-   }
-};
-</script>
-
-<style scoped>
-  .modal-container {
-    position: absolute;
-    max-width: 450px;
-    top: 17.5vh;
-  }
-</style>
--- a/src/renderer/components/old/ModalNewConnection.vue
+++ b/src/renderer/components/old/ModalNewConnection.vue
@@ -1,518 +0,0 @@
-<template>
-   <div class="modal active">
-      <a class="modal-overlay c-hand" @click="closeModal" />
-      <div class="modal-container">
-         <div class="modal-header pl-2">
-            <div class="modal-title h6">
-               <div class="d-flex">
-                  <i class="mdi mdi-24px mdi-server-plus mr-1" />
-                  <span class="cut-text">{{ $t('message.createNewConnection') }}</span>
-               </div>
-            </div>
-            <a class="btn btn-clear c-hand" @click="closeModal" />
-         </div>
-         <div class="modal-body p-0">
-            <div class="panel">
-               <div class="panel-nav">
-                  <ul class="tab tab-block">
-                     <li
-                        class="tab-item c-hand"
-                        :class="{'active': selectedTab === 'general'}"
-                        @click="selectTab('general')"
-                     >
-                        <a class="tab-link">{{ $t('word.general') }}</a>
-                     </li>
-                     <li
-                        class="tab-item c-hand"
-                        :class="{'active': selectedTab === 'ssl'}"
-                        @click="selectTab('ssl')"
-                     >
-                        <a class="tab-link">{{ $t('word.ssl') }}</a>
-                     </li>
-                     <li
-                        class="tab-item"
-                        :class="{'active': selectedTab === 'ssh'}"
-                        @click="selectTab('ssh')"
-                     >
-                        <a class="c-hand">{{ $t('word.sshTunnel') }}</a>
-                     </li>
-                  </ul>
-               </div>
-               <div v-if="selectedTab === 'general'" class="panel-body py-0">
-                  <div class="container">
-                     <form class="form-horizontal">
-                        <fieldset class="m-0" :disabled="isTesting">
-                           <div class="form-group">
-                              <div class="col-4 col-sm-12">
-                                 <label class="form-label">{{ $t('word.connectionName') }}</label>
-                              </div>
-                              <div class="col-8 col-sm-12">
-                                 <input
-                                    ref="firstInput"
-                                    v-model="connection.name"
-                                    class="form-input"
-                                    type="text"
-                                 >
-                              </div>
-                           </div>
-                           <div class="form-group">
-                              <div class="col-4 col-sm-12">
-                                 <label class="form-label">{{ $t('word.client') }}</label>
-                              </div>
-                              <div class="col-8 col-sm-12">
-                                 <select
-                                    v-model="connection.client"
-                                    class="form-select"
-                                    @change="setDefaults"
-                                 >
-                                    <option value="mysql">
-                                       MySQL
-                                    </option>
-                                    <option value="maria">
-                                       MariaDB
-                                    </option>
-                                    <option value="pg">
-                                       PostgreSQL
-                                    </option>
-                                 <!-- <option value="mssql">
-                                    Microsoft SQL
-                                 </option>
-                                 <option value="oracledb">
-                                    Oracle DB
-                                 </option> -->
-                                 </select>
-                              </div>
-                           </div>
-                           <div class="form-group">
-                              <div class="col-4 col-sm-12">
-                                 <label class="form-label">{{ $t('word.hostName') }}/IP</label>
-                              </div>
-                              <div class="col-8 col-sm-12">
-                                 <input
-                                    v-model="connection.host"
-                                    class="form-input"
-                                    type="text"
-                                 >
-                              </div>
-                           </div>
-                           <div class="form-group">
-                              <div class="col-4 col-sm-12">
-                                 <label class="form-label">{{ $t('word.port') }}</label>
-                              </div>
-                              <div class="col-8 col-sm-12">
-                                 <input
-                                    v-model="connection.port"
-                                    class="form-input"
-                                    type="number"
-                                    min="1"
-                                    max="65535"
-                                 >
-                              </div>
-                           </div>
-                           <div v-if="customizations.database" class="form-group">
-                              <div class="col-4 col-sm-12">
-                                 <label class="form-label">{{ $t('word.database') }}</label>
-                              </div>
-                              <div class="col-8 col-sm-12">
-                                 <input
-                                    v-model="connection.database"
-                                    class="form-input"
-                                    type="text"
-                                 >
-                              </div>
-                           </div>
-                           <div class="form-group">
-                              <div class="col-4 col-sm-12">
-                                 <label class="form-label">{{ $t('word.user') }}</label>
-                              </div>
-                              <div class="col-8 col-sm-12">
-                                 <input
-                                    v-model="connection.user"
-                                    class="form-input"
-                                    type="text"
-                                    :disabled="connection.ask"
-                                 >
-                              </div>
-                           </div>
-                           <div class="form-group">
-                              <div class="col-4 col-sm-12">
-                                 <label class="form-label">{{ $t('word.password') }}</label>
-                              </div>
-                              <div class="col-8 col-sm-12">
-                                 <input
-                                    v-model="connection.password"
-                                    class="form-input"
-                                    type="password"
-                                    :disabled="connection.ask"
-                                 >
-                              </div>
-                           </div>
-                           <div class="form-group">
-                              <div class="col-4 col-sm-12" />
-                              <div class="col-8 col-sm-12">
-                                 <label class="form-checkbox form-inline">
-                                    <input v-model="connection.ask" type="checkbox"><i class="form-icon" /> {{ $t('message.askCredentials') }}
-                                 </label>
-                              </div>
-                           </div>
-                        </fieldset>
-                     </form>
-                  </div>
-                  <BaseToast
-                     class="mb-2"
-                     :message="toast.message"
-                     :status="toast.status"
-                  />
-               </div>
-               <div v-if="selectedTab === 'ssl'" class="panel-body py-0">
-                  <div class="container">
-                     <form class="form-horizontal">
-                        <div class="form-group">
-                           <div class="col-4 col-sm-12">
-                              <label class="form-label">
-                                 {{ $t('message.enableSsl') }}
-                              </label>
-                           </div>
-                           <div class="col-8 col-sm-12">
-                              <label class="form-switch d-inline-block" @click.prevent="toggleSsl">
-                                 <input type="checkbox" :checked="connection.ssl">
-                                 <i class="form-icon" />
-                              </label>
-                           </div>
-                        </div>
-                        <fieldset class="m-0" :disabled="isTesting || !connection.ssl">
-                           <div class="form-group">
-                              <div class="col-4 col-sm-12">
-                                 <label class="form-label">{{ $t('word.privateKey') }}</label>
-                              </div>
-                              <div class="col-8 col-sm-12">
-                                 <BaseUploadInput
-                                    :value="connection.key"
-                                    :message="$t('word.browse')"
-                                    @clear="pathClear('key')"
-                                    @change="pathSelection($event, 'key')"
-                                 />
-                              </div>
-                           </div>
-                           <div class="form-group">
-                              <div class="col-4 col-sm-12">
-                                 <label class="form-label">{{ $t('word.certificate') }}</label>
-                              </div>
-                              <div class="col-8 col-sm-12">
-                                 <BaseUploadInput
-                                    :value="connection.cert"
-                                    :message="$t('word.browse')"
-                                    @clear="pathClear('cert')"
-                                    @change="pathSelection($event, 'cert')"
-                                 />
-                              </div>
-                           </div>
-                           <div class="form-group">
-                              <div class="col-4 col-sm-12">
-                                 <label class="form-label">{{ $t('word.caCertificate') }}</label>
-                              </div>
-                              <div class="col-8 col-sm-12">
-                                 <BaseUploadInput
-                                    :value="connection.ca"
-                                    :message="$t('word.browse')"
-                                    @clear="pathClear('ca')"
-                                    @change="pathSelection($event, 'ca')"
-                                 />
-                              </div>
-                           </div>
-                           <div class="form-group">
-                              <div class="col-4 col-sm-12">
-                                 <label class="form-label">{{ $t('word.ciphers') }}</label>
-                              </div>
-                              <div class="col-8 col-sm-12">
-                                 <input
-                                    ref="firstInput"
-                                    v-model="connection.ciphers"
-                                    class="form-input"
-                                    type="text"
-                                 >
-                              </div>
-                           </div>
-                        </fieldset>
-                     </form>
-                  </div>
-                  <BaseToast
-                     class="mb-2"
-                     :message="toast.message"
-                     :status="toast.status"
-                  />
-               </div>
-               <div v-if="selectedTab === 'ssh'" class="panel-body py-0">
-                  <div class="container">
-                     <form class="form-horizontal">
-                        <div class="form-group">
-                           <div class="col-4 col-sm-12">
-                              <label class="form-label">
-                                 {{ $t('message.enableSsh') }}
-                              </label>
-                           </div>
-                           <div class="col-8 col-sm-12">
-                              <label class="form-switch d-inline-block" @click.prevent="toggleSsh">
-                                 <input type="checkbox" :checked="connection.ssh">
-                                 <i class="form-icon" />
-                              </label>
-                           </div>
-                        </div>
-                        <fieldset class="m-0" :disabled="isTesting || !connection.ssh">
-                           <div class="form-group">
-                              <div class="col-4 col-sm-12">
-                                 <label class="form-label">{{ $t('word.hostName') }}/IP</label>
-                              </div>
-                              <div class="col-8 col-sm-12">
-                                 <input
-                                    v-model="connection.sshHost"
-                                    class="form-input"
-                                    type="text"
-                                 >
-                              </div>
-                           </div>
-                           <div class="form-group">
-                              <div class="col-4 col-sm-12">
-                                 <label class="form-label">{{ $t('word.user') }}</label>
-                              </div>
-                              <div class="col-8 col-sm-12">
-                                 <input
-                                    v-model="connection.sshUser"
-                                    class="form-input"
-                                    type="text"
-                                 >
-                              </div>
-                           </div>
-                           <div class="form-group">
-                              <div class="col-4 col-sm-12">
-                                 <label class="form-label">{{ $t('word.password') }}</label>
-                              </div>
-                              <div class="col-8 col-sm-12">
-                                 <input
-                                    v-model="connection.sshPass"
-                                    class="form-input"
-                                    type="password"
-                                 >
-                              </div>
-                           </div>
-                           <div class="form-group">
-                              <div class="col-4 col-sm-12">
-                                 <label class="form-label">{{ $t('word.port') }}</label>
-                              </div>
-                              <div class="col-8 col-sm-12">
-                                 <input
-                                    v-model="connection.sshPort"
-                                    class="form-input"
-                                    type="number"
-                                    min="1"
-                                    max="65535"
-                                 >
-                              </div>
-                           </div>
-                           <div class="form-group">
-                              <div class="col-4 col-sm-12">
-                                 <label class="form-label">{{ $t('word.privateKey') }}</label>
-                              </div>
-                              <div class="col-8 col-sm-12">
-                                 <BaseUploadInput
-                                    :value="connection.sshKey"
-                                    :message="$t('word.browse')"
-                                    @clear="pathClear('sshKey')"
-                                    @change="pathSelection($event, 'sshKey')"
-                                 />
-                              </div>
-                           </div>
-                        </fieldset>
-                     </form>
-                  </div>
-                  <BaseToast
-                     class="mb-2"
-                     :message="toast.message"
-                     :status="toast.status"
-                  />
-               </div>
-            </div>
-         </div>
-         <div class="modal-footer text-light">
-            <button
-               class="btn btn-gray mr-2"
-               :class="{'loading': isTesting}"
-               @click="startTest"
-            >
-               {{ $t('message.testConnection') }}
-            </button>
-            <button class="btn btn-primary mr-2" @click="saveNewConnection">
-               {{ $t('word.save') }}
-            </button>
-            <button class="btn btn-link" @click="closeModal">
-               {{ $t('word.close') }}
-            </button>
-         </div>
-      </div>
-      <ModalAskCredentials
-         v-if="isAsking"
-         @close-asking="closeAsking"
-         @credentials="continueTest"
-      />
-   </div>
-</template>
-
-<script>
-import { mapActions } from 'vuex';
-import customizations from 'common/customizations';
-import Connection from '@/ipc-api/Connection';
-import { uidGen } from 'common/libs/uidGen';
-import ModalAskCredentials from '@/components/ModalAskCredentials';
-import BaseToast from '@/components/BaseToast';
-import BaseUploadInput from '@/components/BaseUploadInput';
-
-export default {
-   name: 'ModalNewConnection',
-   components: {
-      ModalAskCredentials,
-      BaseToast,
-      BaseUploadInput
-   },
-   data () {
-      return {
-         connection: {
-            name: '',
-            client: 'mysql',
-            host: '127.0.0.1',
-            database: null,
-            port: null,
-            user: null,
-            password: '',
-            ask: false,
-            uid: uidGen('C'),
-            ssl: false,
-            cert: '',
-            key: '',
-            ca: '',
-            ciphers: '',
-            ssh: false,
-            sshHost: '',
-            sshUser: '',
-            sshPass: '',
-            sshKey: '',
-            sshPort: 22
-         },
-         toast: {
-            status: '',
-            message: ''
-         },
-         isTesting: false,
-         isAsking: false,
-         selectedTab: 'general'
-      };
-   },
-   computed: {
-      customizations () {
-         return customizations[this.connection.client];
-      }
-   },
-   created () {
-      this.setDefaults();
-      window.addEventListener('keydown', this.onKey);
-
-      setTimeout(() => {
-         this.$refs.firstInput.focus();
-      }, 20);
-   },
-   beforeDestroy () {
-      window.removeEventListener('keydown', this.onKey);
-   },
-   methods: {
-      ...mapActions({
-         closeModal: 'application/hideNewConnModal',
-         addConnection: 'connections/addConnection'
-      }),
-      setDefaults () {
-         this.connection.user = this.customizations.defaultUser;
-         this.connection.port = this.customizations.defaultPort;
-         this.connection.database = this.customizations.defaultDatabase;
-      },
-      async startTest () {
-         this.isTesting = true;
-         this.toast = {
-            status: '',
-            message: ''
-         };
-
-         if (this.connection.ask)
-            this.isAsking = true;
-         else {
-            try {
-               const res = await Connection.makeTest(this.connection);
-               console.log(res.response);
-               if (res.status === 'error')
-                  this.toast = { status: 'error', message: res.response.message };
-               else
-                  this.toast = { status: 'success', message: this.$t('message.connectionSuccessfullyMade') };
-            }
-            catch (err) {
-               this.toast = { status: 'error', message: err.stack };
-            }
-
-            this.isTesting = false;
-         }
-      },
-      async continueTest (credentials) { // if "Ask for credentials" is true
-         this.isAsking = false;
-         const params = Object.assign({}, this.connection, credentials);
-
-         try {
-            const res = await Connection.makeTest(params);
-            if (res.status === 'error')
-               this.toast = { status: 'error', message: res.response.message };
-            else
-               this.toast = { status: 'success', message: this.$t('message.connectionSuccessfullyMade') };
-         }
-         catch (err) {
-            this.toast = { status: 'error', message: err.stack };
-         }
-
-         this.isTesting = false;
-      },
-      saveNewConnection () {
-         this.addConnection(this.connection);
-         this.closeModal();
-      },
-      closeAsking () {
-         this.isAsking = false;
-         this.isTesting = false;
-      },
-      onKey (e) {
-         e.stopPropagation();
-         if (e.key === 'Escape')
-            this.closeModal();
-      },
-      selectTab (tab) {
-         this.selectedTab = tab;
-      },
-      toggleSsl () {
-         this.connection.ssl = !this.connection.ssl;
-      },
-      toggleSsh () {
-         this.connection.ssh = !this.connection.ssh;
-      },
-      pathSelection (event, name) {
-         const { files } = event.target;
-         if (!files.length) return;
-
-         this.connection[name] = files[0].path;
-      },
-      pathClear (name) {
-         this.connection[name] = '';
-      }
-   }
-};
-</script>
-
-<style scoped>
-  .modal-container {
-    position: absolute;
-    max-width: 450px;
-    top: 17.5vh;
-  }
-</style>
--- a/src/renderer/components/old/TheAppWelcome.vue
+++ b/src/renderer/components/old/TheAppWelcome.vue
@@ -1,37 +0,0 @@
-<template>
-   <div class="columns">
-      <div class="column col-12 empty text-light">
-         <div class="empty-icon">
-            <i class="mdi mdi-48px mdi-emoticon" />
-         </div>
-         <p class="empty-title h5">
-            {{ $t('message.appWelcome') }}
-         </p>
-         <p class="empty-subtitle">
-            {{ $t('message.appFirstStep') }}
-         </p>
-         <div class="empty-action">
-            <button class="btn btn-primary" @click="$emit('new-conn')">
-               {{ $t('message.createConnection') }}
-            </button>
-         </div>
-      </div>
-   </div>
-</template>
-
-<script>
-export default {
-   name: 'TheAppWelcome'
-};
-</script>
-
-<style scoped>
-  .empty {
-    height: 100%;
-    border-radius: 0;
-    background: transparent;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-  }
-</style>
--- a/src/renderer/components/old/WorkspaceConnectPanel.vue
+++ b/src/renderer/components/old/WorkspaceConnectPanel.vue
@@ -1,82 +0,0 @@
-<template>
-   <div class="columns">
-      <div class="column col-12 empty">
-         <div class="empty-icon">
-            <i class="mdi mdi-48px mdi-power-plug-off" />
-         </div>
-         <p class="empty-title h5">
-            {{ isConnecting ? $t('word.connecting') : $t('word.disconnected') }}
-         </p>
-         <div class="empty-action">
-            <button
-               class="btn btn-success"
-               :class="{'loading': isConnecting}"
-               @click="startConnection"
-            >
-               {{ $t('word.connect') }}
-            </button>
-         </div>
-      </div>
-      <ModalAskCredentials
-         v-if="isAsking"
-         @close-asking="closeAsking"
-         @credentials="continueTest"
-      />
-   </div>
-</template>
-
-<script>
-import { mapActions } from 'vuex';
-import ModalAskCredentials from '@/components/ModalAskCredentials';
-
-export default {
-   name: 'WorkspaceConnectPanel',
-   components: {
-      ModalAskCredentials
-   },
-   props: {
-      connection: Object
-   },
-   data () {
-      return {
-         isConnecting: false,
-         isAsking: false
-      };
-   },
-   methods: {
-      ...mapActions({
-         connectWorkspace: 'workspaces/connectWorkspace'
-      }),
-      async startConnection () {
-         this.isConnecting = true;
-
-         if (this.connection.ask)
-            this.isAsking = true;
-         else {
-            await this.connectWorkspace(this.connection);
-            this.isConnecting = false;
-         }
-      },
-      async continueTest (credentials) { // if "Ask for credentials" is true
-         this.isAsking = false;
-         const params = Object.assign({}, this.connection, credentials);
-         await this.connectWorkspace(params);
-         this.isConnecting = false;
-      },
-      closeAsking () {
-         this.isAsking = false;
-         this.isConnecting = false;
-      }
-   }
-};
-</script>
-
-<style scoped>
-  .empty {
-    height: 100%;
-    border-radius: 0;
-    background: transparent;
-    display: flex;
-    flex-direction: column;
-  }
-</style>
--- a/src/renderer/i18n/en-US.js
+++ b/src/renderer/i18n/en-US.js
@@ -115,7 +115,11 @@ module.exports = {
      cell: 'Cell | Cells',
      triggerFunction: 'Trigger function | Trigger functions',
      all: 'All',
-      duplicate: 'Duplicate'
+      duplicate: 'Duplicate',
+      routine: 'Routine',
+      new: 'New',
+      history: 'History',
+      select: 'Select'
   },
   message: {
      appWelcome: 'Welcome to Antares SQL Client!',
@@ -169,7 +173,7 @@ module.exports = {
      deleteTable: 'Delete table',
      emptyCorfirm: 'Do you confirm to empty',
      unsavedChanges: 'Unsaved changes',
-      discardUnsavedChanges: 'You have some unsaved changes. By leaving this tab these changes will be discarded.',
+      discardUnsavedChanges: 'You have some unsaved changes. Closing this tab these changes will be discarded.',
      thereAreNoIndexes: 'There are no indexes',
      thereAreNoForeign: 'There are no foreign keys',
      createNewForeign: 'Create new foreign key',
@@ -224,7 +228,22 @@ module.exports = {
      dataTabPageSize: 'DATA tab page size',
      enableSsh: 'Enable SSH',
      pageNumber: 'Page number',
-      duplicateTable: 'Duplicate table'
+      duplicateTable: 'Duplicate table',
+      noOpenTabs: 'There are no open tabs, navigate on the left bar or:',
+      noSchema: 'No schema',
+      restorePreviourSession: 'Restore previous session',
+      runQuery: 'Run query',
+      thereAreNoTableFields: 'There are no table fields',
+      newTable: 'New table',
+      newView: 'New view',
+      newTrigger: 'New trigger',
+      newRoutine: 'New routine',
+      newFunction: 'New function',
+      newScheduler: 'New scheduler',
+      newTriggerFunction: 'New trigger function',
+      thereIsNoQueriesYet: 'There is no queries yet',
+      searchForQueries: 'Search for queries',
+      killProcess: 'Kill process'
   },
   faker: {
      address: 'Address',
--- a/src/renderer/i18n/it-IT.js
+++ b/src/renderer/i18n/it-IT.js
@@ -106,7 +106,16 @@ module.exports = {
      array: 'Array',
      changelog: 'Changelog',
      format: 'Formatta',
-      sshTunnel: 'SSH tunnel'
+      sshTunnel: 'SSH tunnel',
+      structure: 'Structure',
+      small: 'Piccolo',
+      medium: 'Medio',
+      large: 'Largo',
+      row: 'Riga | Righe',
+      cell: 'Cella | Celle',
+      triggerFunction: 'Funzione di trigger | Funzioni di trigger',
+      all: 'Tutto',
+      duplicate: 'Duplica'
   },
   message: {
      appWelcome: 'Benvenuto in Antares SQL Client!',
@@ -212,7 +221,13 @@ module.exports = {
      deleteSchema: 'Elimina schema',
      markdownSupported: 'Markdown supportato',
      plantATree: 'Pianta un albero',
-      enableSsh: 'Abilita SSH'
+      dataTabPageSize: 'Grandezza pagina tab DATI',
+      enableSsh: 'Abilita SSH',
+      pageNumber: 'Numero pagina',
+      duplicateTable: 'Duplica tabella',
+      noOpenTabs: 'Non ci sono tab aperte, naviga nella barra sinistra o:',
+      noSchema: 'Nessuno schema',
+      restorePreviourSession: 'Ripristina sessione precedente'
   },
   faker: {
      address: 'Indirizzo',
--- a/src/renderer/images/logo-dark.svg
+++ b/src/renderer/images/logo-dark.svg
@@ -0,0 +1,301 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 1024 1024"
+   style="enable-background:new 0 0 1024 1024;"
+   xml:space="preserve"
+   sodipodi:docname="Antares-shape-2.svg"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs80" /><sodipodi:namedview
+   id="namedview78"
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1.0"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="0.0"
+   inkscape:pagecheckerboard="0"
+   showgrid="false"
+   inkscape:zoom="0.66015625"
+   inkscape:cx="210.55621"
+   inkscape:cy="511.2426"
+   inkscape:window-width="2560"
+   inkscape:window-height="1009"
+   inkscape:window-x="1912"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="g75" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:url(#XMLID_15_);}
+	.st2{opacity:0.5;fill:#FFBC00;}
+	.st3{fill:#FFBC00;}
+	.st4{fill:url(#XMLID_16_);}
+	.st5{fill:url(#XMLID_17_);}
+	.st6{fill:url(#XMLID_18_);}
+	.st7{fill:url(#XMLID_19_);}
+	.st8{fill:url(#XMLID_20_);}
+	.st9{fill:url(#XMLID_21_);}
+	.st10{opacity:0.46;}
+	.st11{fill:url(#XMLID_23_);}
+	.st12{fill:url(#XMLID_24_);}
+	.st13{fill:url(#XMLID_25_);}
+	.st14{fill:url(#XMLID_27_);}
+	.st15{fill:url(#XMLID_28_);}
+	.st16{fill:url(#XMLID_29_);}
+	.st17{fill:url(#XMLID_30_);}
+	.st18{opacity:0.75;}
+	.st19{opacity:0.44;clip-path:url(#XMLID_31_);}
+	.st20{fill:url(#XMLID_32_);}
+	.st21{fill:url(#XMLID_33_);}
+	.st22{fill:url(#XMLID_34_);}
+	.st23{fill:url(#XMLID_35_);}
+	.st24{fill:url(#XMLID_37_);}
+	.st25{fill:url(#XMLID_38_);}
+	.st26{opacity:0.43;fill:#FFBC00;}
+	.st27{opacity:0.58;fill:#FFBC00;}
+	.st28{fill:#FFBE06;}
+	.st29{fill:none;}
+	.st30{fill:url(#XMLID_42_);}
+	.st31{fill:url(#XMLID_43_);}
+	.st32{fill:url(#XMLID_44_);}
+	.st33{fill:url(#XMLID_45_);}
+	.st34{fill:url(#XMLID_46_);}
+	.st35{fill:url(#SVGID_4_);}
+	.st36{fill:url(#SVGID_5_);}
+	.st37{fill:url(#SVGID_6_);}
+	.st38{fill:url(#SVGID_7_);}
+	.st39{fill:url(#SVGID_8_);}
+	.st40{fill:url(#SVGID_11_);}
+	.st41{fill:url(#SVGID_12_);}
+	.st42{fill:url(#SVGID_13_);}
+	.st43{fill:url(#SVGID_14_);}
+	.st44{fill:#C68D00;}
+	.st45{fill:#CE000F;}
+</style>
+<g
+   id="g75">
+	<radialGradient
+   id="XMLID_15_"
+   cx="358.2692"
+   cy="227.2655"
+   r="830.0055"
+   gradientUnits="userSpaceOnUse">
+		<stop
+   offset="0"
+   style="stop-color:#F6971E"
+   id="stop4" />
+		<stop
+   offset="0.6338"
+   style="stop-color:#F4592D"
+   id="stop6" />
+		<stop
+   offset="0.7025"
+   style="stop-color:#EF4F29"
+   id="stop8" />
+		<stop
+   offset="0.8178"
+   style="stop-color:#E1351D"
+   id="stop10" />
+		<stop
+   offset="0.9647"
+   style="stop-color:#CA0B0B"
+   id="stop12" />
+		<stop
+   offset="1"
+   style="stop-color:#C40006"
+   id="stop14" />
+	</radialGradient>
+	<path
+   id="XMLID_124_"
+   style="fill:#ffffff;fill-opacity:0.15000001"
+   class="st1"
+   d="M 510.30078 9.0996094 A 502.79999 502.79999 0 0 0 7.5 511.90039 A 502.79999 502.79999 0 0 0 510.30078 1014.6992 A 502.79999 502.79999 0 0 0 1013.0996 511.90039 A 502.79999 502.79999 0 0 0 510.30078 9.0996094 z M 326.17578 78.685547 C 349.74023 78.648438 372.16211 83.875 393.09961 95 C 420.19961 112.9 439.6 136.99922 455 172.69922 C 465.4 205.69922 469.30078 238.79961 465.80078 281.59961 C 457.70078 373.59961 411.09922 469.09961 341.19922 531.59961 C 312.29922 557.49961 284.4 573.59961 256.5 589.59961 L 256.69922 593.19922 C 279.39922 594.99922 301.39922 586.10078 326.19922 571.80078 C 415.89922 516.50078 483.49922 397.69922 504.69922 285.19922 C 495.49922 338.79922 478.19922 391.4 449.69922 445 C 423.79922 489.6 397.30039 527.1 359.40039 562 C 300.00039 612.9 238.89961 638.80078 183.09961 626.30078 C 122.39961 611.00078 90.399609 545.8 92.599609 461 C 92.399609 457.4 92.1 453.89961 89 455.59961 C 87.6 458.29961 84.700781 463.60078 83.300781 466.30078 C 69.000781 517.30078 77.1 562.79922 91 601.19922 C 116.5 666.39922 177.79922 688.69922 244.69922 676.19922 C 204.99922 685.99922 167.69922 683.3 134.19922 665.5 C 107.09922 647.6 84.599609 625.30039 70.599609 586.90039 C 55.899609 537.80039 50.700391 486.89922 70.400391 421.69922 C 95.300391 338.69922 139.50078 255.59922 207.30078 209.19922 C 227.30078 195.79922 245.99922 185.09961 267.69922 172.59961 C 270.79922 170.79961 270.60039 167.20039 268.90039 166.40039 C 159.40039 170.00039 46.500391 333.30039 20.900391 474.40039 C 36.400391 372.60039 87.500391 272.6 167.90039 198.5 C 213.50039 157.4 258.79922 136.89922 305.19922 130.69922 C 386.89922 122.69922 437.10078 194.1 434.80078 299.5 C 435.00078 303.1 436.70039 304.00039 438.40039 304.90039 C 446.50039 281.70039 451.39961 260.29922 451.59961 239.69922 C 451.50293 126.5894 381.21362 66.112098 291.87891 82.363281 C 288.79216 82.977349 285.71662 83.531343 282.59961 84.300781 C 285.71508 83.559319 288.80642 82.922208 291.87891 82.363281 C 303.5351 80.044429 314.99734 78.703151 326.17578 78.685547 z M 858.04883 508.3457 C 873.78027 508.64453 888.6875 512.44922 902.5 520.19922 C 920.3 532.49922 935.10078 547.69961 943.80078 573.59961 C 952.90078 606.59961 955.59961 640.70039 941.59961 683.90039 C 923.79961 739.00039 893.09961 793.80039 847.09961 823.90039 C 833.49961 832.60039 820.89922 839.4 806.19922 847.5 C 804.09922 848.6 804.20078 850.99922 805.30078 851.69922 C 878.70078 851.09922 956.39961 743.59922 975.59961 649.69922 C 963.79961 717.49922 928.2 783.50078 873.5 831.80078 C 842.5 858.60078 811.90078 871.59961 780.80078 875.09961 C 726.10078 879.29961 693.59922 830.9 696.69922 760.5 C 696.59922 758.1 695.50039 757.50039 694.40039 756.90039 C 688.70039 772.30039 685.09961 786.49922 684.59961 800.19922 C 683.15311 870.80636 723.40104 911.63389 777.53906 908.77344 C 757.57984 910.46578 738.70856 907.29881 721.59961 897.69922 C 703.79961 885.39922 691.10039 869.00039 681.40039 844.90039 C 674.90039 822.70039 672.79922 800.6 675.69922 772 C 682.39922 710.7 714.9 647.60078 762.5 606.80078 C 782.1 589.90078 801.00039 579.60078 819.90039 569.30078 L 819.80078 566.90039 C 804.70078 565.40039 789.89961 570.99922 773.09961 580.19922 C 712.39961 615.89922 665.50078 694.2 649.80078 769 C 656.70078 733.4 669.00078 698.39961 688.80078 663.09961 C 706.80078 633.69961 725.00078 609.00078 750.80078 586.30078 C 791.20078 553.20078 832.40039 536.80039 869.40039 545.90039 C 909.80039 556.90039 930.2 600.9 927.5 657.5 C 927.6 659.9 927.70078 662.29961 929.80078 661.09961 C 930.80078 659.29961 932.80078 655.8 933.80078 654 C 944.00078 620.2 939.3 589.70078 930.5 563.80078 C 914.4 519.90078 873.80039 504.1 828.90039 511.5 C 838.87539 509.25 848.60996 508.16641 858.04883 508.3457 z " />
+	<linearGradient
+   id="XMLID_16_"
+   gradientUnits="userSpaceOnUse"
+   x1="505.4734"
+   y1="-52.674"
+   x2="505.4734"
+   y2="155.1105">
+		<stop
+   offset="0"
+   style="stop-color:#FFFFFF;stop-opacity:0.4"
+   id="stop18" />
+		<stop
+   offset="1"
+   style="stop-color:#FFFFFF;stop-opacity:0"
+   id="stop20" />
+	</linearGradient>
+	
+	
+		<linearGradient
+   id="XMLID_17_"
+   gradientUnits="userSpaceOnUse"
+   x1="503.3253"
+   y1="-583.7885"
+   x2="503.3253"
+   y2="-376.4571"
+   gradientTransform="matrix(-1 0 0 -1 1017 456.5313)">
+		<stop
+   offset="5.263158e-03"
+   style="stop-color:#9E3A1D;stop-opacity:0.4"
+   id="stop24" />
+		<stop
+   offset="1"
+   style="stop-color:#9E3A1D;stop-opacity:0"
+   id="stop26" />
+	</linearGradient>
+	
+	
+		<linearGradient
+   id="XMLID_18_"
+   gradientUnits="userSpaceOnUse"
+   x1="506.1886"
+   y1="-38.7551"
+   x2="506.1886"
+   y2="169.0294"
+   gradientTransform="matrix(4.489700e-11 1 -1 4.489700e-11 1026.6101 -2.3899)">
+		<stop
+   offset="5.263158e-03"
+   style="stop-color:#9E3A1D;stop-opacity:0.4"
+   id="stop30" />
+		<stop
+   offset="1"
+   style="stop-color:#9E3A1D;stop-opacity:0"
+   id="stop32" />
+	</linearGradient>
+	
+	
+		<linearGradient
+   id="XMLID_19_"
+   gradientUnits="userSpaceOnUse"
+   x1="502.6101"
+   y1="-660.7308"
+   x2="502.6101"
+   y2="-450.373"
+   gradientTransform="matrix(-4.489700e-11 -1 1 -4.489700e-11 570.0789 1014.6101)">
+		<stop
+   offset="0"
+   style="stop-color:#FFFFFF;stop-opacity:0.4"
+   id="stop36" />
+		<stop
+   offset="1"
+   style="stop-color:#FFFFFF;stop-opacity:0"
+   id="stop38" />
+	</linearGradient>
+	
+	<g
+   id="XMLID_39_"
+   class="st10">
+		<defs
+   id="defs43">
+			
+				<ellipse
+   id="XMLID_36_"
+   transform="matrix(0.8019 -0.5974 0.5974 0.8019 -204.724 406.2339)"
+   class="st10"
+   cx="510.3"
+   cy="511.9"
+   ry="502.8"
+   rx="502.8" />
+		</defs>
+		<clipPath
+   id="XMLID_20_">
+			<use
+   xlink:href="#XMLID_36_"
+   style="overflow:visible;"
+   id="use45" />
+		</clipPath>
+	</g>
+	<g
+   id="XMLID_41_">
+		<linearGradient
+   id="XMLID_21_"
+   gradientUnits="userSpaceOnUse"
+   x1="64.4989"
+   y1="234.8705"
+   x2="401.1502"
+   y2="480.7042">
+			<stop
+   offset="0"
+   style="stop-color:#F4592D"
+   id="stop49" />
+			<stop
+   offset="1"
+   style="stop-color:#FFD900"
+   id="stop51" />
+		</linearGradient>
+		
+		<linearGradient
+   id="XMLID_22_"
+   gradientUnits="userSpaceOnUse"
+   x1="438.1351"
+   y1="490.0881"
+   x2="196.6566"
+   y2="356.1772">
+			<stop
+   offset="0"
+   style="stop-color:#F64626"
+   id="stop55" />
+			<stop
+   offset="1"
+   style="stop-color:#FFD900"
+   id="stop57" />
+		</linearGradient>
+		
+	</g>
+	<g
+   id="XMLID_11_">
+		
+			<linearGradient
+   id="XMLID_23_"
+   gradientUnits="userSpaceOnUse"
+   x1="-316.9261"
+   y1="9.5862"
+   x2="-92.0354"
+   y2="173.8087"
+   gradientTransform="matrix(-0.9998 -2.148304e-02 2.148304e-02 -0.9998 625.9278 811.8477)">
+			<stop
+   offset="0"
+   style="stop-color:#F4592D"
+   id="stop62" />
+			<stop
+   offset="1"
+   style="stop-color:#FFD900"
+   id="stop64" />
+		</linearGradient>
+		
+		
+			<linearGradient
+   id="XMLID_24_"
+   gradientUnits="userSpaceOnUse"
+   x1="-52.9013"
+   y1="188.0779"
+   x2="-214.2144"
+   y2="98.6225"
+   gradientTransform="matrix(-0.9998 -2.148304e-02 2.148304e-02 -0.9998 625.9278 811.8477)">
+			<stop
+   offset="0"
+   style="stop-color:#F42C2D"
+   id="stop68" />
+			<stop
+   offset="1"
+   style="stop-color:#FFD900"
+   id="stop70" />
+		</linearGradient>
+		
+	</g>
+</g>
+</svg>
--- a/src/renderer/images/logo-light.svg
+++ b/src/renderer/images/logo-light.svg
@@ -0,0 +1,301 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 1024 1024"
+   style="enable-background:new 0 0 1024 1024;"
+   xml:space="preserve"
+   sodipodi:docname="Antares-shape-1.svg"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs80" /><sodipodi:namedview
+   id="namedview78"
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1.0"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="0.0"
+   inkscape:pagecheckerboard="0"
+   showgrid="false"
+   inkscape:zoom="0.66015625"
+   inkscape:cx="512"
+   inkscape:cy="511.2426"
+   inkscape:window-width="2560"
+   inkscape:window-height="1009"
+   inkscape:window-x="1912"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="g75" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:url(#XMLID_15_);}
+	.st2{opacity:0.5;fill:#FFBC00;}
+	.st3{fill:#FFBC00;}
+	.st4{fill:url(#XMLID_16_);}
+	.st5{fill:url(#XMLID_17_);}
+	.st6{fill:url(#XMLID_18_);}
+	.st7{fill:url(#XMLID_19_);}
+	.st8{fill:url(#XMLID_20_);}
+	.st9{fill:url(#XMLID_21_);}
+	.st10{opacity:0.46;}
+	.st11{fill:url(#XMLID_23_);}
+	.st12{fill:url(#XMLID_24_);}
+	.st13{fill:url(#XMLID_25_);}
+	.st14{fill:url(#XMLID_27_);}
+	.st15{fill:url(#XMLID_28_);}
+	.st16{fill:url(#XMLID_29_);}
+	.st17{fill:url(#XMLID_30_);}
+	.st18{opacity:0.75;}
+	.st19{opacity:0.44;clip-path:url(#XMLID_31_);}
+	.st20{fill:url(#XMLID_32_);}
+	.st21{fill:url(#XMLID_33_);}
+	.st22{fill:url(#XMLID_34_);}
+	.st23{fill:url(#XMLID_35_);}
+	.st24{fill:url(#XMLID_37_);}
+	.st25{fill:url(#XMLID_38_);}
+	.st26{opacity:0.43;fill:#FFBC00;}
+	.st27{opacity:0.58;fill:#FFBC00;}
+	.st28{fill:#FFBE06;}
+	.st29{fill:none;}
+	.st30{fill:url(#XMLID_42_);}
+	.st31{fill:url(#XMLID_43_);}
+	.st32{fill:url(#XMLID_44_);}
+	.st33{fill:url(#XMLID_45_);}
+	.st34{fill:url(#XMLID_46_);}
+	.st35{fill:url(#SVGID_4_);}
+	.st36{fill:url(#SVGID_5_);}
+	.st37{fill:url(#SVGID_6_);}
+	.st38{fill:url(#SVGID_7_);}
+	.st39{fill:url(#SVGID_8_);}
+	.st40{fill:url(#SVGID_11_);}
+	.st41{fill:url(#SVGID_12_);}
+	.st42{fill:url(#SVGID_13_);}
+	.st43{fill:url(#SVGID_14_);}
+	.st44{fill:#C68D00;}
+	.st45{fill:#CE000F;}
+</style>
+<g
+   id="g75">
+	<radialGradient
+   id="XMLID_15_"
+   cx="358.2692"
+   cy="227.2655"
+   r="830.0055"
+   gradientUnits="userSpaceOnUse">
+		<stop
+   offset="0"
+   style="stop-color:#F6971E"
+   id="stop4" />
+		<stop
+   offset="0.6338"
+   style="stop-color:#F4592D"
+   id="stop6" />
+		<stop
+   offset="0.7025"
+   style="stop-color:#EF4F29"
+   id="stop8" />
+		<stop
+   offset="0.8178"
+   style="stop-color:#E1351D"
+   id="stop10" />
+		<stop
+   offset="0.9647"
+   style="stop-color:#CA0B0B"
+   id="stop12" />
+		<stop
+   offset="1"
+   style="stop-color:#C40006"
+   id="stop14" />
+	</radialGradient>
+	<path
+   id="XMLID_124_"
+   style="fill:#000000;fill-opacity:0.5"
+   class="st1"
+   d="M 510.30078 9.0996094 A 502.79999 502.79999 0 0 0 7.5 511.90039 A 502.79999 502.79999 0 0 0 510.30078 1014.6992 A 502.79999 502.79999 0 0 0 1013.0996 511.90039 A 502.79999 502.79999 0 0 0 510.30078 9.0996094 z M 326.17578 78.685547 C 349.74023 78.648438 372.16211 83.875 393.09961 95 C 420.19961 112.9 439.6 136.99922 455 172.69922 C 465.4 205.69922 469.30078 238.79961 465.80078 281.59961 C 457.70078 373.59961 411.09922 469.09961 341.19922 531.59961 C 312.29922 557.49961 284.4 573.59961 256.5 589.59961 L 256.69922 593.19922 C 279.39922 594.99922 301.39922 586.10078 326.19922 571.80078 C 415.89922 516.50078 483.49922 397.69922 504.69922 285.19922 C 495.49922 338.79922 478.19922 391.4 449.69922 445 C 423.79922 489.6 397.30039 527.1 359.40039 562 C 300.00039 612.9 238.89961 638.80078 183.09961 626.30078 C 122.39961 611.00078 90.399609 545.8 92.599609 461 C 92.399609 457.4 92.1 453.89961 89 455.59961 C 87.6 458.29961 84.700781 463.60078 83.300781 466.30078 C 69.000781 517.30078 77.1 562.79922 91 601.19922 C 116.5 666.39922 177.79922 688.69922 244.69922 676.19922 C 204.99922 685.99922 167.69922 683.3 134.19922 665.5 C 107.09922 647.6 84.599609 625.30039 70.599609 586.90039 C 55.899609 537.80039 50.700391 486.89922 70.400391 421.69922 C 95.300391 338.69922 139.50078 255.59922 207.30078 209.19922 C 227.30078 195.79922 245.99922 185.09961 267.69922 172.59961 C 270.79922 170.79961 270.60039 167.20039 268.90039 166.40039 C 159.40039 170.00039 46.500391 333.30039 20.900391 474.40039 C 36.400391 372.60039 87.500391 272.6 167.90039 198.5 C 213.50039 157.4 258.79922 136.89922 305.19922 130.69922 C 386.89922 122.69922 437.10078 194.1 434.80078 299.5 C 435.00078 303.1 436.70039 304.00039 438.40039 304.90039 C 446.50039 281.70039 451.39961 260.29922 451.59961 239.69922 C 451.50293 126.5894 381.21362 66.112098 291.87891 82.363281 C 288.79216 82.977349 285.71662 83.531343 282.59961 84.300781 C 285.71508 83.559319 288.80642 82.922208 291.87891 82.363281 C 303.5351 80.044429 314.99734 78.703151 326.17578 78.685547 z M 858.04883 508.3457 C 873.78027 508.64453 888.6875 512.44922 902.5 520.19922 C 920.3 532.49922 935.10078 547.69961 943.80078 573.59961 C 952.90078 606.59961 955.59961 640.70039 941.59961 683.90039 C 923.79961 739.00039 893.09961 793.80039 847.09961 823.90039 C 833.49961 832.60039 820.89922 839.4 806.19922 847.5 C 804.09922 848.6 804.20078 850.99922 805.30078 851.69922 C 878.70078 851.09922 956.39961 743.59922 975.59961 649.69922 C 963.79961 717.49922 928.2 783.50078 873.5 831.80078 C 842.5 858.60078 811.90078 871.59961 780.80078 875.09961 C 726.10078 879.29961 693.59922 830.9 696.69922 760.5 C 696.59922 758.1 695.50039 757.50039 694.40039 756.90039 C 688.70039 772.30039 685.09961 786.49922 684.59961 800.19922 C 683.15311 870.80636 723.40104 911.63389 777.53906 908.77344 C 757.57984 910.46578 738.70856 907.29881 721.59961 897.69922 C 703.79961 885.39922 691.10039 869.00039 681.40039 844.90039 C 674.90039 822.70039 672.79922 800.6 675.69922 772 C 682.39922 710.7 714.9 647.60078 762.5 606.80078 C 782.1 589.90078 801.00039 579.60078 819.90039 569.30078 L 819.80078 566.90039 C 804.70078 565.40039 789.89961 570.99922 773.09961 580.19922 C 712.39961 615.89922 665.50078 694.2 649.80078 769 C 656.70078 733.4 669.00078 698.39961 688.80078 663.09961 C 706.80078 633.69961 725.00078 609.00078 750.80078 586.30078 C 791.20078 553.20078 832.40039 536.80039 869.40039 545.90039 C 909.80039 556.90039 930.2 600.9 927.5 657.5 C 927.6 659.9 927.70078 662.29961 929.80078 661.09961 C 930.80078 659.29961 932.80078 655.8 933.80078 654 C 944.00078 620.2 939.3 589.70078 930.5 563.80078 C 914.4 519.90078 873.80039 504.1 828.90039 511.5 C 838.87539 509.25 848.60996 508.16641 858.04883 508.3457 z " />
+	<linearGradient
+   id="XMLID_16_"
+   gradientUnits="userSpaceOnUse"
+   x1="505.4734"
+   y1="-52.674"
+   x2="505.4734"
+   y2="155.1105">
+		<stop
+   offset="0"
+   style="stop-color:#FFFFFF;stop-opacity:0.4"
+   id="stop18" />
+		<stop
+   offset="1"
+   style="stop-color:#FFFFFF;stop-opacity:0"
+   id="stop20" />
+	</linearGradient>
+	
+	
+		<linearGradient
+   id="XMLID_17_"
+   gradientUnits="userSpaceOnUse"
+   x1="503.3253"
+   y1="-583.7885"
+   x2="503.3253"
+   y2="-376.4571"
+   gradientTransform="matrix(-1 0 0 -1 1017 456.5313)">
+		<stop
+   offset="5.263158e-03"
+   style="stop-color:#9E3A1D;stop-opacity:0.4"
+   id="stop24" />
+		<stop
+   offset="1"
+   style="stop-color:#9E3A1D;stop-opacity:0"
+   id="stop26" />
+	</linearGradient>
+	
+	
+		<linearGradient
+   id="XMLID_18_"
+   gradientUnits="userSpaceOnUse"
+   x1="506.1886"
+   y1="-38.7551"
+   x2="506.1886"
+   y2="169.0294"
+   gradientTransform="matrix(4.489700e-11 1 -1 4.489700e-11 1026.6101 -2.3899)">
+		<stop
+   offset="5.263158e-03"
+   style="stop-color:#9E3A1D;stop-opacity:0.4"
+   id="stop30" />
+		<stop
+   offset="1"
+   style="stop-color:#9E3A1D;stop-opacity:0"
+   id="stop32" />
+	</linearGradient>
+	
+	
+		<linearGradient
+   id="XMLID_19_"
+   gradientUnits="userSpaceOnUse"
+   x1="502.6101"
+   y1="-660.7308"
+   x2="502.6101"
+   y2="-450.373"
+   gradientTransform="matrix(-4.489700e-11 -1 1 -4.489700e-11 570.0789 1014.6101)">
+		<stop
+   offset="0"
+   style="stop-color:#FFFFFF;stop-opacity:0.4"
+   id="stop36" />
+		<stop
+   offset="1"
+   style="stop-color:#FFFFFF;stop-opacity:0"
+   id="stop38" />
+	</linearGradient>
+	
+	<g
+   id="XMLID_39_"
+   class="st10">
+		<defs
+   id="defs43">
+			
+				<ellipse
+   id="XMLID_36_"
+   transform="matrix(0.8019 -0.5974 0.5974 0.8019 -204.724 406.2339)"
+   class="st10"
+   cx="510.3"
+   cy="511.9"
+   ry="502.8"
+   rx="502.8" />
+		</defs>
+		<clipPath
+   id="XMLID_20_">
+			<use
+   xlink:href="#XMLID_36_"
+   style="overflow:visible;"
+   id="use45" />
+		</clipPath>
+	</g>
+	<g
+   id="XMLID_41_">
+		<linearGradient
+   id="XMLID_21_"
+   gradientUnits="userSpaceOnUse"
+   x1="64.4989"
+   y1="234.8705"
+   x2="401.1502"
+   y2="480.7042">
+			<stop
+   offset="0"
+   style="stop-color:#F4592D"
+   id="stop49" />
+			<stop
+   offset="1"
+   style="stop-color:#FFD900"
+   id="stop51" />
+		</linearGradient>
+		
+		<linearGradient
+   id="XMLID_22_"
+   gradientUnits="userSpaceOnUse"
+   x1="438.1351"
+   y1="490.0881"
+   x2="196.6566"
+   y2="356.1772">
+			<stop
+   offset="0"
+   style="stop-color:#F64626"
+   id="stop55" />
+			<stop
+   offset="1"
+   style="stop-color:#FFD900"
+   id="stop57" />
+		</linearGradient>
+		
+	</g>
+	<g
+   id="XMLID_11_">
+		
+			<linearGradient
+   id="XMLID_23_"
+   gradientUnits="userSpaceOnUse"
+   x1="-316.9261"
+   y1="9.5862"
+   x2="-92.0354"
+   y2="173.8087"
+   gradientTransform="matrix(-0.9998 -2.148304e-02 2.148304e-02 -0.9998 625.9278 811.8477)">
+			<stop
+   offset="0"
+   style="stop-color:#F4592D"
+   id="stop62" />
+			<stop
+   offset="1"
+   style="stop-color:#FFD900"
+   id="stop64" />
+		</linearGradient>
+		
+		
+			<linearGradient
+   id="XMLID_24_"
+   gradientUnits="userSpaceOnUse"
+   x1="-52.9013"
+   y1="188.0779"
+   x2="-214.2144"
+   y2="98.6225"
+   gradientTransform="matrix(-0.9998 -2.148304e-02 2.148304e-02 -0.9998 625.9278 811.8477)">
+			<stop
+   offset="0"
+   style="stop-color:#F42C2D"
+   id="stop68" />
+			<stop
+   offset="1"
+   style="stop-color:#FFD900"
+   id="stop70" />
+		</linearGradient>
+		
+	</g>
+</g>
+</svg>
--- a/src/renderer/ipc-api/Schema.js
+++ b/src/renderer/ipc-api/Schema.js
@@ -42,6 +42,10 @@ export default class {
      return ipcRenderer.invoke('get-processes', uid);
   }

+   static killProcess (params) {
+      return ipcRenderer.invoke('kill-process', params);
+   }
+
   static useSchema (params) {
      return ipcRenderer.invoke('use-schema', params);
   }
--- a/src/renderer/ipc-api/Tables.js
+++ b/src/renderer/ipc-api/Tables.js
@@ -10,6 +10,14 @@ export default class {
      return ipcRenderer.invoke('get-table-data', params);
   }

+   static getTableApproximateCount (params) {
+      return ipcRenderer.invoke('get-table-count', params);
+   }
+
+   static getTableOptions (params) {
+      return ipcRenderer.invoke('get-table-options', params);
+   }
+
   static getTableIndexes (params) {
      return ipcRenderer.invoke('get-table-indexes', params);
   }
--- a/src/renderer/mixins/tableTabs.js
+++ b/src/renderer/mixins/tableTabs.js
@@ -1,11 +1,6 @@
 import Tables from '@/ipc-api/Tables';

 export default {
-   computed: {
-      schema () {
-         return this.workspace.breadcrumbs.schema;
-      }
-   },
   methods: {
      async updateField (payload) {
         this.isQuering = true;
--- a/src/renderer/scss/_fake-tables.scss
+++ b/src/renderer/scss/_fake-tables.scss
@@ -29,6 +29,7 @@
  .th {
    padding: $unit-3 $unit-2;
    display: table-cell;
+    border-radius: 3px;
  }

  .th {
--- a/src/renderer/scss/_table-keys.scss
+++ b/src/renderer/scss/_table-keys.scss
@@ -17,7 +17,7 @@
  &.key-mul,
  &.key-INDEX,
  &.key-KEY {
-    color: palegreen;
+    color: limegreen;
  }

  &.key-FULLTEXT {
--- a/src/renderer/scss/main.scss
+++ b/src/renderer/scss/main.scss
@@ -15,6 +15,15 @@ body {
  user-select: none;
 }

+::selection,
+option:hover,
+option:focus,
+option:active,
+option:checked {
+  background-color: $primary-color;
+  color: $light-color;
+}
+
 /* Additions */
@include margin-variant(3, $unit-3);
@include margin-variant(4, $unit-4);
@@ -200,7 +209,7 @@ body {
  cursor: pointer;

  &.small-select {
-    height: 1rem;
+    height: 21px;
    font-size: 0.7rem;
    padding: 1px 0.4rem 0;
  }
--- a/src/renderer/scss/themes/dark-theme.scss
+++ b/src/renderer/scss/themes/dark-theme.scss
@@ -20,6 +20,11 @@
    }
  }

+  option,
+  optgroup {
+    background-color: $bg-color-gray;
+  }
+
  // Override Spectre.css
  .menu {
    background: $bg-color-light-dark;
@@ -63,6 +68,12 @@
        background-color: $primary-color;
      }
    }
+
+    &.btn-clear {
+      &:hover {
+        background: rgba($light-color, 20%);
+      }
+    }
  }

  .modal {
@@ -129,6 +140,11 @@
    background: $bg-color-light-dark;
  }

+  code {
+    background-color: #000;
+    color: $body-font-color-dark;
+  }
+
  // Antares
  .workspace {
    .workspace-explorebar {
@@ -156,7 +172,8 @@
        }

        .menu-item {
-          &:hover {
+          &:hover,
+          &.selected {
            color: $body-font-color-dark;
            background: rgba($color: #fff, $alpha: 0.05);
          }
@@ -167,16 +184,29 @@
    .workspace-query-results {
      .table {
        .th {
-          background: $bg-color-dark;
-          border-color: $bg-color-light-dark;
+          border-color: darken($bg-color-light-gray, 80%);
+          background-color: $body-bg-dark;
        }

-        .td {
-          border-color: $bg-color-light-dark;
+        .tr {
+          background-color: darken($bg-color-light-gray, 80%);

-          &:focus {
-            box-shadow: inset 0 0 0 1px $body-font-color-dark;
-            background: rgba($color: #000, $alpha: 0.3);
+          .td:first-child {
+            border-left: 2px solid $body-bg-dark;
+          }
+
+          .td {
+            border-color: $body-bg-dark;
+
+            &:focus {
+              box-shadow: inset 0 0 0 2px darken($body-font-color-dark, 40%);
+              background-color: rgba($color: #000, $alpha: 0.3);
+            }
+
+            .editable-field {
+              box-shadow: inset 0 0 0 2px darken($body-font-color-dark, 40%);
+              background-color: rgba($color: #000, $alpha: 0.3);
+            }
          }
        }
      }
@@ -191,19 +221,8 @@
            color: $body-font-color-dark;
          }

-          & &.tools-dropdown {
-            .tab-link:focus {
-              color: $primary-color;
-            }
-
-            .menu {
-              .menu-item a {
-                &:hover {
-                  color: $primary-color;
-                  background: $bg-color-gray;
-                }
-              }
-            }
+          &.tools-dropdown {
+            background-color: $bg-color-light-dark;
          }
        }

@@ -264,6 +283,12 @@
  }

  .tile {
+    transition: background 0.2s;
+
+    &:focus {
+      background: rgba($bg-color-light-dark, 60%);
+    }
+
    &:hover {
      background: $bg-color-light-dark;
    }
@@ -392,11 +417,6 @@
      background: rgba(48, 55, 66, 0.95);
      color: #fff;
    }
-
-    &:hover .ex-tooltip-content {
-      visibility: visible;
-      opacity: 1;
-    }
  }

  #footer {
--- a/src/renderer/scss/themes/light-theme.scss
+++ b/src/renderer/scss/themes/light-theme.scss
@@ -18,20 +18,11 @@
    background: #ababab;
  }

-  #titlebar {
-    background: $bg-color-light;
-    box-shadow: 0 0 1px 0 #000;
-
-    .titlebar-elements {
-      .titlebar-element {
-        &:hover {
-          opacity: 1;
-          background: rgba($color: rgb(172, 172, 172), $alpha: 0.2);
-        }
-
-        &.close-button:hover {
-          background: red;
-        }
+  .menu {
+    .menu-item a {
+      &:hover {
+        color: $body-font-color;
+        background: rgba($color: #000, $alpha: 0.1);
      }
    }
  }
@@ -88,6 +79,12 @@
  }

  .tile {
+    transition: background 0.2s;
+
+    &:focus {
+      background: rgba($bg-color-light-gray, 70%);
+    }
+
    &:hover {
      background: $bg-color-light-gray;
    }
@@ -111,6 +108,24 @@
    }
  }

+  #titlebar {
+    background: $bg-color-light;
+    box-shadow: 0 0 1px 0 #000;
+
+    .titlebar-elements {
+      .titlebar-element {
+        &:hover {
+          opacity: 1;
+          background: rgba($color: rgb(172, 172, 172), $alpha: 0.2);
+        }
+
+        &.close-button:hover {
+          background: red;
+        }
+      }
+    }
+  }
+
  #settingbar {
    width: $settingbar-width;
    height: calc(100vh - #{$excluding-size});
@@ -168,11 +183,6 @@
      background: rgba(48, 55, 66, 0.95);
      color: #fff;
    }
-
-    &:hover .ex-tooltip-content {
-      visibility: visible;
-      opacity: 1;
-    }
  }

  .workspace {
@@ -185,21 +195,56 @@
          background: $bg-color-light-gray;
        }

+        .menu-item {
+          &:hover,
+          &.selected {
+            background: rgba($color: #000, $alpha: 0.05);
+          }
+        }
+
        .table-size {
          opacity: 0.4;
        }
      }
    }

+    .workspace-tabs {
+      .tab-block {
+        .tab-item {
+          &.tools-dropdown {
+            background-color: $body-bg;
+          }
+        }
+      }
+    }
+
    .workspace-query-results {
      .table {
        .th {
          background: $body-bg;
-          border-color: rgba($bg-color-light-dark, 0.5);
+          border-color: lighten($bg-color-light-gray, 2%);
        }

-        .td {
-          border-color: rgba($bg-color-light-dark, 0.5);
+        .tr {
+          background-color: lighten($bg-color-light-gray, 2%);
+
+          .td:first-child {
+            border-left: 2px solid $body-bg;
+          }
+
+          .td {
+            border-color: $body-bg;
+
+            &:focus {
+              box-shadow: inset 0 0 0 2px lighten($body-font-color, 10%);
+              background-color: $body-font-color-dark;
+            }
+
+            .editable-field {
+              box-shadow: inset 0 0 0 2px lighten($body-font-color, 10%);
+              background-color: $body-font-color-dark;
+            }
+          }
        }
      }
    }
--- a/src/renderer/store/index.js
+++ b/src/renderer/store/index.js
@@ -5,12 +5,14 @@ import Vuex from 'vuex';

 import application from './modules/application.store';
 import settings from './modules/settings.store';
+import history from './modules/history.store';
 import scratchpad from './modules/scratchpad.store';
 import connections from './modules/connections.store';
 import workspaces from './modules/workspaces.store';
 import notifications from './modules/notifications.store';

 import ipcUpdates from './plugins/ipcUpdates';
+import ipcExceptions from './plugins/ipcExceptions';

 Vue.use(Vuex);

@@ -19,12 +21,14 @@ export default new Vuex.Store({
   modules: {
      application,
      settings,
+      history,
      scratchpad,
      connections,
      workspaces,
      notifications
   },
   plugins: [
-      ipcUpdates
+      ipcUpdates,
+      ipcExceptions
   ]
 });
--- a/src/renderer/store/modules/history.store.js
+++ b/src/renderer/store/modules/history.store.js
@@ -0,0 +1,54 @@
+'use strict';
+import Store from 'electron-store';
+import { uidGen } from 'common/libs/uidGen';
+const persistentStore = new Store({ name: 'history' });
+const historySize = 1000;
+
+export default {
+   namespaced: true,
+   strict: true,
+   state: {
+      history: persistentStore.get('history', {}),
+      favorites: persistentStore.get('favorites', {})
+   },
+   getters: {
+      getHistoryByWorkspace: state => uid => state.history[uid]
+   },
+   mutations: {
+      SET_HISTORY (state, args) {
+         if (!(args.uid in state.history))
+            state.history[args.uid] = [];
+
+         state.history[args.uid] = [
+            {
+               uid: uidGen('H'),
+               sql: args.query,
+               date: new Date(),
+               schema: args.schema
+            },
+            ...state.history[args.uid]
+         ];
+
+         if (state.history[args.uid].length > historySize)
+            state.history[args.uid] = state.history[args.uid].slice(0, historySize);
+
+         persistentStore.set('history', state.history);
+      },
+      DELETE_QUERY_FROM_HISTORY (state, query) {
+         state.history[query.workspace] = state.history[query.workspace].filter(q => q.uid !== query.uid);
+         persistentStore.set('history', state.history);
+      }
+   },
+   actions: {
+      saveHistory ({ commit, getters }, args) {
+         if (getters.getHistoryByWorkspace(args.uid) &&
+            getters.getHistoryByWorkspace(args.uid).length &&
+            getters.getHistoryByWorkspace(args.uid)[0].sql === args.query
+         ) return;
+         commit('SET_HISTORY', args);
+      },
+      deleteQueryFromHistory ({ commit }, query) {
+         commit('DELETE_QUERY_FROM_HISTORY', query);
+      }
+   }
+};
--- a/src/renderer/store/modules/settings.store.js
+++ b/src/renderer/store/modules/settings.store.js
@@ -16,7 +16,8 @@ export default {
      line_wrap: persistentStore.get('line_wrap', true),
      application_theme: persistentStore.get('application_theme', 'dark'),
      editor_theme: persistentStore.get('editor_theme', 'twilight'),
-      editor_font_size: persistentStore.get('editor_font_size', 'medium')
+      editor_font_size: persistentStore.get('editor_font_size', 'medium'),
+      restore_tabs: persistentStore.get('restore_tabs', true)
   },
   getters: {
      getLocale: state => state.locale,
@@ -28,7 +29,8 @@ export default {
      getLineWrap: state => state.line_wrap,
      getApplicationTheme: state => state.application_theme,
      getEditorTheme: state => state.editor_theme,
-      getEditorFontSize: state => state.editor_font_size
+      getEditorFontSize: state => state.editor_font_size,
+      getRestoreTabs: state => state.restore_tabs
   },
   mutations: {
      SET_LOCALE (state, locale) {
@@ -71,6 +73,10 @@ export default {
      SET_EDITOR_FONT_SIZE (state, size) {
         state.editor_font_size = size;
         persistentStore.set('editor_font_size', state.editor_font_size);
+      },
+      SET_RESTORE_TABS (state, val) {
+         state.restore_tabs = val;
+         persistentStore.set('restore_tabs', state.restore_tabs);
      }
   },
   actions: {
@@ -103,6 +109,9 @@ export default {
      },
      changeEditorFontSize ({ commit }, size) {
         commit('SET_EDITOR_FONT_SIZE', size);
+      },
+      changeRestoreTabs ({ commit }, size) {
+         commit('SET_RESTORE_TABS', size);
      }
   }
 };
--- a/src/renderer/store/modules/workspaces.store.js
+++ b/src/renderer/store/modules/workspaces.store.js
@@ -1,20 +1,18 @@
 'use strict';
+import Store from 'electron-store';
 import Connection from '@/ipc-api/Connection';
 import Schema from '@/ipc-api/Schema';
 import Users from '@/ipc-api/Users';
 import { uidGen } from 'common/libs/uidGen';
+const persistentStore = new Store({ name: 'tabs' });
 const tabIndex = [];
-let lastBreadcrumbs = {};

 export default {
   namespaced: true,
   strict: true,
   state: {
      workspaces: [],
-      selected_workspace: null,
-      has_unsaved_changes: false,
-      is_unsaved_discard_modal: false,
-      pending_breadcrumbs: {}
+      selected_workspace: null
   },
   getters: {
      getSelected: state => {
@@ -37,17 +35,14 @@ export default {
      },
      getConnected: state => {
         return state.workspaces
-            .filter(workspace => workspace.connection_status === 'connected')
+            .filter(workspace => workspace.connectionStatus === 'connected')
            .map(workspace => workspace.uid);
      },
      getLoadedSchemas: state => uid => {
-         return state.workspaces.find(workspace => workspace.uid === uid).loaded_schemas;
+         return state.workspaces.find(workspace => workspace.uid === uid).loadedSchemas;
      },
      getSearchTerm: state => uid => {
-         return state.workspaces.find(workspace => workspace.uid === uid).search_term;
-      },
-      isUnsavedDiscardModal: state => {
-         return state.is_unsaved_discard_modal;
+         return state.workspaces.find(workspace => workspace.uid === uid).searchTerm;
      }
   },
   mutations: {
@@ -60,6 +55,15 @@ export default {
      SET_CONNECTED (state, payload) {
         const { uid, client, dataTypes, indexTypes, customizations, structure, version } = payload;

+         const cachedTabs = payload.restoreTabs ? persistentStore.get(uid, []) : [];
+
+         if (cachedTabs.length) {
+            tabIndex[uid] = cachedTabs.reduce((acc, curr) => {
+               if (curr.index > acc) acc = curr.index;
+               return acc;
+            }, null);
+         }
+
         state.workspaces = state.workspaces.map(workspace => workspace.uid === uid
            ? {
               ...workspace,
@@ -68,7 +72,9 @@ export default {
               indexTypes,
               customizations,
               structure,
-               connection_status: 'connected',
+               connectionStatus: 'connected',
+               tabs: cachedTabs,
+               selectedTab: cachedTabs.length ? cachedTabs[0].uid : null,
               version
            }
            : workspace);
@@ -79,8 +85,8 @@ export default {
               ...workspace,
               structure: {},
               breadcrumbs: {},
-               loaded_schemas: new Set(),
-               connection_status: 'connecting'
+               loadedSchemas: new Set(),
+               connectionStatus: 'connecting'
            }
            : workspace);
      },
@@ -90,8 +96,8 @@ export default {
               ...workspace,
               structure: {},
               breadcrumbs: {},
-               loaded_schemas: new Set(),
-               connection_status: 'failed'
+               loadedSchemas: new Set(),
+               connectionStatus: 'failed'
            }
            : workspace);
      },
@@ -101,8 +107,8 @@ export default {
               ...workspace,
               structure: {},
               breadcrumbs: {},
-               loaded_schemas: new Set(),
-               connection_status: 'disconnected'
+               loadedSchemas: new Set(),
+               connectionStatus: 'disconnected'
            }
            : workspace);
      },
@@ -174,22 +180,28 @@ export default {
         state.workspaces = state.workspaces.map(workspace => workspace.uid === uid
            ? {
               ...workspace,
-               search_term: term
+               searchTerm: term
            }
            : workspace);
      },
-      NEW_TAB (state, { uid, tab, content, autorun }) {
-         tabIndex[uid] = tabIndex[uid] ? ++tabIndex[uid] : 1;
+      NEW_TAB (state, { uid, tab, content, type, autorun, schema, elementName, elementType }) {
+         if (type === 'query')
+            tabIndex[uid] = tabIndex[uid] ? ++tabIndex[uid] : 1;
+
         const newTab = {
            uid: tab,
-            index: tabIndex[uid],
+            index: type === 'query' ? tabIndex[uid] : null,
            selected: false,
-            type: 'query',
+            type,
+            schema,
+            elementName,
+            elementType,
            fields: [],
            keyUsage: [],
            content: content || '',
            autorun: !!autorun
         };
+
         state.workspaces = state.workspaces.map(workspace => {
            if (workspace.uid === uid) {
               return {
@@ -200,6 +212,8 @@ export default {
            else
               return workspace;
         });
+
+         persistentStore.set(uid, state.workspaces.find(workspace => workspace.uid === uid).tabs);
      },
      REMOVE_TAB (state, { uid, tab: tUid }) {
         state.workspaces = state.workspaces.map(workspace => {
@@ -212,9 +226,77 @@ export default {
            else
               return workspace;
         });
+
+         persistentStore.set(uid, state.workspaces.find(workspace => workspace.uid === uid).tabs);
+      },
+      REMOVE_TABS (state, { uid, schema, elementName, elementType }) { // Multiple tabs based on schema and element name
+         if (elementType === 'procedure') elementType = 'routine'; // TODO: pass directly "routine"
+
+         state.workspaces = state.workspaces.map(workspace => {
+            if (workspace.uid === uid) {
+               return {
+                  ...workspace,
+                  tabs: workspace.tabs.filter(tab =>
+                     tab.schema !== schema ||
+                     tab.elementName !== elementName ||
+                     tab.elementType !== elementType
+                  )
+               };
+            }
+            else
+               return workspace;
+         });
+
+         persistentStore.set(uid, state.workspaces.find(workspace => workspace.uid === uid).tabs);
+      },
+      REPLACE_TAB (state, { uid, tab: tUid, type, schema, content, elementName, elementType }) {
+         state.workspaces = state.workspaces.map(workspace => {
+            if (workspace.uid === uid) {
+               return {
+                  ...workspace,
+                  tabs: workspace.tabs.map(tab => {
+                     if (tab.uid === tUid)
+                        return { ...tab, type, schema, content, elementName, elementType };
+
+                     return tab;
+                  })
+               };
+            }
+            else
+               return workspace;
+         });
+
+         persistentStore.set(uid, state.workspaces.find(workspace => workspace.uid === uid).tabs);
+      },
+      RENAME_TABS (state, { uid, schema, elementName, elementType, elementNewName }) {
+         state.workspaces = state.workspaces.map(workspace => {
+            if (workspace.uid === uid) {
+               return {
+                  ...workspace,
+                  tabs: workspace.tabs.map(tab => {
+                     if (tab.elementName === elementName && tab.schema === schema) {
+                        return {
+                           ...tab,
+                           elementName: elementNewName
+                        };
+                     }
+
+                     return tab;
+                  })
+               };
+            }
+            else
+               return workspace;
+         });
+
+         persistentStore.set(uid, state.workspaces.find(workspace => workspace.uid === uid).tabs);
      },
      SELECT_TAB (state, { uid, tab }) {
-         state.workspaces = state.workspaces.map(workspace => workspace.uid === uid ? { ...workspace, selected_tab: tab } : workspace);
+         state.workspaces = state.workspaces.map(workspace => workspace.uid === uid ? { ...workspace, selectedTab: tab } : workspace);
+      },
+      UPDATE_TABS (state, { uid, tabs }) {
+         state.workspaces = state.workspaces.map(workspace => workspace.uid === uid ? { ...workspace, tabs } : workspace);
+         persistentStore.set(uid, state.workspaces.find(workspace => workspace.uid === uid).tabs);
      },
      SET_TAB_FIELDS (state, { cUid, tUid, fields }) {
         state.workspaces = state.workspaces.map(workspace => {
@@ -232,6 +314,8 @@ export default {
            else
               return workspace;
         });
+
+         persistentStore.set(uid, state.workspaces.find(workspace => workspace.uid === uid).tabs);
      },
      SET_TAB_KEY_USAGE (state, { cUid, tUid, keyUsage }) {
         state.workspaces = state.workspaces.map(workspace => {
@@ -249,20 +333,51 @@ export default {
            else
               return workspace;
         });
+
+         persistentStore.set(uid, state.workspaces.find(workspace => workspace.uid === uid).tabs);
      },
-      SET_UNSAVED_CHANGES (state, val) {
-         state.has_unsaved_changes = !!val;
-      },
-      SET_UNSAVED_DISCARD_MODAL (state, val) {
-         state.is_unsaved_discard_modal = !!val;
-      },
-      SET_PENDING_BREADCRUMBS (state, payload) {
-         state.pending_breadcrumbs = payload;
+      SET_UNSAVED_CHANGES (state, { uid, tUid, isChanged }) {
+         state.workspaces = state.workspaces.map(workspace => {
+            if (workspace.uid === uid) {
+               return {
+                  ...workspace,
+                  tabs: workspace.tabs.map(tab => {
+                     if (tab.uid === tUid)
+                        return { ...tab, isChanged };
+
+                     return tab;
+                  })
+               };
+            }
+            else
+               return workspace;
+         });
      },
      ADD_LOADED_SCHEMA (state, payload) {
         state.workspaces = state.workspaces.map(workspace => {
            if (workspace.uid === payload.uid)
-               workspace.loaded_schemas.add(payload.schema);
+               workspace.loadedSchemas.add(payload.schema);
+            return workspace;
+         });
+      },
+      ADD_LOADING_ELEMENT (state, payload) {
+         state.workspaces = state.workspaces.map(workspace => {
+            if (workspace.uid === payload.uid)
+               workspace.loadingElements.push(payload.element);
+            return workspace;
+         });
+      },
+      REMOVE_LOADING_ELEMENT (state, payload) {
+         state.workspaces = state.workspaces.map(workspace => {
+            if (workspace.uid === payload.uid) {
+               const loadingElements = workspace.loadingElements.filter(el =>
+                  el.schema !== payload.element.schema &&
+                  el.name !== payload.element.name &&
+                  el.type !== payload.element.type
+               );
+
+               workspace = { ...workspace, loadingElements };
+            }
            return workspace;
         });
      }
@@ -271,7 +386,7 @@ export default {
      selectWorkspace ({ commit }, uid) {
         commit('SELECT_WORKSPACE', uid);
      },
-      async connectWorkspace ({ dispatch, commit }, connection) {
+      async connectWorkspace ({ dispatch, commit, getters, rootGetters }, connection) {
         commit('SET_CONNECTING', connection.uid);

         try {
@@ -304,6 +419,7 @@ export default {
               if (status === 'error')
                  dispatch('notifications/addNotification', { status, message: version }, { root: true });

+               // Check if Maria or MySQL
               const isMySQL = version.name.includes('MySQL');

               if (isMySQL && connection.client !== 'mysql') {
@@ -324,7 +440,8 @@ export default {
                  indexTypes,
                  customizations,
                  structure: response,
-                  version
+                  version,
+                  restoreTabs: rootGetters['settings/getRestoreTabs']
               });
               dispatch('refreshCollations', connection.uid);
               dispatch('refreshVariables', connection.uid);
@@ -414,91 +531,192 @@ export default {
         commit('SET_DISCONNECTED', uid);
         commit('SELECT_TAB', { uid, tab: 0 });
      },
-      addWorkspace ({ commit, dispatch, getters }, uid) {
+      addWorkspace ({ commit }, uid) {
         const workspace = {
            uid,
-            connection_status: 'disconnected',
-            selected_tab: 0,
-            search_term: '',
+            connectionStatus: 'disconnected',
+            selectedTab: 0,
+            searchTerm: '',
            tabs: [],
            structure: {},
            variables: [],
            collations: [],
            users: [],
            breadcrumbs: {},
-            loaded_schemas: new Set()
+            loadingElements: [],
+            loadedSchemas: new Set()
         };

         commit('ADD_WORKSPACE', workspace);
-
-         if (getters.getWorkspace(uid).tabs.length < 3)
-            dispatch('newTab', { uid });
-
-         dispatch('setUnsavedChanges', false);
      },
-      changeBreadcrumbs ({ state, commit, getters }, payload) {
-         if (state.has_unsaved_changes) {
-            commit('SET_UNSAVED_DISCARD_MODAL', true);
-            commit('SET_PENDING_BREADCRUMBS', payload);
-            return;
-         }
-
+      changeBreadcrumbs ({ commit, getters }, payload) {
         const breadcrumbsObj = {
            schema: null,
            table: null,
            trigger: null,
+            triggerFunction: null,
            procedure: null,
            function: null,
            scheduler: null,
-            view: null
+            view: null,
+            query: null
         };

-         const hasLastChildren = Object.keys(lastBreadcrumbs).filter(b => b !== 'schema').some(b => lastBreadcrumbs[b]);
-         const hasChildren = Object.keys(payload).filter(b => b !== 'schema').some(b => payload[b]);
-
-         if (lastBreadcrumbs.schema === payload.schema && hasLastChildren && !hasChildren) return;
-
-         if (lastBreadcrumbs.schema !== payload.schema)
-            Schema.useSchema({ uid: getters.getSelected, schema: payload.schema });
-
         commit('CHANGE_BREADCRUMBS', { uid: getters.getSelected, breadcrumbs: { ...breadcrumbsObj, ...payload } });
-         lastBreadcrumbs = { ...breadcrumbsObj, ...payload };
-
-         if (payload.schema)
-            commit('ADD_LOADED_SCHEMA', { uid: getters.getSelected, schema: payload.schema });
+      },
+      addLoadedSchema ({ commit, getters }, schema) {
+         commit('ADD_LOADED_SCHEMA', { uid: getters.getSelected, schema });
+      },
+      addLoadingElement ({ commit, getters }, element) {
+         commit('ADD_LOADING_ELEMENT', { uid: getters.getSelected, element });
+      },
+      removeLoadingElement ({ commit, getters }, element) {
+         commit('REMOVE_LOADING_ELEMENT', { uid: getters.getSelected, element });
      },
      setSearchTerm ({ commit, getters }, term) {
         commit('SET_SEARCH_TERM', { uid: getters.getSelected, term });
      },
-      newTab ({ commit }, { uid, content, autorun }) {
-         const tab = uidGen('T');
+      newTab ({ state, commit }, { uid, content, type, autorun, schema, elementName, elementType }) {
+         let tabUid;
+         const workspaceTabs = state.workspaces.find(workspace => workspace.uid === uid);

-         commit('NEW_TAB', { uid, tab, content, autorun });
-         commit('SELECT_TAB', { uid, tab });
+         switch (type) {
+            case 'new-table':
+            case 'new-trigger':
+            case 'new-trigger-function':
+            case 'new-function':
+            case 'new-routine':
+            case 'new-scheduler':
+               tabUid = uidGen('T');
+               commit('NEW_TAB', {
+                  uid,
+                  tab: tabUid,
+                  content,
+                  type,
+                  autorun,
+                  schema,
+                  elementName,
+                  elementType
+               });
+               break;
+            case 'temp-data':
+            case 'temp-trigger-props':
+            case 'temp-trigger-function-props':
+            case 'temp-function-props':
+            case 'temp-routine-props':
+            case 'temp-scheduler-props': {
+               const existentTab = workspaceTabs
+                  ? workspaceTabs.tabs.find(tab =>
+                     tab.schema === schema &&
+                     tab.elementName === elementName &&
+                     tab.elementType === elementType &&
+                     [type, type.replace('temp-', '')].includes(tab.type))
+                  : false;
+
+               if (existentTab) { // if tab exists
+                  tabUid = existentTab.uid;
+               }
+               else {
+                  const tempTabs = workspaceTabs ? workspaceTabs.tabs.filter(tab => tab.type.includes('temp-')) : false;
+
+                  if (tempTabs && tempTabs.length) { // if temp tab already opened
+                     for (const tab of tempTabs) {
+                        if (tab.isChanged) {
+                           commit('REPLACE_TAB', { // make permanent a temp table with unsaved changes
+                              uid,
+                              tab: tab.uid,
+                              type: tab.type.replace('temp-', ''),
+                              schema: tab.schema,
+                              elementName: tab.elementName,
+                              elementType: tab.elementType
+                           });
+
+                           tabUid = uidGen('T');
+                           commit('NEW_TAB', { uid, tab: tabUid, content, type, autorun, schema, elementName, elementType });
+                        }
+                        else {
+                           commit('REPLACE_TAB', { uid, tab: tab.uid, type, schema, elementName, elementType });
+                           tabUid = tab.uid;
+                        }
+                     }
+                  }
+                  else {
+                     tabUid = uidGen('T');
+                     commit('NEW_TAB', { uid, tab: tabUid, content, type, autorun, schema, elementName, elementType });
+                  }
+               }
+            }
+               break;
+            case 'data':
+            case 'table-props':
+            case 'trigger-props':
+            case 'trigger-function-props':
+            case 'function-props':
+            case 'routine-props':
+            case 'scheduler-props': {
+               const existentTab = workspaceTabs
+                  ? workspaceTabs.tabs.find(tab =>
+                     tab.schema === schema &&
+                     tab.elementName === elementName &&
+                     tab.elementType === elementType &&
+                     [`temp-${type}`, type].includes(tab.type))
+                  : false;
+
+               if (existentTab) {
+                  commit('REPLACE_TAB', { uid, tab: existentTab.uid, type, schema, elementName, elementType });
+                  tabUid = existentTab.uid;
+               }
+               else {
+                  tabUid = uidGen('T');
+                  commit('NEW_TAB', { uid, tab: tabUid, content, type, autorun, schema, elementName, elementType });
+               }
+            }
+               break;
+            default:
+               tabUid = uidGen('T');
+               commit('NEW_TAB', { uid, tab: tabUid, content, type, autorun, schema, elementName, elementType });
+               break;
+         }
+
+         commit('SELECT_TAB', { uid, tab: tabUid });
      },
-      removeTab ({ commit }, payload) {
+      checkSelectedTabExists ({ state, commit }, uid) {
+         const workspace = state.workspaces.find(workspace => workspace.uid === uid);
+         const isSelectedExistent = workspace
+            ? workspace.tabs.some(tab => tab.uid === workspace.selectedTab)
+            : false;
+
+         if (!isSelectedExistent && workspace.tabs.length)
+            commit('SELECT_TAB', { uid, tab: workspace.tabs[workspace.tabs.length - 1].uid });
+      },
+      updateTabContent ({ commit }, { uid, tab, type, schema, content }) {
+         commit('REPLACE_TAB', { uid, tab, type, schema, content });
+      },
+      renameTabs ({ commit }, payload) {
+         commit('RENAME_TABS', payload);
+      },
+      removeTab ({ commit, dispatch }, payload) {
         commit('REMOVE_TAB', payload);
+         dispatch('checkSelectedTabExists', payload.uid);
+      },
+      removeTabs ({ commit, dispatch }, payload) {
+         commit('REMOVE_TABS', payload);
+         dispatch('checkSelectedTabExists', payload.uid);
      },
      selectTab ({ commit }, payload) {
         commit('SELECT_TAB', payload);
      },
+      updateTabs ({ commit }, payload) {
+         commit('UPDATE_TABS', payload);
+      },
      setTabFields ({ commit }, payload) {
         commit('SET_TAB_FIELDS', payload);
      },
      setTabKeyUsage ({ commit }, payload) {
         commit('SET_TAB_KEY_USAGE', payload);
      },
-      setUnsavedChanges ({ commit }, val) {
-         commit('SET_UNSAVED_CHANGES', val);
-      },
-      discardUnsavedChanges ({ state, commit, dispatch }) {
-         dispatch('setUnsavedChanges', false);
-         dispatch('changeBreadcrumbs', state.pending_breadcrumbs);
-         commit('SET_UNSAVED_DISCARD_MODAL', false);
-         commit('SET_PENDING_BREADCRUMBS', {});
-      },
-      closeUnsavedChangesModal ({ commit }) {
-         commit('SET_UNSAVED_DISCARD_MODAL', false);
+      setUnsavedChanges ({ commit }, payload) {
+         commit('SET_UNSAVED_CHANGES', payload);
      }
   }
 };
--- a/src/renderer/store/plugins/ipcExceptions.js
+++ b/src/renderer/store/plugins/ipcExceptions.js
@@ -0,0 +1,7 @@
+import { ipcRenderer } from 'electron';
+
+export default store => {
+   ipcRenderer.on('unhandled-exception', (event, error) => {
+      store.dispatch('notifications/addNotification', { status: 'error', message: error.message });
+   });
+};
Author	SHA1	Message	Date
Fabio Di Stasio	94a53fec6c	chore(release): 0.3.6	2021-09-26 11:39:19 +02:00
Fabio Di Stasio	13aa47cd44	feat: processes list exportation	2021-09-26 11:36:42 +02:00
Fabio Di Stasio	85f625daf7	feat: copy cell/row or kill connections on context menu from processes list	2021-09-26 11:19:48 +02:00
Fabio Di Stasio	7de3bb9346	refactor(core): compatibility with electron/remote 2.x	2021-09-21 11:16:07 +02:00
Fabio Di Stasio	e43a0ba0b4	Merge pull request #102 from Fabio286/dependabot/npm_and_yarn/electron/remote-2.0.1 build(deps): bump @electron/remote from 1.2.2 to 2.0.1	2021-09-21 10:03:35 +02:00
dependabot[bot]	638cd4bfb7	build(deps): bump @electron/remote from 1.2.2 to 2.0.1 Bumps [@electron/remote](https://github.com/electron/remote) from 1.2.2 to 2.0.1. - [Release notes](https://github.com/electron/remote/releases) - [Changelog](https://github.com/electron/remote/blob/main/.releaserc.json) - [Commits](https://github.com/electron/remote/compare/v1.2.2...v2.0.1) --- updated-dependencies: - dependency-name: "@electron/remote" dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2021-09-20 19:06:45 +00:00
Fabio Di Stasio	3959333662	feat: workspace query history	2021-09-17 18:32:28 +02:00
Fabio Di Stasio	abd46aa322	perf(core): better communication of internal exceptions	2021-09-15 15:31:57 +02:00
Fabio Di Stasio	d4888ad8fb	fix: adding a connection default values not change when switching clients, closes #101	2021-09-15 11:08:00 +02:00
Fabio Di Stasio	6bfc229b77	chore(release): 0.3.5	2021-09-13 15:03:02 +02:00
Fabio Di Stasio	d31b051f4b	chore: update dependencies	2021-09-13 15:02:28 +02:00
Fabio Di Stasio	95b60df8fc	fix(MySQL): connections stuck at startup if 5 or more tabs are restored	2021-09-13 10:03:27 +02:00
Fabio Di Stasio	ed5189fdc1	chore(release): 0.3.4	2021-09-12 11:59:01 +02:00
Fabio Di Stasio	265ed66d25	feat: start search when typing with focus on the left bar	2021-09-12 11:55:16 +02:00
Fabio Di Stasio	09c07acd5c	feat: new create trigger function tabs	2021-09-11 10:24:21 +02:00
Fabio Di Stasio	3c5a69adc9	feat: new create scheduler tabs	2021-09-10 18:23:32 +02:00
Fabio Di Stasio	0203f69e95	feat: new create function tabs	2021-09-07 18:20:45 +02:00
Fabio Di Stasio	9a2498862c	Merge pull request #97 from Fabio286/dependabot/npm_and_yarn/electron-14.0.0 build(deps-dev): bump electron from 13.3.0 to 14.0.0	2021-09-07 09:07:29 +02:00
dependabot[bot]	3a26d4f509	build(deps-dev): bump electron from 13.3.0 to 14.0.0 Bumps [electron](https://github.com/electron/electron) from 13.3.0 to 14.0.0. - [Release notes](https://github.com/electron/electron/releases) - [Changelog](https://github.com/electron/electron/blob/main/docs/breaking-changes.md) - [Commits](https://github.com/electron/electron/compare/v13.3.0...v14.0.0) --- updated-dependencies: - dependency-name: electron dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2021-09-06 19:44:11 +00:00
Fabio Di Stasio	ce08cbd8b5	Merge pull request #98 from Fabio286/dependabot/npm_and_yarn/mdi/font-6.1.95 build(deps): bump @mdi/font from 5.9.55 to 6.1.95	2021-09-06 21:41:47 +02:00
dependabot[bot]	d91ffcccca	build(deps): bump @mdi/font from 5.9.55 to 6.1.95 Bumps [@mdi/font](https://github.com/Templarian/MaterialDesign-Webfont) from 5.9.55 to 6.1.95. - [Release notes](https://github.com/Templarian/MaterialDesign-Webfont/releases) - [Commits](https://github.com/Templarian/MaterialDesign-Webfont/compare/v5.9.55...v6.1.95) --- updated-dependencies: - dependency-name: "@mdi/font" dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2021-09-06 19:06:42 +00:00
Fabio Di Stasio	6115eb9409	refactor: improvements in explorebar events on tables	2021-09-06 18:02:54 +02:00
Fabio Di Stasio	3fd26a0523	feat: new create routine tabs	2021-09-06 17:29:34 +02:00
Fabio Di Stasio	e217d5181b	feat: new create trigger tabs	2021-09-02 18:08:23 +02:00
Fabio Di Stasio	dcf368b350	chore: update dependencies	2021-09-01 18:17:11 +02:00
Fabio Di Stasio	21e3e79ddf	fix(UI): context menu of tables cut if close to bottom edge	2021-08-31 19:58:20 +02:00
Fabio Di Stasio	2918c3cb92	chore(release): 0.3.3	2021-08-22 10:41:48 +02:00
Fabio Di Stasio	3ad190b18c	Merge branch 'master' of https://github.com/Fabio286/antares	2021-08-22 10:37:27 +02:00
Fabio Di Stasio	d5b2bde2ea	fix(UI): no round borders on left of file upload inputs	2021-08-22 10:37:23 +02:00
fabio286	a42348ef5c	chore: deletion of wrong file name case component	2021-08-20 13:42:29 +02:00
Fabio Di Stasio	8b93c49778	feat: new create view tabs	2021-08-18 17:28:41 +02:00
Fabio Di Stasio	0842e00098	feat: new table empty state	2021-08-17 18:54:23 +02:00
Fabio Di Stasio	6cef02bebb	Merge pull request #93 from Fabio286/dependabot/npm_and_yarn/marked-3.0.0 build(deps): bump marked from 2.1.3 to 3.0.0	2021-08-17 12:04:22 +02:00
dependabot[bot]	334c7a31d2	build(deps): bump marked from 2.1.3 to 3.0.0 Bumps [marked](https://github.com/markedjs/marked) from 2.1.3 to 3.0.0. - [Release notes](https://github.com/markedjs/marked/releases) - [Changelog](https://github.com/markedjs/marked/blob/master/release.config.js) - [Commits](https://github.com/markedjs/marked/compare/v2.1.3...v3.0.0) --- updated-dependencies: - dependency-name: marked dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2021-08-16 19:05:09 +00:00
Fabio Di Stasio	bc82289d54	perf(UI): visual improvements of tables	2021-08-16 19:44:55 +02:00
Fabio Di Stasio	c9fa941578	feat: new create table tabs	2021-08-13 16:50:59 +02:00
Fabio Di Stasio	4048df3c7b	fix(MySQL): editing a view causes error for missing database in some conditions	2021-08-12 10:29:13 +02:00
Fabio Di Stasio	198368605b	perf(UI): improved view setting tab	2021-08-12 10:07:31 +02:00
Fabio Di Stasio	8f0ac26b69	refactor: better component names	2021-08-12 09:54:13 +02:00
Fabio Di Stasio	b35fc5b78b	fix(UI): multiple temp tabs opened switching to tables from other elements	2021-08-11 18:04:14 +02:00
Fabio Di Stasio	622b519cbb	fix: table options not loaded on restored setting tabs at startup	2021-08-11 16:16:58 +02:00
Fabio Di Stasio	71e2c911ae	perf(UI): element options in setting tabs accessible directly	2021-08-10 18:12:13 +02:00
Fabio Di Stasio	756d49b259	perf(UI): primary app color on selected text backgrouns	2021-08-10 13:14:48 +02:00
Fabio Di Stasio	14c64c537c	chore(release): 0.3.2	2021-08-06 14:44:45 +02:00
Fabio Di Stasio	97b3563e25	chore: update dependencies	2021-08-06 14:38:25 +02:00
Fabio Di Stasio	e834fe31ac	feat(UI): automatic scroll on selected tab	2021-08-05 13:44:48 +02:00
Fabio Di Stasio	065de3a0a2	feat(UI): query tab name based on content	2021-08-05 13:30:33 +02:00
Fabio Di Stasio	1573de5b1f	feat(UI): button to clear sidebar search input	2021-08-05 12:47:24 +02:00
Fabio Di Stasio	04fc1bbee0	feat(UI): automatic scroll to selected tab element in left bar	2021-08-05 12:09:54 +02:00
Fabio Di Stasio	dea378014d	perf: approximate table total updated on table refresh	2021-08-04 15:52:26 +02:00
Fabio Di Stasio	3abff36136	feat: contextual menu option to duplicate table fields	2021-08-04 09:59:50 +02:00
Fabio Di Stasio	70354aa828	feat(UI): shortcuts info on empty query tab	2021-08-03 17:59:15 +02:00
Fabio Di Stasio	372049ae64	perf(UI): loading animation on tables and table context menu improvements	2021-08-03 15:43:13 +02:00
Fabio Di Stasio	5d271be062	chore: update README.md	2021-08-02 19:26:56 +02:00
Fabio Di Stasio	07ee1ae828	fix: tab selected when clicking closing cross	2021-07-29 16:45:28 +02:00
Fabio Di Stasio	cbe0e2980a	perf: update italian translation	2021-07-27 17:31:51 +02:00
Fabio Di Stasio	0fba50c6ec	chore: update README.md	2021-07-27 17:18:11 +02:00
Fabio Di Stasio	420255cdd4	chore(release): 0.3.1	2021-07-27 10:27:02 +02:00
Fabio Di Stasio	a8a47ed5f7	fix(UI): tabs or explorebar elements selected with mouse wheel or right button	2021-07-23 22:41:53 +02:00
Fabio Di Stasio	425f0663f9	chore(release): 0.3.0	2021-07-23 17:38:31 +02:00
Fabio Di Stasio	e106d100b5	refactor: mousedown instead click on tabs and explorebar elements	2021-07-23 15:45:06 +02:00
Fabio Di Stasio	d7fdf53932	fix: wrong editor height with some conditions	2021-07-23 10:56:41 +02:00
Fabio Di Stasio	62f7e57d0c	fix: manual page input not disabled when only one page is available	2021-07-23 09:01:50 +02:00
Fabio Di Stasio	14577d14bb	fix: sort order of tables is lost switching pages	2021-07-22 18:22:47 +02:00
fabio286	f5f2a697e8	ci: update snap store config	2021-07-22 17:30:07 +02:00
Fabio Di Stasio	a0105cf1c3	fix(UI): not disabled buttons during save table setting tabs	2021-07-22 13:13:26 +02:00
Fabio Di Stasio	77c5d28032	fix: new field default value unknown instead 'noval'	2021-07-22 13:06:54 +02:00
Fabio Di Stasio	d1d8592f79	build: downgrade to ss2-promise 0.2.0 due build problems	2021-07-22 11:34:21 +02:00
Fabio Di Stasio	1f828f69a0	Merge pull request #87 from Fabio286/new-tab-system New tab system	2021-07-22 10:57:43 +02:00
Fabio Di Stasio	adc5477673	feat: option to restore session on startup	2021-07-22 10:41:06 +02:00
Fabio Di Stasio	1e543aa6b0	fix: reload twice after element rename	2021-07-21 18:50:22 +02:00
Fabio Di Stasio	c41e059b0b	fix: wrong loaded schema change	2021-07-21 17:56:55 +02:00
Fabio Di Stasio	e6ef5ffa56	refactor: improved the way how schema is passed to client classes	2021-07-21 14:40:29 +02:00
Fabio Di Stasio	d67d122270	Merge branch 'master' of https://github.com/Fabio286/antares into new-tab-system	2021-07-21 09:11:06 +02:00
Fabio Di Stasio	b837e2fc68	Merge pull request #86 from Fabio286/dependabot/npm_and_yarn/ssh2-promise-1.0.0 build(deps): bump ssh2-promise from 0.1.9 to 1.0.0	2021-07-21 09:10:35 +02:00
Fabio Di Stasio	a73a2f483e	feat: option to select schema in query tabs	2021-07-20 19:19:54 +02:00
Fabio Di Stasio	0a9983d30d	feat: new function, procedure and scheduler tabs	2021-07-20 16:59:59 +02:00
Fabio Di Stasio	58b91ebfe0	feat: new trigger function tabs	2021-07-19 22:38:56 +02:00
Fabio Di Stasio	e78ca2417e	fix(UI): multiple trigger tabs open on single click on explore bar	2021-07-19 11:28:11 +02:00
Fabio Di Stasio	e1855a262d	feat(UI): empty workspace view	2021-07-18 16:10:36 +02:00
Fabio Di Stasio	6b725b1d40	fix: issues with trigger temp tabs	2021-07-17 16:09:57 +02:00
Fabio Di Stasio	f6faad98f8	feat: new trigger setting tabs	2021-07-17 13:10:54 +02:00
Fabio Di Stasio	320aa8ba04	feat: close tabs if element deleted	2021-07-17 10:46:24 +02:00
Fabio Di Stasio	9f0280b991	Merge branch 'master' of https://github.com/Fabio286/antares into new-tab-system	2021-07-17 10:00:46 +02:00
Fabio Di Stasio	04fa320820	fix: clear empty indexes and foreign keys on confirm respective modals	2021-07-17 09:59:45 +02:00
Fabio Di Stasio	f7c3aa883d	fix: tab won't open after table or view creation	2021-07-17 09:57:49 +02:00
Fabio Di Stasio	f7a74df009	feat: new unsaved change reminder	2021-07-16 23:24:55 +02:00
Fabio Di Stasio	003c02b1fb	feat: new view setting tabs	2021-07-16 18:52:18 +02:00
Fabio Di Stasio	ef21ea7448	feat: rename tabs if element is renamed	2021-07-16 17:27:37 +02:00
Fabio Di Stasio	525c964c62	fix: enabled copy context on non editable rows	2021-07-16 17:09:02 +02:00
Fabio Di Stasio	7845e3e501	feat(UI): new table settings tabs	2021-07-15 19:51:18 +02:00
Fabio Di Stasio	0c29e0d566	perf(UI): improvements in setting bar connections sort	2021-07-15 18:31:44 +02:00
Fabio Di Stasio	d38097d056	feat(UI): sortable tabs	2021-07-14 20:30:54 +02:00
Fabio Di Stasio	c87b8dc738	refactor: passing schema from table context options	2021-07-14 18:15:13 +02:00
Fabio Di Stasio	ed6e7fa72d	refactor(UI): improved breadcrumbs and tabs	2021-07-14 16:10:34 +02:00
Fabio Di Stasio	f0fa7c81b7	fix(UI): table icon in view data tabs	2021-07-14 12:33:26 +02:00
Fabio Di Stasio	5bb4e496f2	feat(MySQL): improved schema detection for queries	2021-07-14 12:31:37 +02:00
Fabio Di Stasio	01057332b0	feat(UI): display schema in data tabs	2021-07-14 12:31:12 +02:00
Fabio Di Stasio	ab382dfbcd	feat: new data tabs	2021-07-13 19:23:02 +02:00
Fabio Di Stasio	88c4cdc8e2	feat(UI): close temp data tabs	2021-07-13 16:53:47 +02:00
Fabio Di Stasio	15ff211a41	Merge branch 'master' of https://github.com/Fabio286/antares into new-tab-system	2021-07-13 09:19:26 +02:00
Fabio Di Stasio	5c855a520a	fix: solved a vulnerability in table names	2021-07-13 09:17:22 +02:00
Fabio Di Stasio	7488bc7a17	refactor(core): better way to obtain schema	2021-07-13 09:09:25 +02:00
dependabot[bot]	fd85cf43a2	build(deps): bump ssh2-promise from 0.1.9 to 1.0.0 Bumps [ssh2-promise](https://github.com/sanketbajoria/ssh2-promise) from 0.1.9 to 1.0.0. - [Release notes](https://github.com/sanketbajoria/ssh2-promise/releases) - [Commits](https://github.com/sanketbajoria/ssh2-promise/commits/1.0.0) --- updated-dependencies: - dependency-name: ssh2-promise dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2021-07-12 19:05:27 +00:00
Fabio Di Stasio	a87079cd17	feat(UI): temporary table data tabs	2021-07-12 19:18:29 +02:00