diff --git a/docs/todo.txt b/docs/todo.txt
index 266e6aff0de7c9dc4ba114122ffa880ee576464d..54ea2f783d1aab512b813b6d9fb8535c8ced2e01 100644
--- a/docs/todo.txt
+++ b/docs/todo.txt
@@ -18,4 +18,5 @@ scripts refactoring
 Plugin:
 Customize resource roots
 Disable Quick Access toolbar
-column variable in template
\ No newline at end of file
+column variable in template
+DB compare output file
\ No newline at end of file
diff --git a/plugins/org.jkiss.dbeaver.core/icons/progress_view.png b/plugins/org.jkiss.dbeaver.core.application/icons/progress_view.png
similarity index 100%
rename from plugins/org.jkiss.dbeaver.core/icons/progress_view.png
rename to plugins/org.jkiss.dbeaver.core.application/icons/progress_view.png
diff --git a/plugins/org.jkiss.dbeaver.core/icons/templates_view.png b/plugins/org.jkiss.dbeaver.core.application/icons/templates_view.png
similarity index 100%
rename from plugins/org.jkiss.dbeaver.core/icons/templates_view.png
rename to plugins/org.jkiss.dbeaver.core.application/icons/templates_view.png
diff --git a/plugins/org.jkiss.dbeaver.core.application/plugin.properties b/plugins/org.jkiss.dbeaver.core.application/plugin.properties
index 0f1455dd635744894af0c2b2581ad7f1e2f0b2d8..28443314106644078e58983ed7ba2f87e6a3d514 100644
--- a/plugins/org.jkiss.dbeaver.core.application/plugin.properties
+++ b/plugins/org.jkiss.dbeaver.core.application/plugin.properties
@@ -23,6 +23,9 @@ productWebsite=http://dbeaver.jkiss.org/
 productEmail=serge@jkiss.org
 productIcon=icons/dbeaver.png
 
+view.progress.title=Background Tasks
+view.templates.title=Templates
+
 menu.edit=Edit
 menu.navigate=Navigate
 
diff --git a/plugins/org.jkiss.dbeaver.core.application/plugin.xml b/plugins/org.jkiss.dbeaver.core.application/plugin.xml
index 133b4f5db889e8684a2531e3f6f22ae8ebdbfef1..00a4c9986adad8d860fa43adf98ad67d8cb22200 100644
--- a/plugins/org.jkiss.dbeaver.core.application/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.core.application/plugin.xml
@@ -32,6 +32,20 @@
         </application>
     </extension>
 
+    <extension point="org.eclipse.ui.views">
+        <view id="org.eclipse.ui.views.ProgressView"
+                icon="icons/progress_view.png"
+                category="org.eclipse.ui"
+                class="org.eclipse.ui.ExtensionFactory:progressView"
+                name="%view.progress.title"/>
+
+        <view id="org.eclipse.ui.texteditor.TemplatesView"
+              name="%view.templates.title"
+              icon="icons/templates_view.png"
+              category="org.eclipse.ui"
+              class="org.eclipse.ui.texteditor.templates.TemplatesView"/>
+    </extension>
+
     <extension point="org.eclipse.ui.menus">
         <!-- Edit menu -->
         <menuContribution allPopups="false" locationURI="menu:edit">
diff --git a/plugins/org.jkiss.dbeaver.core.application/plugin_ru.properties b/plugins/org.jkiss.dbeaver.core.application/plugin_ru.properties
index e15877f67f1924b5e6154862d4944a5799ebb9ae..4e107ff7243a81b907814472e74553f42b963a00 100644
--- a/plugins/org.jkiss.dbeaver.core.application/plugin_ru.properties
+++ b/plugins/org.jkiss.dbeaver.core.application/plugin_ru.properties
@@ -26,6 +26,9 @@ productIcon=icons/dbeaver.png
 menu.edit=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435
 menu.navigate=\u041D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044F
 
+view.progress.title=\u0424\u043E\u043D\u043E\u0432\u044B\u0435 \u0437\u0430\u0434\u0430\u0447\u0438
+view.templates.title=\u0428\u0430\u0431\u043B\u043E\u043D\u044B
+
 pref.page.name.db.configuration=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F
 pref.page.name.data.formats=\u0424\u043E\u0440\u043C\u0430\u0442\u044B \u0434\u0430\u043D\u043D\u044B\u0445
 pref.page.name.query.manager=\u041C\u0435\u043D\u0435\u0434\u0436\u0435\u0440 \u0437\u0430\u043F\u0440\u043E\u0441\u043E\u0432
diff --git a/plugins/org.jkiss.dbeaver.core/plugin.properties b/plugins/org.jkiss.dbeaver.core/plugin.properties
index 977d431b92ddc9a9e1eed6d1e50f07e2bcb2f250..87137643824dd9d47c97bc18e09846744431bdf8 100644
--- a/plugins/org.jkiss.dbeaver.core/plugin.properties
+++ b/plugins/org.jkiss.dbeaver.core/plugin.properties
@@ -19,9 +19,7 @@ view.database.navigator.title=Database Navigator
 view.project.navigator.title=Projects
 view.project.explorer.title=Project Explorer
 view.query.manager.title=Query Manager
-view.progress.title=Background Tasks
 view.shell.process.title=Process
-view.templates.title=Templates
 
 menu.navigate=Navigate
 
diff --git a/plugins/org.jkiss.dbeaver.core/plugin.xml b/plugins/org.jkiss.dbeaver.core/plugin.xml
index 64b28a61e7435c7746f13f2150580d67ccffa4d4..0b59d19552538b4c37edb3aeaf3c6a7bc4152f51 100644
--- a/plugins/org.jkiss.dbeaver.core/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.core/plugin.xml
@@ -47,7 +47,6 @@
             describer="org.jkiss.dbeaver.model.impl.resources.bookmarks.BookmarkContentTypeDescriber"/>
     </extension>
 
-
     <extension point="org.eclipse.core.expressions.propertyTesters">
         <propertyTester
                 class="org.jkiss.dbeaver.ui.actions.GlobalPropertyTester"
@@ -109,8 +108,8 @@
                 namespace="org.jkiss.dbeaver.runtime.process"
                 properties="running"
                 type="org.jkiss.dbeaver.model.runtime.DBRProcessController"/>
-
     </extension>
+
     <extension point="org.eclipse.ui.views">
         <category id="org.jkiss.dbeaver.core.category" name="DBeaver Core View Category"/>
         <view
@@ -149,18 +148,6 @@
                 restorable="false"
                 icon="icons/misc/shell.png"
                 name="%view.shell.process.title"/>
-        <view
-                icon="icons/progress_view.png"
-                category="org.eclipse.ui"
-                class="org.eclipse.ui.ExtensionFactory:progressView"
-                id="org.eclipse.ui.views.ProgressView"
-                name="%view.progress.title"/>
-
-        <view id="org.eclipse.ui.texteditor.TemplatesView"
-                name="%view.templates.title"
-                icon="icons/templates_view.png"
-                category="org.eclipse.ui"
-                class="org.eclipse.ui.texteditor.templates.TemplatesView"/>
     </extension>
 
     <extension point="org.eclipse.ui.commands">
@@ -325,6 +312,11 @@
                 <equals value="org.jkiss.dbeaver.ui.sqlEditorBase"/>
             </with>
         </definition>
+        <definition id="DBeaverPerspectiveActive">
+            <with variable="activeWorkbenchWindow.activePerspective">
+                <equals value="org.jkiss.dbeaver.core.perspective"/>
+            </with>
+        </definition>
     </extension>
 
     <extension point="org.eclipse.ui.handlers">
@@ -1053,6 +1045,8 @@
         <!-- Database menu -->
         <menuContribution allPopups="false" locationURI="menu:org.eclipse.ui.main.menu?before=window">
             <menu id="dataSourceMenu" label="%menu.database">
+                <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
+
                 <separator name="driverGroup" visible="true"/>
                 <command commandId="org.jkiss.dbeaver.core.driver.manager"/>
                 <command commandId="org.jkiss.dbeaver.core.new.connection"/>
@@ -1077,21 +1071,41 @@
         <!-- Database toolbar -->
         <menuContribution allPopups="false" locationURI="toolbar:org.eclipse.ui.main.toolbar">
             <toolbar id="database" label="Database Toolbar">
-                <command commandId="org.jkiss.dbeaver.core.connect"/>
-                <command commandId="org.jkiss.dbeaver.core.invalidate"/>
-                <command commandId="org.jkiss.dbeaver.core.disconnect"/>
+                <command commandId="org.jkiss.dbeaver.core.connect">
+                    <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
+                </command>
+                <command commandId="org.jkiss.dbeaver.core.invalidate">
+                    <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
+                </command>
+                <command commandId="org.jkiss.dbeaver.core.disconnect">
+                    <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
+                </command>
                 <separator name="tools" visible="true"/>
-                <command commandId="org.jkiss.dbeaver.core.sql.editor.open"/>
-                <command commandId="org.jkiss.dbeaver.core.sql.editor.create"/>
-                <command commandId="org.jkiss.dbeaver.core.object.find"/>
+                <command commandId="org.jkiss.dbeaver.core.sql.editor.open">
+                    <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
+                </command>
+                <command commandId="org.jkiss.dbeaver.core.sql.editor.create">
+                    <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
+                </command>
+                <command commandId="org.jkiss.dbeaver.core.object.find">
+                    <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
+                </command>
             </toolbar>
             <toolbar id="txn" label="Transactions">
-                <command commandId="org.jkiss.dbeaver.core.commit"/>
-                <command commandId="org.jkiss.dbeaver.core.rollback"/>
-                <command commandId="org.jkiss.dbeaver.core.txn.autocommit" icon="icons/sql/txn_auto.png" style="pulldown" id="org.jkiss.dbeaver.core.menu.txn"/>
+                <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
+                <command commandId="org.jkiss.dbeaver.core.commit">
+                    <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
+                </command>
+                <command commandId="org.jkiss.dbeaver.core.rollback">
+                    <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
+                </command>
+                <command commandId="org.jkiss.dbeaver.core.txn.autocommit" icon="icons/sql/txn_auto.png" style="pulldown" id="org.jkiss.dbeaver.core.menu.txn">
+                    <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
+                </command>
             </toolbar>
             <toolbar id="datasource-settings" label="DataSource">
                 <control class="org.jkiss.dbeaver.ui.perspective.DataSourceManagementToolbar$ToolbarContribution">
+                    <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
                 </control>
             </toolbar>
 
@@ -1285,6 +1299,7 @@
         <!-- SQL editor menu -->
         <menuContribution allPopups="false" locationURI="menu:org.eclipse.ui.main.menu?after=additions">
             <menu id="SQLEditorMenu" label="%menu.sqleditor">
+                <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
                 <command commandId="org.jkiss.dbeaver.core.sql.editor.open"/>
                 <command commandId="org.jkiss.dbeaver.core.sql.editor.create"/>
                 <separator name="execute" visible="true"/>
diff --git a/plugins/org.jkiss.dbeaver.core/plugin_ru.properties b/plugins/org.jkiss.dbeaver.core/plugin_ru.properties
index 5c88d594b93f5718452c726ae9abe70665df37a3..4053e914424073c309742bb4aadacf2cfa68911e 100644
--- a/plugins/org.jkiss.dbeaver.core/plugin_ru.properties
+++ b/plugins/org.jkiss.dbeaver.core/plugin_ru.properties
@@ -27,9 +27,7 @@ view.database.navigator.title=\u0411\u0430\u0437\u044B \u0434\u0430\u043D\u043D\
 view.project.navigator.title=\u041F\u0440\u043E\u0435\u043A\u0442\u044B
 view.project.explorer.title=\u0410\u043A\u0442\u0438\u0432\u043D\u044B\u0439 \u043F\u0440\u043E\u0435\u043A\u0442
 view.query.manager.title=\u041C\u0435\u043D\u0435\u0434\u0436\u0435\u0440 \u0437\u0430\u043F\u0440\u043E\u0441\u043E\u0432
-view.progress.title=\u0424\u043E\u043D\u043E\u0432\u044B\u0435 \u0437\u0430\u0434\u0430\u0447\u0438
 view.shell.process.title=\u041F\u0440\u043E\u0446\u0435\u0441\u0441
-view.templates.title=\u0428\u0430\u0431\u043B\u043E\u043D\u044B
 
 menu.navigate=\u041D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044F
 
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/UIUtils.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/UIUtils.java
index 9af1f4538fa09cdcf9c9bc581e523895e54cf52d..dd0d40b58aff4ef7255f16e17ef652e155b855ad 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/UIUtils.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/UIUtils.java
@@ -1011,7 +1011,8 @@ public class UIUtils {
     public static void updateMainWindowTitle(IWorkbenchWindow window)
     {
         IProject activeProject = DBeaverCore.getInstance().getProjectRegistry().getActiveProject();
-        String title = Platform.getProduct().getName();
+        IProduct product = Platform.getProduct();
+        String title = product == null ? "Unknown" : product.getName(); //$NON-NLS-1$
         if (activeProject != null) {
             title += " - " + activeProject.getName(); //$NON-NLS-1$
         }
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/perspective/DBeaverPerspective.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/perspective/DBeaverPerspective.java
index d2f1e9fec48d7f2d3ed53f13d92aecca978ef912..7db338acf55ebbae2c06f5797c1b6150c6110372 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/perspective/DBeaverPerspective.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/perspective/DBeaverPerspective.java
@@ -52,7 +52,7 @@ public class DBeaverPerspective implements IPerspectiveFactory
             editorArea);
         treeFolder.addView(DatabaseNavigatorView.VIEW_ID);
         treeFolder.addView(ProjectNavigatorView.VIEW_ID);
-        treeFolder.addView(TemplatesView.ID);
+        treeFolder.addPlaceholder(TemplatesView.ID);
 
         // Right
         IPlaceholderFolderLayout right = layout.createPlaceholderFolder(