diff --git a/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls b/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls
index b0efafba55..0c2ab0ff49 100644
--- a/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls
+++ b/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls
@@ -75,6 +75,16 @@ type WebServiceConfig {
     bundleVersion: String!
 }
 
+type ProductInfo {
+    id: ID!
+    version: String!
+    name: String!
+    description: String
+    buildTime: String!
+    releaseTime: String!
+    licenseInfo: String
+}
+
 type ServerConfig {
     name: String!
     version: String!
@@ -100,6 +110,7 @@ type ServerConfig {
     supportedLanguages: [ ServerLanguage! ]!
     services: [ WebServiceConfig ]
     productConfiguration: Object!
+    productInfo: ProductInfo!
     defaultNavigatorSettings: NavigatorSettings!
 }
 
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebProductInfo.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebProductInfo.java
new file mode 100644
index 0000000000..1121b7c81b
--- /dev/null
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebProductInfo.java
@@ -0,0 +1,76 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2021 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model;
+
+import io.cloudbeaver.server.CBApplication;
+import org.eclipse.core.runtime.Platform;
+import org.jkiss.dbeaver.model.meta.Property;
+import org.jkiss.dbeaver.utils.GeneralUtils;
+import org.jkiss.utils.CommonUtils;
+
+import java.text.DateFormat;
+import java.util.Date;
+
+/**
+ * Web server configuration
+ */
+public class WebProductInfo {
+
+    public WebProductInfo() {
+
+    }
+
+    @Property
+    public String getId() {
+        return CommonUtils.notEmpty(Platform.getProduct().getId());
+    }
+
+    @Property
+    public String getVersion() {
+        return GeneralUtils.getProductVersion().toString();
+    }
+
+    @Property
+    public String getName() {
+        return CommonUtils.notEmpty(Platform.getProduct().getName());
+    }
+
+    @Property
+    public String getDescription() {
+        return CommonUtils.notEmpty(Platform.getProduct().getDescription());
+    }
+
+    @Property
+    public String getBuildTime() {
+        Date buildTime = GeneralUtils.getProductBuildTime();
+        if (buildTime == null) {
+            buildTime = new Date();
+        }
+        return DateFormat.getDateInstance(DateFormat.LONG).format(buildTime);
+    }
+
+    @Property
+    public String getReleaseTime() {
+        return DateFormat.getDateInstance(DateFormat.LONG).format(GeneralUtils.getProductReleaseDate());
+    }
+
+    @Property
+    public String getLicenseInfo() {
+        return CBApplication.getInstance().getInfoDetails();
+    }
+
+}
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebServerConfig.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebServerConfig.java
index 0976101877..2e8d055377 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebServerConfig.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebServerConfig.java
@@ -146,4 +146,9 @@ public class WebServerConfig {
         return application.getAppConfiguration().getDefaultNavigatorSettings();
     }
 
+    @Property
+    public WebProductInfo getProductInfo() {
+        return new WebProductInfo();
+    }
+
 }
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java
index 71d9ead53c..8e910da128 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java
@@ -465,7 +465,7 @@ public class CBApplication extends BaseApplicationImpl {
 
     @Override
     public String getInfoDetails() {
-        return serverName;
+        return "";
     }
 
     @Override
diff --git a/webapp/packages/core-app/src/NavigationTree/ElementsTree.tsx b/webapp/packages/core-app/src/NavigationTree/ElementsTree.tsx
index 92d2cb6cea..8591e26aa2 100644
--- a/webapp/packages/core-app/src/NavigationTree/ElementsTree.tsx
+++ b/webapp/packages/core-app/src/NavigationTree/ElementsTree.tsx
@@ -6,15 +6,12 @@
  * you may not use this file except in compliance with the License.
  */
 
-import { computed } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import { useMemo } from 'react';
 import styled, { css } from 'reshadow';
 
 import { Loader } from '@cloudbeaver/core-blocks';
-import { useService } from '@cloudbeaver/core-di';
 
-import { CoreSettingsService } from '../CoreSettingsService';
 import type { NavNode } from '../shared/NodesManager/EntityTypes';
 import { useChildren } from '../shared/useChildren';
 import { NavigationNodeElement } from './NavigationTreeNode/NavigationNodeElement';
@@ -42,7 +39,7 @@ interface Props {
   emptyPlaceholder: React.FC;
   className?: string;
   onOpen?: (node: NavNode) => Promise<void> | void;
-  onSelect?: (node: NavNode, multiple: boolean) => boolean;
+  onSelect?: (node: NavNode, multiple: boolean) => void;
   isSelected?: (node: NavNode) => boolean;
 }
 
@@ -55,10 +52,8 @@ export const ElementsTree: React.FC<Props> = observer(function ElementsTree({
   onSelect,
   isSelected,
 }) {
-  const config = useService(CoreSettingsService);
   const nodeChildren = useChildren(root);
   const Placeholder = emptyPlaceholder;
-  const limit = useMemo(() => computed(() => config.settings.getValue('app.navigationTree.childrenLimit')), [config]);
 
   const context = useMemo<ITreeContext>(
     () => ({ control, onOpen, onSelect, isSelected }),
@@ -80,7 +75,7 @@ export const ElementsTree: React.FC<Props> = observer(function ElementsTree({
   return styled(styles)(
     <TreeContext.Provider value={context}>
       <tree as="div" className={className}>
-        {nodeChildren.children.slice(0, limit.get()).map(id => (
+        {nodeChildren.children.map(id => (
           <NavigationNodeElement key={id} nodeId={id} />
         ))}
         <Loader loading={nodeChildren.isLoading()} overlay />
diff --git a/webapp/packages/core-app/src/NavigationTree/NavigationTreeContextMenuService.ts b/webapp/packages/core-app/src/NavigationTree/NavigationTreeContextMenuService.ts
index 6e82e7f876..1357a6ecd3 100644
--- a/webapp/packages/core-app/src/NavigationTree/NavigationTreeContextMenuService.ts
+++ b/webapp/packages/core-app/src/NavigationTree/NavigationTreeContextMenuService.ts
@@ -29,11 +29,11 @@ export class NavigationTreeContextMenuService {
     private connectionInfoResource: ConnectionInfoResource
   ) { }
 
-  getMenuToken() {
+  getMenuToken(): string {
     return NavigationTreeContextMenuService.menuToken;
   }
 
-  getNodeViewMenuItemToken() {
+  getNodeViewMenuItemToken(): string {
     return NavigationTreeContextMenuService.nodeViewMenuItemToken;
   }
 
diff --git a/webapp/packages/core-app/src/NavigationTree/NavigationTreeNode/NavigationNode/NavigationNodeNested.tsx b/webapp/packages/core-app/src/NavigationTree/NavigationTreeNode/NavigationNode/NavigationNodeNested.tsx
index 3b469ca521..24ae84d5e9 100644
--- a/webapp/packages/core-app/src/NavigationTree/NavigationTreeNode/NavigationNode/NavigationNodeNested.tsx
+++ b/webapp/packages/core-app/src/NavigationTree/NavigationTreeNode/NavigationNode/NavigationNodeNested.tsx
@@ -6,16 +6,13 @@
  * you may not use this file except in compliance with the License.
  */
 
-import { computed } from 'mobx';
 import { observer } from 'mobx-react-lite';
-import { useContext, useMemo } from 'react';
+import { useContext } from 'react';
 import styled from 'reshadow';
 
 import { TreeNodeContext, TreeNodeNested, TREE_NODE_STYLES } from '@cloudbeaver/core-blocks';
-import { useService } from '@cloudbeaver/core-di';
 import { useStyles } from '@cloudbeaver/core-theming';
 
-import { CoreSettingsService } from '../../../CoreSettingsService';
 import { useChildren } from '../../../shared/useChildren';
 
 interface Props {
@@ -29,11 +26,9 @@ export const NavigationNodeNested: React.FC<Props> = observer(function Navigatio
   nodeId,
   component,
 }) {
-  const config = useService(CoreSettingsService);
   const styles = useStyles(TREE_NODE_STYLES);
   const context = useContext(TreeNodeContext);
   const children = useChildren(nodeId);
-  const limit = useMemo(() => computed(() => config.settings.getValue('app.navigationTree.childrenLimit')), [config]);
 
   if (!children.children || !context?.expanded) {
     return null;
@@ -43,7 +38,7 @@ export const NavigationNodeNested: React.FC<Props> = observer(function Navigatio
 
   return styled(styles)(
     <TreeNodeNested>
-      {children.children.slice(0, limit.get()).map(child => <NavigationNode key={child} nodeId={child} />)}
+      {children.children.map(child => <NavigationNode key={child} nodeId={child} />)}
     </TreeNodeNested>
   );
 });
diff --git a/webapp/packages/core-app/src/NavigationTree/NavigationTreeNode/useNavigationNode.ts b/webapp/packages/core-app/src/NavigationTree/NavigationTreeNode/useNavigationNode.ts
index 80d5e4bf48..c3f442d4d4 100644
--- a/webapp/packages/core-app/src/NavigationTree/NavigationTreeNode/useNavigationNode.ts
+++ b/webapp/packages/core-app/src/NavigationTree/NavigationTreeNode/useNavigationNode.ts
@@ -27,18 +27,18 @@ interface INavigationNode {
   leaf: boolean;
   handleExpand: () => void;
   handleOpen: () => void;
-  handleSelect: (isMultiple?: boolean) => boolean;
+  handleSelect: (isMultiple?: boolean) => void;
 }
 
 export function useNavigationNode(node: NavNode): INavigationNode {
   const context = useContext(TreeContext);
   const navigationTreeService = useService(NavigationTreeService);
   const [processing, setProcessing] = useState(false);
-  const [isExpanded, switchExpand] = useState(false);
   const { isLoading, isOutdated } = useNode(node.id);
   const children = useChildren(node.id);
   const loading = isLoading() || children.isLoading() || processing;
 
+  const isExpanded = navigationTreeService.isNodeExpanded(node.id);
   let leaf = isLeaf(node) || (children.children?.length === 0 && !children.isOutdated());
   let expanded = isExpanded && !leaf;
 
@@ -60,11 +60,11 @@ export function useNavigationNode(node: NavNode): INavigationNode {
       clearTimeout(timeout);
       setProcessing(false);
       if (!state) {
-        switchExpand(false);
+        navigationTreeService.expandNode(node.id, false);
         return;
       }
     }
-    switchExpand(!expanded);
+    navigationTreeService.expandNode(node.id, !expanded);
   };
 
   const handleOpen = async () => {
@@ -76,7 +76,9 @@ export function useNavigationNode(node: NavNode): INavigationNode {
     }
   };
 
-  const handleSelect = (multiple = false) => context?.onSelect?.(node, multiple) || false;
+  const handleSelect = (multiple = false) => {
+    context?.onSelect?.(node, multiple);
+  };
 
   // TODO: probably should be refactored
   useEffect(() => {
@@ -87,7 +89,7 @@ export function useNavigationNode(node: NavNode): INavigationNode {
         .then(state => {
           setProcessing(false);
           if (!state) {
-            switchExpand(false);
+            navigationTreeService.expandNode(node.id, false);
           }
         });
     }
@@ -97,7 +99,12 @@ export function useNavigationNode(node: NavNode): INavigationNode {
     if (node && context?.isSelected?.(node)) {
       context.onSelect?.(node, true);
     }
-  }, [context, node]);
+  }, [context, node.id]);
+
+  useEffect(() => () => {
+    // TODO: seems like selection & expand should be specific for separate tree definitions
+    navigationTreeService.expandNode(node.id, false);
+  }, [node.id]);
 
   return {
     control: context?.control,
diff --git a/webapp/packages/core-app/src/NavigationTree/NavigationTreeService.ts b/webapp/packages/core-app/src/NavigationTree/NavigationTreeService.ts
index 3eeee5654f..1299db75af 100644
--- a/webapp/packages/core-app/src/NavigationTree/NavigationTreeService.ts
+++ b/webapp/packages/core-app/src/NavigationTree/NavigationTreeService.ts
@@ -6,43 +6,91 @@
  * you may not use this file except in compliance with the License.
  */
 
-import { observable } from 'mobx';
-import { Subject, Observable } from 'rxjs';
+import { action, computed, makeObservable } from 'mobx';
 
 import { ConnectionAuthService } from '@cloudbeaver/core-connections';
 import { injectable } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
+import { Executor, IExecutor } from '@cloudbeaver/core-executor';
+import { ResourceKeyUtils } from '@cloudbeaver/core-sdk';
+import { MetadataMap } from '@cloudbeaver/core-utils';
 import type { IActiveView } from '@cloudbeaver/core-view';
 
+import { CoreSettingsService } from '../CoreSettingsService';
 import { EObjectFeature } from '../shared/NodesManager/EObjectFeature';
 import { NavNodeExtensionsService } from '../shared/NodesManager/NavNodeExtensionsService';
-import { ROOT_NODE_PATH } from '../shared/NodesManager/NavNodeInfoResource';
+import { NavNodeInfoResource, ROOT_NODE_PATH } from '../shared/NodesManager/NavNodeInfoResource';
 import { NavNodeManagerService } from '../shared/NodesManager/NavNodeManagerService';
+import { NavTreeResource } from '../shared/NodesManager/NavTreeResource';
 import { NodeManagerUtils } from '../shared/NodesManager/NodeManagerUtils';
 
+export interface INavigationNodeMetadata {
+  selected: boolean;
+  expanded: boolean;
+}
+
+export interface INavigationNodeSelectionData {
+  id: string;
+  selected: boolean;
+}
+
 @injectable()
 export class NavigationTreeService {
-  readonly selectedNodes = observable.array<string>([]);
-  readonly onNodeSelect: Observable<[string, boolean]>;
+  readonly navigationTreeMetadata: MetadataMap<string, INavigationNodeMetadata>;
+  readonly nodeSelectionTask: IExecutor<INavigationNodeSelectionData>;
 
-  private nodeSelectSubject: Subject<[string, boolean]>;
+  get childrenLimit(): number {
+    return this.coreSettingsService.settings.getValue('app.navigationTree.childrenLimit');
+  }
 
   constructor(
     private navNodeManagerService: NavNodeManagerService,
     private notificationService: NotificationService,
     private connectionAuthService: ConnectionAuthService,
-    private navNodeExtensionsService: NavNodeExtensionsService
+    private navNodeExtensionsService: NavNodeExtensionsService,
+    private navTreeResource: NavTreeResource,
+    private coreSettingsService: CoreSettingsService,
+    private navNodeInfoResource: NavNodeInfoResource
   ) {
-    this.nodeSelectSubject = new Subject();
-    this.onNodeSelect = this.nodeSelectSubject.asObservable();
+    makeObservable<NavigationTreeService, 'unselectAll'>(this, {
+      childrenLimit: computed,
+      unselectAll: action,
+    });
+
+    this.nodeSelectionTask = new Executor();
+    this.navigationTreeMetadata = new MetadataMap<string, INavigationNodeMetadata>(() => ({
+      selected: false,
+      expanded: false,
+    }));
     this.getView = this.getView.bind(this);
+
+    this.navNodeInfoResource.onItemDelete.addHandler(key => {
+      ResourceKeyUtils.forEach(key, key => {
+        this.navigationTreeMetadata.delete(key);
+      });
+    });
+    this.navTreeResource.onItemDelete.addHandler(key => {
+      ResourceKeyUtils.forEach(key, key => {
+        this.expandNode(key, false);
+      });
+    });
   }
 
-  async navToNode(id: string, parentId: string) {
+  getChildren(id: string): string[] | undefined {
+    const children = this.navTreeResource.get(id);
+
+    if (children) {
+      return children.slice(0, this.childrenLimit);
+    }
+
+    return children;
+  }
+
+  async navToNode(id: string, parentId: string): Promise<void> {
     await this.navNodeManagerService.navToNode(id, parentId);
   }
 
-  async loadNestedNodes(id = ROOT_NODE_PATH) {
+  async loadNestedNodes(id = ROOT_NODE_PATH): Promise<boolean> {
     try {
       if (this.isConnectionNode(id) && !await this.tryInitConnection(id)) {
         return false;
@@ -55,39 +103,56 @@ export class NavigationTreeService {
     return false;
   }
 
-  selectNode(id: string, multiple?: boolean): boolean {
+  async selectNode(id: string, multiple?: boolean): Promise<void> {
     if (!multiple) {
-      for (const id of this.selectedNodes) {
-        this.nodeSelectSubject.next([id, false]);
-      }
-      this.selectedNodes.clear();
+      await this.unselectAll();
     }
-    if (!this.isNodeSelected(id)) {
-      this.selectedNodes.push(id);
-      this.nodeSelectSubject.next([id, true]);
-      return true;
-    }
-    this.selectedNodes.remove(id);
-    this.nodeSelectSubject.next([id, false]);
-    return false;
+
+    const metadata = this.navigationTreeMetadata.get(id);
+    metadata.selected = !metadata.selected;
+
+    await this.nodeSelectionTask.execute({
+      id,
+      selected: metadata.selected,
+    });
   }
 
-  isNodeSelected(navNodeId: string) {
-    return this.selectedNodes.includes(navNodeId);
+  isNodeExpanded(navNodeId: string): boolean {
+    return this.navigationTreeMetadata.get(navNodeId).expanded;
+  }
+
+  isNodeSelected(navNodeId: string): boolean {
+    return this.navigationTreeMetadata.get(navNodeId).selected;
+  }
+
+  expandNode(navNodeId: string, state: boolean): void {
+    const metadata = this.navigationTreeMetadata.get(navNodeId);
+    metadata.expanded = state;
   }
 
   getView(): IActiveView<string> | null {
-    if (!this.selectedNodes.length) {
+    const element = Array.from(this.navigationTreeMetadata).find(([key, metadata]) => metadata.selected);
+
+    if (!element) {
       return null;
     }
-    const context = this.selectedNodes[0];
 
     return {
-      context,
+      context: element[0],
       extensions: this.navNodeExtensionsService.extensions,
     };
   }
 
+  private async unselectAll() {
+    for (const [id, metadata] of this.navigationTreeMetadata) {
+      metadata.selected = false;
+      await this.nodeSelectionTask.execute({
+        id,
+        selected: false,
+      });
+    }
+  }
+
   private isConnectionNode(navNodeId: string) {
     const node = this.navNodeManagerService.getNode(navNodeId);
     return node?.objectFeatures.includes(EObjectFeature.dataSource);
diff --git a/webapp/packages/core-app/src/NavigationTree/TreeContext.ts b/webapp/packages/core-app/src/NavigationTree/TreeContext.ts
index 97e7e217c1..0abbdec834 100644
--- a/webapp/packages/core-app/src/NavigationTree/TreeContext.ts
+++ b/webapp/packages/core-app/src/NavigationTree/TreeContext.ts
@@ -15,7 +15,7 @@ export interface ITreeContext {
     node: NavNode;
   }>;
   onOpen?: (node: NavNode) => Promise<void> | void;
-  onSelect?: (node: NavNode, multiple: boolean) => boolean;
+  onSelect?: (node: NavNode, multiple: boolean) => void;
   isSelected?: (node: NavNode) => boolean;
 }
 
diff --git a/webapp/packages/core-app/src/NavigationTree/useNavigationTree.ts b/webapp/packages/core-app/src/NavigationTree/useNavigationTree.ts
index 14d08e89e7..8883ec0a03 100644
--- a/webapp/packages/core-app/src/NavigationTree/useNavigationTree.ts
+++ b/webapp/packages/core-app/src/NavigationTree/useNavigationTree.ts
@@ -16,7 +16,7 @@ import { NavigationTreeService } from './NavigationTreeService';
 interface INavigationTree {
   isSelected: (node: NavNode) => boolean;
   handleOpen: (node: NavNode) => Promise<void>;
-  handleSelect: (node: NavNode, isMultiple: boolean) => boolean;
+  handleSelect: (node: NavNode, isMultiple: boolean) => void;
 }
 
 export function useNavigationTree(): INavigationTree {
diff --git a/webapp/packages/core-app/src/shared/InlineEditor/InlineEditor.tsx b/webapp/packages/core-app/src/shared/InlineEditor/InlineEditor.tsx
index 2953adc0f4..bbf7af7906 100644
--- a/webapp/packages/core-app/src/shared/InlineEditor/InlineEditor.tsx
+++ b/webapp/packages/core-app/src/shared/InlineEditor/InlineEditor.tsx
@@ -13,9 +13,9 @@ import {
 import { useImperativeHandle } from 'react';
 import styled, { use } from 'reshadow';
 
-import { Icon } from '@cloudbeaver/core-blocks';
+import { Icon, useObjectRef } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
-import { CommonDialogService } from '@cloudbeaver/core-dialogs';
+import { CommonDialogService, DialogueStateResult } from '@cloudbeaver/core-dialogs';
 import { useStyles } from '@cloudbeaver/core-theming';
 
 import { EditorDialog } from './EditorDialog';
@@ -64,33 +64,39 @@ export const InlineEditor = observer<InlineEditorProps, HTMLInputElement | null>
   onReject,
   className,
 }, ref) {
+  const props = useObjectRef({
+    onChange,
+    onReject,
+    onSave,
+    value,
+  });
+
   const commonDialogService = useService(CommonDialogService);
 
-  const handleChange = useCallback((event: ChangeEvent<HTMLInputElement>| string) => {
-    const newValue = typeof event === 'string' ? event : event.target.value;
-    onChange(newValue);
-  }, [onChange]);
+  const handleChange = useCallback((event: ChangeEvent<HTMLInputElement>) => {
+    props.onChange(event.target.value);
+  }, []);
 
   const handlePopup = useCallback(async () => {
-    const newValue = await commonDialogService.open(EditorDialog, value);
-    if (typeof newValue === 'string') {
-      handleChange(newValue);
-      onSave();
-    } else if (onReject) {
-      onReject();
+    const newValue = await commonDialogService.open(EditorDialog, props.value);
+    if (newValue === DialogueStateResult.Rejected || newValue === DialogueStateResult.Resolved) {
+      props.onReject?.();
+    } else {
+      props.onChange(newValue);
+      props.onSave();
     }
-  }, [value, commonDialogService, onSave, onReject, handleChange]);
+  }, []);
 
   const handleKeyDown = useCallback((event: React.KeyboardEvent<HTMLInputElement>) => {
     switch (event.key) {
       case 'Enter':
-        onSave();
+        props.onSave();
         break;
       case 'Escape':
-        onReject?.();
+        props.onReject?.();
         break;
     }
-  }, [onSave, onReject]);
+  }, []);
 
   const inputRef = useRef<HTMLInputElement>(null);
 
diff --git a/webapp/packages/core-app/src/shared/NodesManager/NavNodeManagerService.ts b/webapp/packages/core-app/src/shared/NodesManager/NavNodeManagerService.ts
index 082eb22bc3..452bd334d6 100644
--- a/webapp/packages/core-app/src/shared/NodesManager/NavNodeManagerService.ts
+++ b/webapp/packages/core-app/src/shared/NodesManager/NavNodeManagerService.ts
@@ -332,20 +332,23 @@ export class NavNodeManagerService extends Bootstrap {
   };
 
   async updateRoot(): Promise<void> {
-    if (await this.isNavTreeEnabled()) {
+    const enabled = await this.isNavTreeEnabled();
+    if (enabled) {
       await this.navTree.refresh(ROOT_NODE_PATH);
     }
   }
 
   async refreshRoot(): Promise<void> {
     this.navTree.delete(ROOT_NODE_PATH);
-    if (await this.isNavTreeEnabled()) {
+    const enabled = await this.isNavTreeEnabled();
+    if (enabled) {
       await this.navTree.refresh(ROOT_NODE_PATH);
     }
   }
 
   private async connectionCreateHandler(connection: Connection) {
-    if (!await this.isNavTreeEnabled()) {
+    const enabled = await this.isNavTreeEnabled();
+    if (!enabled) {
       return;
     }
 
@@ -360,7 +363,8 @@ export class NavNodeManagerService extends Bootstrap {
   }
 
   private async connectionRefreshHandler(connections: Connection[]) {
-    if (!await this.isNavTreeEnabled()) {
+    const enabled = await this.isNavTreeEnabled();
+    if (!enabled) {
       return;
     }
 
@@ -368,7 +372,8 @@ export class NavNodeManagerService extends Bootstrap {
   }
 
   private async connectionUpdateHandler(key: ResourceKey<string>) {
-    if (!await this.isNavTreeEnabled()) {
+    const enabled = await this.isNavTreeEnabled();
+    if (!enabled) {
       return;
     }
 
@@ -430,7 +435,8 @@ export class NavNodeManagerService extends Bootstrap {
   }
 
   private async isNavTreeEnabled() {
-    if (!await this.permissionsService.hasAsync(EPermission.public)) {
+    const active = await this.permissionsService.hasAsync(EPermission.public);
+    if (!active) {
       return false;
     }
 
diff --git a/webapp/packages/core-app/src/shared/useChildren.ts b/webapp/packages/core-app/src/shared/useChildren.ts
index 1fef9d8b33..0cf5d40acf 100644
--- a/webapp/packages/core-app/src/shared/useChildren.ts
+++ b/webapp/packages/core-app/src/shared/useChildren.ts
@@ -10,6 +10,7 @@ import { useCallback } from 'react';
 
 import { useService } from '@cloudbeaver/core-di';
 
+import { NavigationTreeService } from '../NavigationTree/NavigationTreeService';
 import { ROOT_NODE_PATH } from './NodesManager/NavNodeInfoResource';
 import { NavTreeResource } from './NodesManager/NavTreeResource';
 
@@ -21,8 +22,9 @@ interface Hook {
 }
 
 export function useChildren(navNodeId = ROOT_NODE_PATH): Hook {
+  const navTreeService = useService(NavigationTreeService);
   const navTreeResource = useService(NavTreeResource);
-  const children = navTreeResource.get(navNodeId);
+  const children = navTreeService.getChildren(navNodeId);
 
   const deps = [navNodeId];
 
diff --git a/webapp/packages/core-blocks/src/Button.tsx b/webapp/packages/core-blocks/src/Button.tsx
index e2f1ac650e..72930be907 100644
--- a/webapp/packages/core-blocks/src/Button.tsx
+++ b/webapp/packages/core-blocks/src/Button.tsx
@@ -7,9 +7,12 @@
  */
 
 import styled, { css } from 'reshadow';
+import { use } from 'reshadow';
 
 import { useStyles, composes } from '@cloudbeaver/core-theming';
 
+import { Loader } from './Loader/Loader';
+
 const buttonStyles = composes(
   css`
     Button {
@@ -22,7 +25,31 @@ const buttonStyles = composes(
   css`
     Button {
       display: flex;
+
+      & Loader, & button-label {
+        transition: opacity cubic-bezier(0.4, 0.0, 0.2, 1) 0.3s;
+      }
+
+      & Loader {
+        position: absolute;
+        opacity: 0;
+      }
+
+      & button-label {
+        opacity: 1;
+      }
+
+      &[|loading] {
+        & Loader {
+          opacity: 1;
+        }
+
+        & button-label {
+          opacity: 0;
+        }
+      }
     }
+    
   `
 );
 
@@ -61,6 +88,7 @@ type ButtonProps = (
   React.ButtonHTMLAttributes<HTMLButtonElement | HTMLAnchorElement>
   & React.LinkHTMLAttributes<HTMLLinkElement | HTMLButtonElement>
 ) & {
+  loading?: boolean;
   mod?: Array<keyof typeof buttonMod>;
   tag?: 'button' | 'a';
   href?: string;
@@ -72,10 +100,20 @@ export const Button: React.FC<ButtonProps> = function Button({
   children,
   mod,
   tag = 'button',
+  disabled = false,
+  loading,
   ...rest
 }) {
+  if (loading) {
+    disabled = true;
+  }
+
   const Button = tag;
   return styled(useStyles(buttonStyles, ...(mod || []).map(mod => buttonMod[mod])))(
-    <Button {...rest}><ripple as="div" />{children}</Button>
+    <Button {...rest} disabled={disabled} {...use({ loading })}>
+      <ripple as="div" />
+      <button-label as='div'>{children}</button-label>
+      <Loader small />
+    </Button>
   );
 };
diff --git a/webapp/packages/core-blocks/src/FormControls/Checkboxes/Checkbox.tsx b/webapp/packages/core-blocks/src/FormControls/Checkboxes/Checkbox.tsx
index 5000087835..486d8b5ac3 100644
--- a/webapp/packages/core-blocks/src/FormControls/Checkboxes/Checkbox.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/Checkboxes/Checkbox.tsx
@@ -7,8 +7,8 @@
  */
 
 import { observer } from 'mobx-react-lite';
-import { useCallback, useContext } from 'react';
-import styled, { use } from 'reshadow';
+import { useCallback, useContext, useState } from 'react';
+import { use } from 'reshadow';
 
 import type { IGridItemsLayoutProps } from '../../Containers/ILayoutContainerProps';
 import { FormContext } from '../FormContext';
@@ -62,6 +62,7 @@ export const Checkbox: CheckboxType = observer(function Checkbox({
   onChange,
   ...rest
 }: CheckboxControlledProps | CheckboxObjectProps<any, any>) {
+  const [count, refresh] = useState(0);
   const context = useContext(FormContext);
   const handleChange = useCallback((event: React.ChangeEvent<HTMLInputElement>) => {
     if (state) {
@@ -84,7 +85,8 @@ export const Checkbox: CheckboxType = observer(function Checkbox({
     if (context) {
       context.onChange(event.target.checked, name);
     }
-  }, [state, name, value, onChange, context]);
+    refresh(count + 1);
+  }, [state, name, value, onChange, context, count]);
 
   if (autoHide && !isControlPresented(name, state)) {
     return null;
@@ -104,7 +106,7 @@ export const Checkbox: CheckboxType = observer(function Checkbox({
     checked = checked.includes(value);
   }
 
-  return styled()(
+  return (
     <CheckboxMarkup
       {...rest}
       name={name}
diff --git a/webapp/packages/core-blocks/src/FormControls/SubmittingForm.tsx b/webapp/packages/core-blocks/src/FormControls/SubmittingForm.tsx
index bd040bc014..cd29009f32 100644
--- a/webapp/packages/core-blocks/src/FormControls/SubmittingForm.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/SubmittingForm.tsx
@@ -11,11 +11,13 @@ import { useCallback, forwardRef, useMemo } from 'react';
 import { FormContext } from './FormContext';
 
 type FormDetailedProps = Omit<React.DetailedHTMLProps<React.FormHTMLAttributes<HTMLFormElement>, HTMLFormElement>, 'onChange'> & {
+  disabled?: boolean;
   onChange?: (value: string | number | boolean | null | undefined, name: string | undefined) => void;
 };
 
 export const SubmittingForm = forwardRef<HTMLFormElement, FormDetailedProps>(function SubmittingForm(
   {
+    disabled,
     children,
     onSubmit,
     onChange = () => {},
@@ -34,9 +36,11 @@ export const SubmittingForm = forwardRef<HTMLFormElement, FormDetailedProps>(fun
 
   return (
     <form {...rest} ref={ref} onSubmit={handleSubmit}>
-      <FormContext.Provider value={context}>
-        {children}
-      </FormContext.Provider>
+      <fieldset disabled={disabled} className={rest.className}>
+        <FormContext.Provider value={context}>
+          {children}
+        </FormContext.Provider>
+      </fieldset>
       <button type="submit" hidden />
     </form>
   );
diff --git a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNode.tsx b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNode.tsx
index a24c3bd41d..34d8214682 100644
--- a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNode.tsx
+++ b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNode.tsx
@@ -21,7 +21,7 @@ interface Props {
   leaf?: boolean;
   className?: string;
   onExpand?: () => void;
-  onSelect?: (multiple?: boolean) => boolean;
+  onSelect?: (multiple?: boolean) => void;
   onOpen?: () => void;
 }
 
@@ -42,7 +42,7 @@ export const TreeNode: React.FC<Props> = memo(function TreeNode({
   }, []);
 
   const handleSelect = useCallback(
-    (multiple?: boolean): boolean => handlersRef.current.onSelect?.(multiple) || false,
+    (multiple?: boolean): void => handlersRef.current.onSelect?.(multiple),
     []
   );
 
diff --git a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeContext.ts b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeContext.ts
index 6f79062579..c3ed80eb82 100644
--- a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeContext.ts
+++ b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeContext.ts
@@ -13,7 +13,7 @@ export interface ITreeNodeContext {
   loading: boolean;
   selected: boolean;
   leaf: boolean;
-  select: (multiple?: boolean) => boolean;
+  select: (multiple?: boolean) => void;
   expand: () => void;
   open: () => void;
 }
diff --git a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeExpand.tsx b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeExpand.tsx
index 7a3455f23a..2fe997e0d7 100644
--- a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeExpand.tsx
+++ b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeExpand.tsx
@@ -43,7 +43,8 @@ export const TreeNodeExpand: React.FC<Props> = function TreeNodeExpand({
     throw new Error('Context not provided');
   }
 
-  const handleExpand = () => {
+  const handleExpand = (event: React.MouseEvent<HTMLDivElement>) => {
+    event.stopPropagation();
     if (!context.leaf && !leaf) {
       context.expand();
     }
diff --git a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeSelect.tsx b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeSelect.tsx
index 06a98ceb06..74c16bbc1b 100644
--- a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeSelect.tsx
+++ b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeSelect.tsx
@@ -22,10 +22,12 @@ const styles = css`
 `;
 
 interface Props {
+  disabled?: boolean;
   className?: string;
 }
 
 export const TreeNodeSelect: React.FC<Props> = function TreeNodeSelect({
+  disabled,
   className,
 }) {
   const context = useContext(TreeNodeContext);
@@ -45,7 +47,7 @@ export const TreeNodeSelect: React.FC<Props> = function TreeNodeSelect({
 
   return styled(styles)(
     <div className={className} onClick={handleClick} onDoubleClick={preventPropagation}>
-      <Checkbox checked={context.selected} onChange={() => context.select(true)} />
+      <Checkbox checked={context.selected} disabled={disabled} onChange={() => context.select(true)} />
     </div>
   );
 };
diff --git a/webapp/packages/core-connections/src/Administration/ConnectionsResource.ts b/webapp/packages/core-connections/src/Administration/ConnectionsResource.ts
index f7a9596d8f..a8b88daf10 100644
--- a/webapp/packages/core-connections/src/Administration/ConnectionsResource.ts
+++ b/webapp/packages/core-connections/src/Administration/ConnectionsResource.ts
@@ -20,6 +20,7 @@ import {
   ResourceKeyUtils,
   DatabaseConnectionFragment,
   GetConnectionsQueryVariables,
+  TestConnectionMutation,
 } from '@cloudbeaver/core-sdk';
 import { MetadataMap } from '@cloudbeaver/core-utils';
 
@@ -122,10 +123,12 @@ export class ConnectionsResource extends CachedMapResource<string, DatabaseConne
     return observedConnection;
   }
 
-  async test(config: ConnectionConfig): Promise<void> {
-    await this.graphQLService.sdk.testConnection({
+  async test(config: ConnectionConfig): Promise<TestConnectionMutation['connection']> {
+    const { connection } = await this.graphQLService.sdk.testConnection({
       config,
     });
+
+    return connection;
   }
 
   async update(id: string, config: ConnectionConfig): Promise<DatabaseConnection> {
diff --git a/webapp/packages/core-connections/src/ConnectionForm/Options/ConnectionOptionsTabService.ts b/webapp/packages/core-connections/src/ConnectionForm/Options/ConnectionOptionsTabService.ts
index f721558788..d49249cd0c 100644
--- a/webapp/packages/core-connections/src/ConnectionForm/Options/ConnectionOptionsTabService.ts
+++ b/webapp/packages/core-connections/src/ConnectionForm/Options/ConnectionOptionsTabService.ts
@@ -78,8 +78,11 @@ export class ConnectionOptionsTabService extends Bootstrap {
             status.info(`Connection ${connection.name} created`);
           }
         } else {
-          await this.connectionsResource.test(config);
+          const info = await this.connectionsResource.test(config);
           status.info('Connection is established');
+          status.info('Client version: ' + info.clientVersion);
+          status.info('Server version: ' + info.serverVersion);
+          status.info('Connection time: ' + info.connectTime);
         }
       } else {
         if (submitType === 'submit') {
@@ -92,8 +95,11 @@ export class ConnectionOptionsTabService extends Bootstrap {
             status.info(`Connection ${connection.name} created`);
           }
         } else {
-          await this.connectionInfoResource.testConnection(config);
+          const info = await this.connectionInfoResource.testConnection(config);
           status.info('Connection is established');
+          status.info('Client version: ' + info.clientVersion);
+          status.info('Server version: ' + info.serverVersion);
+          status.info('Connection time: ' + info.connectTime);
         }
       }
     } catch (exception) {
diff --git a/webapp/packages/core-connections/src/ConnectionForm/Options/Options.tsx b/webapp/packages/core-connections/src/ConnectionForm/Options/Options.tsx
index bd4bbc6efb..22328f899b 100644
--- a/webapp/packages/core-connections/src/ConnectionForm/Options/Options.tsx
+++ b/webapp/packages/core-connections/src/ConnectionForm/Options/Options.tsx
@@ -82,7 +82,7 @@ export const Options: TabContainerPanelComponent<IConnectionFormTabProps> = obse
 
     data.config.connectionId = data.info.id;
 
-    data.config.name = data.info.name.trim();
+    data.config.name = data.info.name;
     data.config.description = data.info.description;
     data.config.template = data.info.template;
     data.config.driverId = data.info.driverId;
@@ -99,13 +99,17 @@ export const Options: TabContainerPanelComponent<IConnectionFormTabProps> = obse
     data.config.authModelId = data.info.authModel;
     data.config.saveCredentials = data.info.saveCredentials;
 
-    for (const property of data.info.authProperties) {
-      if (!property.features.includes('password')) {
-        data.config.credentials[property.id!] = property.value;
+    if (data.info.authProperties) {
+      for (const property of data.info.authProperties) {
+        if (!property.features.includes('password')) {
+          data.config.credentials[property.id!] = property.value;
+        }
       }
     }
 
-    data.config.providerProperties = { ...data.info.providerProperties };
+    if (data.info.providerProperties) {
+      data.config.providerProperties = { ...data.info.providerProperties };
+    }
   }));
   const optionsHook = useOptions({ data, form: form.form, options });
   const { credentialsSavingEnabled } = useAdministrationSettings();
@@ -114,11 +118,7 @@ export const Options: TabContainerPanelComponent<IConnectionFormTabProps> = obse
     DBDriverResource,
     { key: data.config.driverId || null, includes: ['includeProviderProperties'] },
     {
-      onLoad: async resource => {
-        if (data.availableDrivers && data.availableDrivers.length > 1) {
-          await resource.load(resourceKeyList(data.availableDrivers), ['includeProviderProperties']);
-        }
-
+      onLoad: async () => {
         if (!data.config.driverId && data.info) {
           data.info.authModel = undefined;
         }
diff --git a/webapp/packages/core-connections/src/ConnectionInfoResource.ts b/webapp/packages/core-connections/src/ConnectionInfoResource.ts
index 4da8b2fb2b..1642d42f91 100644
--- a/webapp/packages/core-connections/src/ConnectionInfoResource.ts
+++ b/webapp/packages/core-connections/src/ConnectionInfoResource.ts
@@ -22,6 +22,7 @@ import {
   GetUserConnectionsQueryVariables,
   ResourceKey,
   ResourceKeyUtils,
+  TestConnectionMutation,
 } from '@cloudbeaver/core-sdk';
 
 import { ConnectionsResource, DatabaseConnection } from './Administration/ConnectionsResource';
@@ -124,10 +125,12 @@ export class ConnectionInfoResource extends CachedMapResource<string, Connection
     return this.add(connection);
   }
 
-  async testConnection(config: ConnectionConfig): Promise<void> {
-    await this.graphQLService.sdk.testConnection({
+  async testConnection(config: ConnectionConfig): Promise<TestConnectionMutation['connection']> {
+    const { connection } = await this.graphQLService.sdk.testConnection({
       config,
     });
+
+    return connection;
   }
 
   async createFromNode(nodeId: string, nodeName: string): Promise<Connection> {
diff --git a/webapp/packages/core-connections/src/NetworkHandlerResource.ts b/webapp/packages/core-connections/src/NetworkHandlerResource.ts
index 3edb0e95a9..255424215b 100644
--- a/webapp/packages/core-connections/src/NetworkHandlerResource.ts
+++ b/webapp/packages/core-connections/src/NetworkHandlerResource.ts
@@ -41,9 +41,10 @@ export class NetworkHandlerResource extends CachedMapResource<string, NetworkHan
 
   async test(config: NetworkHandlerConfigInput): Promise<void> {
     try {
-      await this.graphQLService.sdk.testNetworkHandler({ config });
+      const { info } = await this.graphQLService.sdk.testNetworkHandler({ config });
       this.notificationService.logSuccess({
         title: 'connections_network_handler_test_success',
+        message: 'Client version: ' + info.clientVersion + '\nServer version: ' + info.serverVersion,
       });
     } catch (exception) {
       this.notificationService.logException(exception, 'connections_network_handler_test_fail');
diff --git a/webapp/packages/core-executor/src/useFormValidator.ts b/webapp/packages/core-executor/src/useFormValidator.ts
index 73d65c66a8..5a12697db0 100644
--- a/webapp/packages/core-executor/src/useFormValidator.ts
+++ b/webapp/packages/core-executor/src/useFormValidator.ts
@@ -7,7 +7,7 @@
  * you may not use this file except in compliance with the License.
  */
 
-import { useCallback, useEffect, useRef } from 'react';
+import { useEffect, useRef } from 'react';
 
 import type { IExecutor } from './IExecutor';
 import type { IExecutorHandlersCollection } from './IExecutorHandlersCollection';
@@ -17,24 +17,28 @@ export function useFormValidator(
   ref: React.RefObject<HTMLFormElement>,
   callback?: () => void
 ): void {
-  const callbackRef = useRef(callback);
-  callbackRef.current = callback;
-
-  const validate = useCallback(() => {
-    ref.current?.checkValidity();
-    ref.current?.reportValidity();
-
-    if (callbackRef.current) {
-      callbackRef.current();
-    }
-  }, [ref]);
+  const callbackRef = useRef({
+    callback,
+    ref,
+  });
+  callbackRef.current.callback = callback;
+  callbackRef.current.ref = ref;
 
   useEffect(() => {
     if (!validationTask) {
       return;
     }
+
+    function validate() {
+      if (callbackRef.current) {
+        callbackRef.current.ref.current?.checkValidity();
+        callbackRef.current.ref.current?.reportValidity();
+
+        callbackRef.current.callback?.();
+      }
+    }
     validationTask.addHandler(validate);
 
     return () => validationTask.removeHandler(validate);
-  }, [validationTask, validate]);
+  }, [validationTask]);
 }
diff --git a/webapp/packages/core-root/src/ServerConfigResource.ts b/webapp/packages/core-root/src/ServerConfigResource.ts
index 0c9a3118c4..3e9015c68b 100644
--- a/webapp/packages/core-root/src/ServerConfigResource.ts
+++ b/webapp/packages/core-root/src/ServerConfigResource.ts
@@ -24,6 +24,6 @@ export class ServerConfigResource extends CachedDataResource<ServerConfig | null
   protected async loader(): Promise<ServerConfig> {
     const { serverConfig } = await this.graphQLService.sdk.serverConfig();
 
-    return serverConfig;
+    return serverConfig as ServerConfig;
   }
 }
diff --git a/webapp/packages/core-sdk/src/queries/connections/testConnection.gql b/webapp/packages/core-sdk/src/queries/connections/testConnection.gql
index 244edcb72d..9e460a5801 100644
--- a/webapp/packages/core-sdk/src/queries/connections/testConnection.gql
+++ b/webapp/packages/core-sdk/src/queries/connections/testConnection.gql
@@ -1,5 +1,13 @@
 mutation testConnection($config: ConnectionConfig!) {
-  testConnection(config: $config) {
+  connection: testConnection(config: $config) {
     id
+    connectTime
+    connectionError {
+      message
+      errorCode
+      stackTrace
+    }
+    serverVersion
+    clientVersion
   }
 }
diff --git a/webapp/packages/core-sdk/src/queries/connections/testNetworkHandler.gql b/webapp/packages/core-sdk/src/queries/connections/testNetworkHandler.gql
index e86f2223f1..696599e0d8 100644
--- a/webapp/packages/core-sdk/src/queries/connections/testNetworkHandler.gql
+++ b/webapp/packages/core-sdk/src/queries/connections/testNetworkHandler.gql
@@ -1,5 +1,5 @@
 mutation testNetworkHandler($config: NetworkHandlerConfigInput!) {
-  testNetworkHandler(config: $config) {
+  info: testNetworkHandler(config: $config) {
     message
     clientVersion
     serverVersion
diff --git a/webapp/packages/core-sdk/src/sdk.ts b/webapp/packages/core-sdk/src/sdk.ts
index beedab8003..f6b68c660c 100644
--- a/webapp/packages/core-sdk/src/sdk.ts
+++ b/webapp/packages/core-sdk/src/sdk.ts
@@ -460,6 +460,16 @@ export interface WebServiceConfig {
   bundleVersion: Scalars['String'];
 }
 
+export interface ProductInfo {
+  id: Scalars['ID'];
+  version: Scalars['String'];
+  name: Scalars['String'];
+  description?: Maybe<Scalars['String']>;
+  buildTime: Scalars['String'];
+  releaseTime: Scalars['String'];
+  licenseInfo?: Maybe<Scalars['String']>;
+}
+
 export interface ServerConfig {
   name: Scalars['String'];
   version: Scalars['String'];
@@ -479,6 +489,7 @@ export interface ServerConfig {
   supportedLanguages: ServerLanguage[];
   services?: Maybe<Array<Maybe<WebServiceConfig>>>;
   productConfiguration: Scalars['Object'];
+  productInfo: ProductInfo;
   defaultNavigatorSettings: NavigatorSettings;
 }
 
@@ -1214,13 +1225,18 @@ export type TestConnectionMutationVariables = Exact<{
   config: ConnectionConfig;
 }>;
 
-export interface TestConnectionMutation { testConnection: Pick<ConnectionInfo, 'id'> }
+export interface TestConnectionMutation {
+  connection: (
+    Pick<ConnectionInfo, 'id' | 'connectTime' | 'serverVersion' | 'clientVersion'>
+    & { connectionError?: Maybe<Pick<ServerError, 'message' | 'errorCode' | 'stackTrace'>> }
+  );
+}
 
 export type TestNetworkHandlerMutationVariables = Exact<{
   config: NetworkHandlerConfigInput;
 }>;
 
-export interface TestNetworkHandlerMutation { testNetworkHandler: Pick<NetworkEndpointInfo, 'message' | 'clientVersion' | 'serverVersion'> }
+export interface TestNetworkHandlerMutation { info: Pick<NetworkEndpointInfo, 'message' | 'clientVersion' | 'serverVersion'> }
 
 export type UpdateConnectionMutationVariables = Exact<{
   config: ConnectionConfig;
@@ -2046,14 +2062,22 @@ export const SetConnectionNavigatorSettingsDocument = `
     ${DatabaseConnectionFragmentDoc}`;
 export const TestConnectionDocument = `
     mutation testConnection($config: ConnectionConfig!) {
-  testConnection(config: $config) {
+  connection: testConnection(config: $config) {
     id
+    connectTime
+    connectionError {
+      message
+      errorCode
+      stackTrace
+    }
+    serverVersion
+    clientVersion
   }
 }
     `;
 export const TestNetworkHandlerDocument = `
     mutation testNetworkHandler($config: NetworkHandlerConfigInput!) {
-  testNetworkHandler(config: $config) {
+  info: testNetworkHandler(config: $config) {
     message
     clientVersion
     serverVersion
diff --git a/webapp/packages/core-theming/src/styles/_button.scss b/webapp/packages/core-theming/src/styles/_button.scss
index ce64650b98..ef4a93f13c 100644
--- a/webapp/packages/core-theming/src/styles/_button.scss
+++ b/webapp/packages/core-theming/src/styles/_button.scss
@@ -16,6 +16,10 @@
   .theme-button {
     composes: mdc-button;
     height: 28px;
+
+    &[disabled] {
+      opacity: 1;
+    }
   }
   .theme-button_ripple {
     composes: mdc-button__ripple;
diff --git a/webapp/packages/core-theming/src/styles/_form-controls.scss b/webapp/packages/core-theming/src/styles/_form-controls.scss
index 69223aaca2..966d78fcb8 100644
--- a/webapp/packages/core-theming/src/styles/_form-controls.scss
+++ b/webapp/packages/core-theming/src/styles/_form-controls.scss
@@ -7,7 +7,17 @@
  */
 
 @mixin form-controls() {
-  input {
+  :global(fieldset) {
+    padding: 0;
+    border: none;
+    margin: 0;
+
+    &:global([disabled]) {
+      opacity: 1;
+    }
+  }
+
+  input:not([role="new"]) {
     @include mdc-theme-prop(color, on-secondary, false);
     @include mdc-theme-prop(background-color, secondary, false);
     box-sizing: border-box;
diff --git a/webapp/packages/plugin-authentication/src/Administration/Users/UsersTable/User.tsx b/webapp/packages/plugin-authentication/src/Administration/Users/UsersTable/User.tsx
index 82d04fba17..dc3b43b611 100644
--- a/webapp/packages/plugin-authentication/src/Administration/Users/UsersTable/User.tsx
+++ b/webapp/packages/plugin-authentication/src/Administration/Users/UsersTable/User.tsx
@@ -45,7 +45,7 @@ export const User: React.FC<Props> = observer(function User({ user, selectable }
       </TableColumnValue>
       <TableColumnValue expand>{user.userId}</TableColumnValue>
       <TableColumnValue>{user.grantedRoles.join(', ')}</TableColumnValue>
-      <TableColumnValue>
+      <TableColumnValue flex>
         <Placeholder container={usersAdministrationService.userDetailsInfoPlaceholder} context={user} />
       </TableColumnValue>
     </TableItem>
diff --git a/webapp/packages/plugin-authentication/src/AuthenticationService.ts b/webapp/packages/plugin-authentication/src/AuthenticationService.ts
index ab1f208a62..8e991dcb5e 100644
--- a/webapp/packages/plugin-authentication/src/AuthenticationService.ts
+++ b/webapp/packages/plugin-authentication/src/AuthenticationService.ts
@@ -60,7 +60,8 @@ export class AuthenticationService extends Bootstrap {
   }
 
   private async requireAuthentication() {
-    if (!await this.appAuthService.isAuthNeeded()) {
+    const authNeeded = await this.appAuthService.isAuthNeeded();
+    if (!authNeeded) {
       return;
     }
 
diff --git a/webapp/packages/plugin-connection-custom/src/CustomConnectionService.ts b/webapp/packages/plugin-connection-custom/src/CustomConnectionService.ts
deleted file mode 100644
index 2a46a5cce6..0000000000
--- a/webapp/packages/plugin-connection-custom/src/CustomConnectionService.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2021 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0.
- * you may not use this file except in compliance with the License.
- */
-
-import { Connection, ConnectionInfoResource } from '@cloudbeaver/core-connections';
-import { injectable } from '@cloudbeaver/core-di';
-import { ConnectionConfig, GraphQLService } from '@cloudbeaver/core-sdk';
-
-@injectable()
-export class CustomConnectionService {
-  constructor(
-    private graphQLService: GraphQLService,
-    private connectionInfoResource: ConnectionInfoResource
-  ) {
-  }
-
-  async createConnectionAsync(config: ConnectionConfig): Promise<Connection> {
-    return this.connectionInfoResource.createConnection(config);
-  }
-
-  async testConnectionAsync(config: ConnectionConfig): Promise<void> {
-    await this.graphQLService.sdk.testConnection({
-      config,
-    });
-  }
-}
diff --git a/webapp/packages/plugin-connection-custom/src/manifest.ts b/webapp/packages/plugin-connection-custom/src/manifest.ts
index 671e50c90c..7f3f8442f9 100644
--- a/webapp/packages/plugin-connection-custom/src/manifest.ts
+++ b/webapp/packages/plugin-connection-custom/src/manifest.ts
@@ -9,7 +9,6 @@
 import type { PluginManifest } from '@cloudbeaver/core-di';
 
 import { CustomConnectionPluginBootstrap } from './CustomConnectionPluginBootstrap';
-import { CustomConnectionService } from './CustomConnectionService';
 import { LocaleService } from './LocaleService';
 
 export const customConnectionPluginManifest: PluginManifest = {
@@ -18,7 +17,6 @@ export const customConnectionPluginManifest: PluginManifest = {
   },
 
   providers: [
-    CustomConnectionService,
     LocaleService,
     CustomConnectionPluginBootstrap,
   ],
diff --git a/webapp/packages/plugin-connections/src/PublicConnectionForm/PublicConnectionForm.tsx b/webapp/packages/plugin-connections/src/PublicConnectionForm/PublicConnectionForm.tsx
index dbdb73567d..9e798355a6 100644
--- a/webapp/packages/plugin-connections/src/PublicConnectionForm/PublicConnectionForm.tsx
+++ b/webapp/packages/plugin-connections/src/PublicConnectionForm/PublicConnectionForm.tsx
@@ -62,13 +62,7 @@ export const PublicConnectionForm: React.FC = observer(function PublicConnection
   const service = useService(PublicConnectionFormService);
 
   const close = useCallback(() => service.close(), []);
-  const save = useCallback((config: ConnectionConfig) => {
-    if (config.connectionId) {
-      service.change({ connectionId: config.connectionId });
-    } else {
-      service.close(true);
-    }
-  }, []);
+  const save = useCallback(() => service.close(true), []);
 
   return styled(styles)(
     <Loader loading={service.dataOptions !== null}>
diff --git a/webapp/packages/plugin-connections/src/PublicConnectionForm/PublicConnectionFormBootstrap.ts b/webapp/packages/plugin-connections/src/PublicConnectionForm/PublicConnectionFormBootstrap.ts
index 7e6f041abd..1d293b63bc 100644
--- a/webapp/packages/plugin-connections/src/PublicConnectionForm/PublicConnectionFormBootstrap.ts
+++ b/webapp/packages/plugin-connections/src/PublicConnectionForm/PublicConnectionFormBootstrap.ts
@@ -33,7 +33,7 @@ export class PublicConnectionFormBootstrap extends Bootstrap {
         return context.contextType === NavigationTreeContextMenuService.nodeContextType
           && context.data.objectFeatures.includes(EObjectFeature.dataSource);
       },
-      title: 'Edit',
+      title: 'connections_public_connection_edit_menu_item_title',
       order: 2,
       onClick: context => {
         const node = context.data;
diff --git a/webapp/packages/plugin-connections/src/locales/en.ts b/webapp/packages/plugin-connections/src/locales/en.ts
index 72f0878f0a..f807e88c7d 100644
--- a/webapp/packages/plugin-connections/src/locales/en.ts
+++ b/webapp/packages/plugin-connections/src/locales/en.ts
@@ -1,4 +1,5 @@
 export default [
+  ['connections_public_connection_edit_menu_item_title', 'Edit Connection'],
   ['connections_public_connection_edit_cancel_title', 'Cancel confirmation'],
   ['connections_public_connection_edit_cancel_message', 'You\'re going to cancel connection changes. Unsaved changes will be lost. Are you sure?'],
 ];
diff --git a/webapp/packages/plugin-connections/src/locales/ru.ts b/webapp/packages/plugin-connections/src/locales/ru.ts
index c20aebadec..1ed9674006 100644
--- a/webapp/packages/plugin-connections/src/locales/ru.ts
+++ b/webapp/packages/plugin-connections/src/locales/ru.ts
@@ -1,4 +1,5 @@
 export default [
+  ['connections_public_connection_edit_menu_item_title', 'Изменить подключение'],
   ['connections_public_connection_edit_cancel_title', 'Отмена редактирования'],
   ['connections_public_connection_edit_cancel_message', 'Вы собираетесь закрыть редактор, несохраненные изменения не будут применены. Вы уверены?'],
 ];
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/CellEditor/CellEditor.tsx b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/CellEditor/CellEditor.tsx
index 09a7474826..84055631db 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/CellEditor/CellEditor.tsx
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/CellEditor/CellEditor.tsx
@@ -89,8 +89,10 @@ export const CellEditor = observer<Pick<EditorProps<any, any>, 'rowIdx' | 'row'
   const type = typeof tableDataContext?.getCellValue(rowIdx, column.key) === 'number' ? 'number' : 'text';
 
   const handleSave = () => {
-    dataGridContext.model.source.getEditor(dataGridContext.resultIndex)
-      .setCell(rowIdx, Number(column.key), Number(value));
+    if (type === 'number') {
+      const editor = dataGridContext.model.source.getEditor(dataGridContext.resultIndex);
+      editor.setCell(rowIdx, Number(column.key), Number(editor.getCell(rowIdx, Number(column.key))));
+    }
     onClose(false);
   };
   const handleReject = () => {
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataEditor.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataEditor.ts
index ace8d45d4b..32ff30339a 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataEditor.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataEditor.ts
@@ -69,7 +69,7 @@ export class DatabaseDataEditor<TResult extends IDatabaseDataResult> implements
       set: this.set.bind(this, result),
       setCell: this.setCell.bind(this, result),
       get: this.get.bind(this, result),
-      getCell: this.get.bind(this, result),
+      getCell: this.getCell.bind(this, result),
       isCellEdited: this.isCellEdited.bind(this, result),
       isEdited: this.isResultEdited.bind(this, result),
       isRowEdited: this.isRowEdited.bind(this, result),
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditorNavigatorService.ts b/webapp/packages/plugin-sql-editor/src/SqlEditorNavigatorService.ts
index 0b0b587ed0..dc211bd900 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditorNavigatorService.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditorNavigatorService.ts
@@ -7,10 +7,11 @@
  */
 
 import { NavigationTabsService } from '@cloudbeaver/core-app';
-import { ConnectionsManagerService, ConnectionInfoResource } from '@cloudbeaver/core-connections';
+import { ConnectionsManagerService } from '@cloudbeaver/core-connections';
 import { injectable } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
 import { IExecutor, Executor, IExecutionContextProvider } from '@cloudbeaver/core-executor';
+import { NavigationService } from '@cloudbeaver/core-ui';
 
 import type { ISqlEditorTabState } from './ISqlEditorTabState';
 import { SqlEditorTabService, isSQLEditorTab } from './SqlEditorTabService';
@@ -49,13 +50,14 @@ export class SqlEditorNavigatorService {
     private navigationTabsService: NavigationTabsService,
     private connectionsManagerService: ConnectionsManagerService,
     private notificationService: NotificationService,
-    private connectionInfoResource: ConnectionInfoResource,
-    private sqlEditorTabService: SqlEditorTabService
+    private sqlEditorTabService: SqlEditorTabService,
+    navigationService: NavigationService
   ) {
     this.navigator = new Executor<SQLCreateAction | SQLEditorAction>(
       null,
       (active, current) => active.type === current.type
     )
+      .before(navigationService.navigationTask)
       .addHandler(this.navigateHandler.bind(this));
     this.connectionsManagerService.onCloseConnection.subscribe(this.handleConnectionClose.bind(this));
   }