diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java
index 1014afbe0f..0650ecd72b 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java
@@ -116,16 +116,11 @@ public WebSession(
         @NotNull WebAuthApplication application,
         @NotNull Map<String, DBWSessionHandler> sessionHandlers
     ) throws DBException {
-        super(requestInfo.getId(), application);
-        this.lastAccessTime = this.createTime;
-        setLocale(CommonUtils.toString(requestInfo.getLocale(), this.locale));
-        this.sessionHandlers = sessionHandlers;
-        //force authorization of anonymous session to avoid access error,
-        //because before authorization could be called by any request,
-        //but now 'updateInfo' is called only in special requests,
-        //and the order of requests is not guaranteed.
-        //look at CB-4747
-        refreshSessionAuth();
+        this(requestInfo.getId(),
+            CommonUtils.toString(requestInfo.getLocale()),
+            application,
+            sessionHandlers
+        );
         updateSessionParameters(requestInfo);
     }
 
@@ -138,7 +133,7 @@ protected WebSession(
         super(id, application);
         this.lastAccessTime = this.createTime;
         this.sessionHandlers = sessionHandlers;
-        setLocale(locale);
+        setLocale(CommonUtils.toString(locale, this.locale));
         //force authorization of anonymous session to avoid access error,
         //because before authorization could be called by any request,
         //but now 'updateInfo' is called only in special requests,
diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/WebGlobalWorkspace.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/WebGlobalWorkspace.java
index 02a3b4e53d..3e975239a6 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/WebGlobalWorkspace.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/WebGlobalWorkspace.java
@@ -17,8 +17,8 @@
 package io.cloudbeaver.server;
 
 import io.cloudbeaver.WebProjectImpl;
+import io.cloudbeaver.model.app.WebApplication;
 import io.cloudbeaver.utils.WebAppUtils;
-import org.eclipse.core.runtime.Platform;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.Log;
@@ -28,8 +28,6 @@
 import org.jkiss.dbeaver.model.impl.app.BaseWorkspaceImpl;
 
 import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collections;
@@ -48,17 +46,7 @@ public class WebGlobalWorkspace extends BaseWorkspaceImpl {
     private WebGlobalProject globalProject;
 
     public WebGlobalWorkspace(DBPPlatform platform) {
-        super(platform, Path.of(getWorkspaceURI()));
-    }
-
-    @NotNull
-    private static URI getWorkspaceURI() {
-        String workspacePath = Platform.getInstanceLocation().getURL().toString();
-        try {
-            return new URI(workspacePath);
-        } catch (URISyntaxException e) {
-            throw new IllegalStateException("Workspace path is invalid: " + workspacePath, e);
-        }
+        super(platform, ((WebApplication) platform.getApplication()).getWorkspaceDirectory());
     }
 
     @Override
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebDatasourceAccessCheckHandler.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebDatasourceAccessCheckHandler.java
index 2e3ca7aea1..ddd680fb03 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebDatasourceAccessCheckHandler.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebDatasourceAccessCheckHandler.java
@@ -20,11 +20,16 @@
 import io.cloudbeaver.model.config.CBAppConfig;
 import io.cloudbeaver.model.utils.ConfigurationUtils;
 import io.cloudbeaver.server.CBApplication;
+import io.cloudbeaver.utils.WebAppUtils;
 import org.jkiss.dbeaver.model.connection.DBPDriver;
 
+//TODO move to a separate CBApplication plugin
 public class WebDatasourceAccessCheckHandler extends BaseDatasourceAccessCheckHandler {
     @Override
     protected boolean isDriverDisabled(DBPDriver driver) {
+        if (!WebAppUtils.getWebApplication().isMultiuser()) {
+            return false;
+        }
         CBAppConfig config = CBApplication.getInstance().getAppConfiguration();
         return !ConfigurationUtils.isDriverEnabled(
             driver,
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 2027832a9d..0bf84aae33 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
@@ -229,7 +229,7 @@ protected void startServer() {
 
         Location instanceLoc = Platform.getInstanceLocation();
         try {
-            if (!instanceLoc.isSet()) {
+            if (!instanceLoc.isSet()) { // always false?
                 URL wsLocationURL = new URL(
                     "file",  //$NON-NLS-1$
                     null,
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBPlatformActivator.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBPlatformActivator.java
index 8bfd80106d..cee656629f 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBPlatformActivator.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBPlatformActivator.java
@@ -28,7 +28,7 @@ public class CBPlatformActivator extends WebPlatformActivator {
     protected void shutdownPlatform() {
         try {
             // Dispose core
-            if (DBWorkbench.getPlatform() instanceof CBPlatform cbPlatform) {
+            if (DBWorkbench.isPlatformStarted() && DBWorkbench.getPlatform() instanceof CBPlatform cbPlatform) {
                 cbPlatform.dispose();
             }
         } catch (Throwable e) {
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/graphql/GraphQLEndpoint.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/graphql/GraphQLEndpoint.java
index b004e7e80d..15506f79dd 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/graphql/GraphQLEndpoint.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/graphql/GraphQLEndpoint.java
@@ -31,8 +31,6 @@
 import io.cloudbeaver.WebServiceUtils;
 import io.cloudbeaver.model.session.WebSession;
 import io.cloudbeaver.registry.WebServiceRegistry;
-import io.cloudbeaver.server.CBApplication;
-import io.cloudbeaver.server.CBPlatform;
 import io.cloudbeaver.server.HttpConstants;
 import io.cloudbeaver.service.DBWBindingContext;
 import io.cloudbeaver.service.DBWServiceBindingGraphQL;
@@ -63,6 +61,8 @@ public class GraphQLEndpoint extends HttpServlet {
 
     private static final Log log = Log.getLog(GraphQLEndpoint.class);
 
+    private static final boolean DEBUG = true;
+
     private static final String HEADER_ACCESS_CONTROL_ALLOW_ORIGIN = "Access-Control-Allow-Origin";
     private static final String HEADER_ACCESS_CONTROL_ALLOW_HEADERS = "Access-Control-Allow-Headers";
     private static final String HEADER_ACCESS_CONTROL_ALLOW_CREDENTIALS = "Access-Control-Allow-Credentials";
@@ -255,6 +255,8 @@ private void executeQuery(HttpServletRequest request, HttpServletResponse respon
 //            }
             if (apiCall != null) {
                 log.debug("API > " + apiCall);
+            } else if (DEBUG) {
+                log.debug("API > " + query);
             }
         }
         ExecutionInput executionInput = contextBuilder.build();
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebDatabaseObjectInfo.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebDatabaseObjectInfo.java
index 7d251b5755..fd9569ec59 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebDatabaseObjectInfo.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebDatabaseObjectInfo.java
@@ -16,15 +16,17 @@
  */
 package io.cloudbeaver.service.navigator;
 
+import io.cloudbeaver.WebProjectImpl;
 import io.cloudbeaver.WebServiceUtils;
 import io.cloudbeaver.model.WebPropertyInfo;
 import io.cloudbeaver.model.session.WebSession;
+import io.cloudbeaver.service.security.SMUtils;
+import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.*;
 import org.jkiss.dbeaver.model.meta.Property;
-import org.jkiss.dbeaver.model.navigator.DBNDataSource;
-import org.jkiss.dbeaver.model.preferences.DBPPropertyDescriptor;
+import org.jkiss.dbeaver.model.rm.RMProjectPermission;
 import org.jkiss.dbeaver.model.struct.*;
 import org.jkiss.dbeaver.model.struct.rdb.DBSCatalog;
 import org.jkiss.dbeaver.model.struct.rdb.DBSSchema;
@@ -91,9 +93,22 @@ public WebPropertyInfo[] getProperties() {
 
     @Property
     public WebPropertyInfo[] filterProperties(@Nullable WebPropertyFilter filter) {
+        if (object instanceof DBPDataSourceContainer container && !isDataSourceEditable(container)) {
+            // If user cannot edit a connection, then return only name
+            filter = new WebPropertyFilter();
+            filter.setFeatures(List.of(DBConstants.PROP_FEATURE_NAME));
+        }
         return WebServiceUtils.getObjectFilteredProperties(session, object, filter);
     }
 
+    private boolean isDataSourceEditable(@NotNull DBPDataSourceContainer container) {
+        WebProjectImpl project = session.getProjectById(container.getProject().getId());
+        if (project == null) {
+            return false;
+        }
+        return SMUtils.hasProjectPermission(session, project.getRMProject(), RMProjectPermission.DATA_SOURCES_EDIT);
+    }
+
     ///////////////////////////////////
     // Advanced
 
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLQueryDataReceiver.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLQueryDataReceiver.java
index 6a5800cb20..89bdc1e5f1 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLQueryDataReceiver.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLQueryDataReceiver.java
@@ -17,7 +17,7 @@
 package io.cloudbeaver.service.sql;
 
 import io.cloudbeaver.model.session.WebSession;
-import io.cloudbeaver.server.CBApplication;
+import io.cloudbeaver.utils.WebAppUtils;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
@@ -58,7 +58,9 @@ class WebSQLQueryDataReceiver implements DBDDataReceiver {
         this.contextInfo = contextInfo;
         this.dataContainer = dataContainer;
         this.dataFormat = dataFormat;
-        rowLimit = CBApplication.getInstance().getAppConfiguration().getResourceQuota(WebSQLConstants.QUOTA_PROP_ROW_LIMIT);
+        rowLimit = WebAppUtils.getWebApplication()
+            .getAppConfiguration()
+            .getResourceQuota(WebSQLConstants.QUOTA_PROP_ROW_LIMIT);
     }
 
     public WebSQLQueryResultSet getResultSet() {
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLUtils.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLUtils.java
index 2e55d43b34..9bf207fa4c 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLUtils.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLUtils.java
@@ -16,11 +16,11 @@
  */
 package io.cloudbeaver.service.sql;
 
-import io.cloudbeaver.model.config.CBAppConfig;
+import io.cloudbeaver.model.app.WebAppConfiguration;
 import io.cloudbeaver.model.session.WebSession;
 import io.cloudbeaver.registry.WebServiceRegistry;
-import io.cloudbeaver.server.CBApplication;
 import io.cloudbeaver.utils.CBModelConstants;
+import io.cloudbeaver.utils.WebAppUtils;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.data.*;
@@ -151,9 +151,11 @@ private static Object serializeContentValue(WebSession session, DBDContent value
         if (ContentUtils.isTextContent(value)) {
             String stringValue = ContentUtils.getContentStringValue(session.getProgressMonitor(), value);
             int textPreviewMaxLength = CommonUtils.toInt(
-                CBApplication.getInstance().getAppConfiguration().getResourceQuota(
-                    WebSQLConstants.QUOTA_PROP_TEXT_PREVIEW_MAX_LENGTH,
-                    WebSQLConstants.TEXT_PREVIEW_MAX_LENGTH));
+                WebAppUtils.getWebApplication()
+                    .getAppConfiguration()
+                    .getResourceQuota(WebSQLConstants.QUOTA_PROP_TEXT_PREVIEW_MAX_LENGTH),
+                WebSQLConstants.TEXT_PREVIEW_MAX_LENGTH
+            );
             if (stringValue != null && stringValue.length() > textPreviewMaxLength) {
                 stringValue =  stringValue.substring(0, textPreviewMaxLength);
             }
@@ -164,12 +166,11 @@ private static Object serializeContentValue(WebSession session, DBDContent value
             if (binaryValue != null) {
                 byte[] previewValue = binaryValue;
                 // gets parameters from the configuration file
-                CBAppConfig config = CBApplication.getInstance().getAppConfiguration();
+                WebAppConfiguration config = WebAppUtils.getWebApplication().getAppConfiguration();
                 // the max length of the text preview
                 int textPreviewMaxLength = CommonUtils.toInt(
                     config.getResourceQuota(
-                        WebSQLConstants.QUOTA_PROP_TEXT_PREVIEW_MAX_LENGTH,
-                        WebSQLConstants.TEXT_PREVIEW_MAX_LENGTH));
+                        WebSQLConstants.QUOTA_PROP_TEXT_PREVIEW_MAX_LENGTH), WebSQLConstants.TEXT_PREVIEW_MAX_LENGTH);
                 if (previewValue.length > textPreviewMaxLength) {
                     previewValue = Arrays.copyOf(previewValue, textPreviewMaxLength);
                 }
@@ -177,8 +178,8 @@ private static Object serializeContentValue(WebSession session, DBDContent value
                 // the max length of the binary preview
                 int binaryPreviewMaxLength = CommonUtils.toInt(
                     config.getResourceQuota(
-                        WebSQLConstants.QUOTA_PROP_BINARY_PREVIEW_MAX_LENGTH,
-                        WebSQLConstants.BINARY_PREVIEW_MAX_LENGTH));
+                        WebSQLConstants.QUOTA_PROP_BINARY_PREVIEW_MAX_LENGTH),
+                    WebSQLConstants.BINARY_PREVIEW_MAX_LENGTH);
                 byte[] inlineValue = binaryValue;
                 if (inlineValue.length > binaryPreviewMaxLength) {
                     inlineValue = Arrays.copyOf(inlineValue, textPreviewMaxLength);
@@ -214,9 +215,11 @@ private static Object serializeGeometryValue(DBGeometry value) {
      */
     public static Object serializeStringValue(Object value) {
         int textPreviewMaxLength = CommonUtils.toInt(
-            CBApplication.getInstance().getAppConfiguration().getResourceQuota(
-                WebSQLConstants.QUOTA_PROP_TEXT_PREVIEW_MAX_LENGTH,
-                WebSQLConstants.TEXT_PREVIEW_MAX_LENGTH));
+            WebAppUtils.getWebApplication()
+                .getAppConfiguration()
+                .getResourceQuota(WebSQLConstants.QUOTA_PROP_TEXT_PREVIEW_MAX_LENGTH),
+            WebSQLConstants.TEXT_PREVIEW_MAX_LENGTH
+        );
         String stringValue = value.toString();
         if (stringValue.length() < textPreviewMaxLength) {
             return value.toString();
diff --git a/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/ReverseProxyConfigurator.java b/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/ReverseProxyConfigurator.java
index 5bda8362a2..8420f4e8ba 100644
--- a/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/ReverseProxyConfigurator.java
+++ b/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/ReverseProxyConfigurator.java
@@ -71,7 +71,7 @@ private void migrateConfiguration(
             smReverseProxyProviderConfiguration.setProvider(RPAuthProvider.AUTH_PROVIDER);
             smReverseProxyProviderConfiguration.setDisplayName("Reverse Proxy");
             smReverseProxyProviderConfiguration.setDescription(
-                "Automatically created provider after changing Reverse Proxy configuration way in 23.3.4 version"
+                "This provider was created automatically"
             );
             smReverseProxyProviderConfiguration .setIconURL("");
             Map<String, Object> parameters = new HashMap<>();
diff --git a/webapp/packages/core-authentication/src/AuthProvidersResource.ts b/webapp/packages/core-authentication/src/AuthProvidersResource.ts
index 4056802585..a17f5c53c3 100644
--- a/webapp/packages/core-authentication/src/AuthProvidersResource.ts
+++ b/webapp/packages/core-authentication/src/AuthProvidersResource.ts
@@ -18,9 +18,9 @@ import {
 } from '@cloudbeaver/core-resource';
 import { ServerConfigResource } from '@cloudbeaver/core-root';
 import { type AuthProviderConfigurationInfoFragment, type AuthProviderInfoFragment, GraphQLService } from '@cloudbeaver/core-sdk';
+import { isNotNullDefined } from '@cloudbeaver/core-utils';
 
 import { AuthConfigurationsResource } from './AuthConfigurationsResource.js';
-import { AuthSettingsService } from './AuthSettingsService.js';
 
 export type AuthProvider = NonNullable<AuthProviderInfoFragment>;
 export type AuthProviderConfiguration = NonNullable<AuthProviderConfigurationInfoFragment>;
@@ -31,8 +31,13 @@ export class AuthProvidersResource extends CachedMapResource<string, AuthProvide
     return this.values.filter(provider => provider.configurable);
   }
 
+  get enabledConfigurableAuthProviders(): AuthProvider[] {
+    const enabledProviders = new Set(this.serverConfigResource.data?.enabledAuthProviders);
+
+    return this.configurable.filter(provider => enabledProviders.has(provider.id));
+  }
+
   constructor(
-    private readonly authSettingsService: AuthSettingsService,
     private readonly graphQLService: GraphQLService,
     private readonly serverConfigResource: ServerConfigResource,
     private readonly authConfigurationsResource: AuthConfigurationsResource,
@@ -64,7 +69,7 @@ export class AuthProvidersResource extends CachedMapResource<string, AuthProvide
   }
 
   getEnabledProviders(): AuthProvider[] {
-    return this.get(resourceKeyList(this.serverConfigResource.enabledAuthProviders)) as AuthProvider[];
+    return this.get(resourceKeyList(this.serverConfigResource.enabledAuthProviders)).filter(isNotNullDefined);
   }
 
   isEnabled(id: string): boolean {
diff --git a/webapp/packages/core-blocks/src/IconButton.tsx b/webapp/packages/core-blocks/src/IconButton.tsx
index 06e673a620..c246243b63 100644
--- a/webapp/packages/core-blocks/src/IconButton.tsx
+++ b/webapp/packages/core-blocks/src/IconButton.tsx
@@ -30,7 +30,7 @@ export const IconButton: React.FC<IconButtonProps> = observer(function IconButto
   const Button = tag ?? ReakitButton;
 
   return (
-    <Button {...rest} className={s(styles, { iconButton: true }, className)}>
+    <Button tabIndex={0} {...rest} className={s(styles, { iconButton: true }, className)}>
       <div className={s(styles, { iconBox: true })}>
         {img && <StaticImage className={s(styles, { staticImage: true })} icon={name} />}
         {!img && <Icon className={s(styles, { icon: true })} name={name} viewBox={viewBox} />}
diff --git a/webapp/packages/core-blocks/src/Menu/Menu.tsx b/webapp/packages/core-blocks/src/Menu/Menu.tsx
index 810b4ca9bb..c9249f46d5 100644
--- a/webapp/packages/core-blocks/src/Menu/Menu.tsx
+++ b/webapp/packages/core-blocks/src/Menu/Menu.tsx
@@ -134,6 +134,7 @@ export const Menu = observer<IMenuProps, HTMLButtonElement>(
             <MenuButton
               key={relativePosition ? 'link' : 'main'}
               ref={combinedRef}
+              tabIndex={0}
               className={s(styles, { menuButton: true }, className)}
               {...menu}
               visible={menuVisible}
@@ -168,6 +169,7 @@ export const Menu = observer<IMenuProps, HTMLButtonElement>(
           <MenuButton
             key={relativePosition ? 'link' : 'main'}
             ref={combinedRef}
+            tabIndex={0}
             className={s(styles, { menuButton: true }, className)}
             {...menu}
             visible={menuVisible}
diff --git a/webapp/packages/core-blocks/src/Slide/SlideElement.module.css b/webapp/packages/core-blocks/src/Slide/SlideElement.module.css
index a12f0a1f81..86b9518fec 100644
--- a/webapp/packages/core-blocks/src/Slide/SlideElement.module.css
+++ b/webapp/packages/core-blocks/src/Slide/SlideElement.module.css
@@ -11,11 +11,11 @@
   display: inline-block;
   vertical-align: top;
   white-space: normal;
-  transition: transform cubic-bezier(0.4, 0, 0.2, 1) 0.6s;
+  transition: transform ease-in-out 0.4s;
   transform: translateX(-100%);
 
   &:first-child {
-    transition: width cubic-bezier(0.4, 0, 0.2, 1) 0.6s;
+    transition: width ease-in-out 0.4s;
     width: 100%;
   }
 }
diff --git a/webapp/packages/core-blocks/src/TextPlaceholder.tsx b/webapp/packages/core-blocks/src/TextPlaceholder.tsx
index 19c4499e66..94841136e6 100644
--- a/webapp/packages/core-blocks/src/TextPlaceholder.tsx
+++ b/webapp/packages/core-blocks/src/TextPlaceholder.tsx
@@ -6,21 +6,22 @@
  * you may not use this file except in compliance with the License.
  */
 import { observer } from 'mobx-react-lite';
+import type { HTMLAttributes } from 'react';
 
 import { s } from './s.js';
 import style from './TextPlaceholder.module.css';
 import { useS } from './useS.js';
 
-interface Props {
+interface Props extends HTMLAttributes<HTMLDivElement> {
   className?: string;
   children?: React.ReactNode;
 }
 
-export const TextPlaceholder = observer<Props>(function TextPlaceholder({ className, children }) {
+export const TextPlaceholder = observer<Props>(function TextPlaceholder({ className, children, ...rest }) {
   const styles = useS(style);
 
   return (
-    <div className={s(styles, { container: true })}>
+    <div {...rest} className={s(styles, { container: true })}>
       <span className={s(styles, { content: true }, className)}>{children}</span>
     </div>
   );
diff --git a/webapp/packages/core-blocks/src/ToolsPanel/ToolsPanel.tsx b/webapp/packages/core-blocks/src/ToolsPanel/ToolsPanel.tsx
index c4905c8a49..00658776c5 100644
--- a/webapp/packages/core-blocks/src/ToolsPanel/ToolsPanel.tsx
+++ b/webapp/packages/core-blocks/src/ToolsPanel/ToolsPanel.tsx
@@ -6,13 +6,14 @@
  * you may not use this file except in compliance with the License.
  */
 import { observer } from 'mobx-react-lite';
+import type { HTMLAttributes } from 'react';
 
 import { s } from '../s.js';
 import { useS } from '../useS.js';
 import style from './ToolsPanel.module.css';
 
 type TType = 'primary' | 'secondary';
-interface Props {
+interface Props extends HTMLAttributes<HTMLDivElement> {
   className?: string;
   type?: TType;
   center?: boolean;
@@ -29,8 +30,13 @@ export const ToolsPanel: React.FC<React.PropsWithChildren<Props>> = observer(fun
   minHeight,
   type = 'primary',
   bottomBorder = false,
+  ...rest
 }) {
   const styles = useS(style);
 
-  return <div className={s(styles, { toolsPanel: true, [type]: true, bottomBorder, minHeight, center, rounded }, className)}>{children}</div>;
+  return (
+    <div {...rest} className={s(styles, { toolsPanel: true, [type]: true, bottomBorder, minHeight, center, rounded }, className)}>
+      {children}
+    </div>
+  );
 });
diff --git a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeControl.tsx b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeControl.tsx
index 4ee480680e..1872691793 100644
--- a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeControl.tsx
+++ b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeControl.tsx
@@ -112,10 +112,11 @@ export const TreeNodeControl = observer<Props & React.HTMLAttributes<HTMLDivElem
     return (
       <div
         ref={ref}
-        tabIndex={0}
+        tabIndex={context.selected ? 0 : -1}
         title={title}
         aria-selected={context.selected}
         className={s(styles, { treeNodeControl: true }, className)}
+        data-tree-node-control
         onClick={handleClick}
         onMouseDown={handleMouseDown}
         onKeyDown={handleEnter}
diff --git a/webapp/packages/core-blocks/src/index.ts b/webapp/packages/core-blocks/src/index.ts
index 262666d64e..9cce50bbdc 100644
--- a/webapp/packages/core-blocks/src/index.ts
+++ b/webapp/packages/core-blocks/src/index.ts
@@ -244,6 +244,7 @@ export * from './Snackbars/Snackbar.js';
 export * from './Snackbars/ActionSnackbar.js';
 export * from './Snackbars/ProcessSnackbar.js';
 export * from './useUserData.js';
+export * from './useListKeyboardNavigation.js';
 export * from './useMergeRefs.js';
 export * from './usePasswordValidation.js';
 export * from './manifest.js';
diff --git a/webapp/packages/core-blocks/src/useListKeyboardNavigation.ts b/webapp/packages/core-blocks/src/useListKeyboardNavigation.ts
new file mode 100644
index 0000000000..04fe0f8e2c
--- /dev/null
+++ b/webapp/packages/core-blocks/src/useListKeyboardNavigation.ts
@@ -0,0 +1,100 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 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 { useEffect, useState } from 'react';
+
+import { EventContext } from '@cloudbeaver/core-events';
+
+export const EventKeyboardNavigationFlag = EventContext.create('useListKeyboardNavigation');
+
+export function useListKeyboardNavigation<T extends HTMLElement>(elementsSelector = '[tabindex]:not(:disabled)'): (obj: T | null) => void {
+  const [ref, setRef] = useState<T | null>(null);
+
+  useEffect(() => {
+    if (!ref) {
+      return;
+    }
+
+    const getFocusableElements = () => {
+      const allFocusableElements = Array.from(ref.querySelectorAll(elementsSelector)) as HTMLElement[];
+      return allFocusableElements;
+    };
+
+    // Function to reset tabindex on all elements and set it to 0 on aria-selected="true"
+    const resetTabindex = () => {
+      const focusableElements = getFocusableElements();
+      focusableElements.forEach(el => {
+        if (el.getAttribute('aria-selected') === 'true') {
+          el.setAttribute('tabindex', '0');
+        } else {
+          el.setAttribute('tabindex', '-1');
+        }
+      });
+    };
+
+    const handleKeyDown = (e: KeyboardEvent) => {
+      if (EventContext.has(e, EventKeyboardNavigationFlag) || !['ArrowRight', 'ArrowLeft', 'ArrowUp', 'ArrowDown'].includes(e.key)) {
+        return;
+      }
+
+      const focusableElements = getFocusableElements();
+      let currentIndex = focusableElements.findIndex(el => el === document.activeElement);
+
+      if (document.activeElement !== ref && currentIndex === -1) {
+        return;
+      }
+
+      let newIndex = currentIndex;
+
+      EventContext.set(e, EventKeyboardNavigationFlag);
+      e.preventDefault();
+
+      switch (e.key) {
+        case 'ArrowRight':
+        case 'ArrowDown':
+          newIndex = (currentIndex + 1) % focusableElements.length; // Move to next element
+
+          break;
+        case 'ArrowLeft':
+        case 'ArrowUp':
+          if (currentIndex === -1) {
+            currentIndex = 0;
+          }
+          newIndex = (currentIndex - 1 + focusableElements.length) % focusableElements.length; // Move to previous element
+
+          break;
+        default:
+          return;
+      }
+
+      // // Reset all tabindex to -1
+      focusableElements.forEach(el => el.setAttribute('tabindex', '-1'));
+
+      // Set the new element's tabindex to 0 and focus it
+      const nextElement = focusableElements[newIndex];
+      nextElement?.setAttribute('tabindex', '0');
+      nextElement?.focus();
+    };
+
+    const handleFocusOut = (e: FocusEvent) => {
+      // Check if the focus moved outside the container
+      if (!ref.contains(e.relatedTarget as Node)) {
+        resetTabindex();
+      }
+    };
+
+    ref.addEventListener('keydown', handleKeyDown);
+    ref.addEventListener('focusout', handleFocusOut);
+
+    return () => {
+      ref.removeEventListener('keydown', handleKeyDown);
+      ref.removeEventListener('focusout', handleFocusOut);
+    };
+  }, [ref, elementsSelector]);
+
+  return setRef;
+}
diff --git a/webapp/packages/core-connections/src/DBDriverResource.ts b/webapp/packages/core-connections/src/DBDriverResource.ts
index b961c0c4fd..e56aa5f08a 100644
--- a/webapp/packages/core-connections/src/DBDriverResource.ts
+++ b/webapp/packages/core-connections/src/DBDriverResource.ts
@@ -87,7 +87,7 @@ export class DBDriverResource extends CachedMapResource<string, DBDriver, DBDriv
 
   async addDriverLibraries(driverId: string, files: File[]) {
     await this.graphQLService.sdk.uploadDriverLibrary(driverId, files);
-    await this.refresh(driverId);
+    await this.markOutdated(driverId);
   }
 
   protected override dataSet(key: string, value: DBDriver): void {
diff --git a/webapp/packages/core-resource/src/Resource/ResourceOffsetPagination.ts b/webapp/packages/core-resource/src/Resource/ResourceOffsetPagination.ts
index cc021d0e37..87c74709ca 100644
--- a/webapp/packages/core-resource/src/Resource/ResourceOffsetPagination.ts
+++ b/webapp/packages/core-resource/src/Resource/ResourceOffsetPagination.ts
@@ -30,13 +30,7 @@ export class ResourceOffsetPagination<TKey, TMetadata extends ICachedResourceMet
       return undefined;
     }
 
-    const page = this.metadata.get(key as TKey).offsetPage;
-
-    if (!page || !isOffsetPageInRange(page, key.options)) {
-      return undefined;
-    }
-
-    return page;
+    return this.metadata.get(key as TKey).offsetPage;
   }
 
   hasNextPage(key: ResourceAlias<TKey, Readonly<ICachedResourceOffsetPageOptions>>): boolean {
diff --git a/webapp/packages/core-theming/src/styles/main/normalize.pure.css b/webapp/packages/core-theming/src/styles/main/normalize.pure.css
index 9b76547f4b..7e4765beb9 100644
--- a/webapp/packages/core-theming/src/styles/main/normalize.pure.css
+++ b/webapp/packages/core-theming/src/styles/main/normalize.pure.css
@@ -1,3 +1,10 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
 /*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
 
 /* Document
@@ -216,9 +223,9 @@ select {
  */
 
 button,
-[type="button"],
-[type="reset"],
-[type="submit"] {
+[type='button'],
+[type='reset'],
+[type='submit'] {
   -webkit-appearance: button;
 }
 
@@ -227,9 +234,9 @@ button,
  */
 
 button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
+[type='button']::-moz-focus-inner,
+[type='reset']::-moz-focus-inner,
+[type='submit']::-moz-focus-inner {
   border-style: none;
   padding: 0;
 }
@@ -239,9 +246,9 @@ button::-moz-focus-inner,
  */
 
 button:-moz-focusring,
-[type="button"]:-moz-focusring,
-[type="reset"]:-moz-focusring,
-[type="submit"]:-moz-focusring {
+[type='button']:-moz-focusring,
+[type='reset']:-moz-focusring,
+[type='submit']:-moz-focusring {
   outline: 1px dotted ButtonText;
 }
 
@@ -296,8 +303,8 @@ textarea {
  * 2. Remove the padding in IE 10.
  */
 
-[type="checkbox"],
-[type="radio"] {
+[type='checkbox'],
+[type='radio'] {
   box-sizing: border-box;
   /* 1 */
   padding: 0;
@@ -308,8 +315,8 @@ textarea {
  * Correct the cursor style of increment and decrement buttons in Chrome.
  */
 
-[type="number"]::-webkit-inner-spin-button,
-[type="number"]::-webkit-outer-spin-button {
+[type='number']::-webkit-inner-spin-button,
+[type='number']::-webkit-outer-spin-button {
   height: auto;
 }
 
@@ -318,18 +325,26 @@ textarea {
  * 2. Correct the outline style in Safari.
  */
 
-[type="search"] {
+[type='search'] {
   -webkit-appearance: textfield;
   /* 1 */
   outline-offset: -2px;
   /* 2 */
 }
 
+/**
+ * outline styles
+ */
+
+:focus-visible {
+  outline-offset: -1px;
+}
+
 /**
  * Remove the inner padding in Chrome and Safari on macOS.
  */
 
-[type="search"]::-webkit-search-decoration {
+[type='search']::-webkit-search-decoration {
   -webkit-appearance: none;
 }
 
diff --git a/webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBar.tsx b/webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBar.tsx
index 3ebb4b4a3a..b5648564d4 100644
--- a/webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBar.tsx
+++ b/webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBar.tsx
@@ -18,6 +18,8 @@ import {
   SContext,
   type StyleRegistry,
   useAutoLoad,
+  useListKeyboardNavigation,
+  useMergeRefs,
   useS,
 } from '@cloudbeaver/core-blocks';
 import { type IDataContext, useDataContextLink } from '@cloudbeaver/core-data-context';
@@ -52,6 +54,8 @@ const styleRegistry: StyleRegistry = [
 
 export const MenuBar = observer<IMenuBarProps, HTMLDivElement>(
   forwardRef(function MenuBar({ menu, nestedMenuSettings, rtl, className, ...props }, ref) {
+    const refNav = useListKeyboardNavigation();
+    const mergedRef = useMergeRefs(ref, refNav);
     const styles = useS(style);
     const items = menu.items;
     useAutoLoad(MenuBar, menu.loaders);
@@ -62,7 +66,7 @@ export const MenuBar = observer<IMenuBarProps, HTMLDivElement>(
 
     return (
       <SContext registry={styleRegistry}>
-        <div ref={ref} className={s(styles, { menuBar: true }, className)} {...props}>
+        <div ref={mergedRef} className={s(styles, { menuBar: true }, className)} tabIndex={0} {...props}>
           <Loader suspense small>
             {items.map(item => (
               <MenuBarElement key={item.id} item={item} menuData={menu} nestedMenuSettings={nestedMenuSettings} rtl={rtl} />
diff --git a/webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBarItem.tsx b/webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBarItem.tsx
index b611a599bf..cf884780b5 100644
--- a/webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBarItem.tsx
+++ b/webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBarItem.tsx
@@ -36,13 +36,17 @@ export const MenuBarItem = registry(
 
       const title = translate(rest.title);
       const Submenu = submenu;
+      const selected = rest['aria-selected'] === 'true';
+      const disabled = rest.disabled;
+      const tabIndex = selected ? 0 : -1;
+
       return (
         <div
-          className={s(styles, { menuBarItemGroup: true, hidden, disabled: rest.disabled }, className)}
+          className={s(styles, { menuBarItemGroup: true, hidden, disabled }, className)}
           aria-selected={rest['aria-selected']}
           aria-disabled={rest['aria-disabled']}
         >
-          <button ref={ref} className={s(styles, { menuBarItem: true })} {...rest} title={title} aria-label={title}>
+          <button ref={ref} className={s(styles, { menuBarItem: true })} tabIndex={tabIndex} {...rest} title={title} aria-label={title}>
             <div className={s(styles, { menuBarItemBox: true })}>
               {loading ? (
                 <div className={s(styles, { menuBarItemIcon: true })}>
diff --git a/webapp/packages/core-ui/src/Form/FormBaseService.ts b/webapp/packages/core-ui/src/Form/FormBaseService.ts
index f105caf187..7e699d3077 100644
--- a/webapp/packages/core-ui/src/Form/FormBaseService.ts
+++ b/webapp/packages/core-ui/src/Form/FormBaseService.ts
@@ -20,12 +20,10 @@ export class FormBaseService<TState, TProps extends IFormProps<TState> = IFormPr
   readonly parts: TabsContainer<TProps>;
   readonly actionsContainer: PlaceholderContainer<TProps>;
 
-  readonly onConfigure: IExecutorHandlersCollection<IFormState<TState>>;
-  readonly onFillDefaultConfig: IExecutorHandlersCollection<IFormState<TState>>;
-  readonly onPrepareConfig: IExecutorHandlersCollection<TState>;
   readonly onFormat: IExecutorHandlersCollection<IFormState<TState>>;
   readonly onValidate: IExecutorHandlersCollection<IFormState<TState>>;
   readonly onSubmit: IExecutorHandlersCollection<IFormState<TState>>;
+  readonly onLoaded: IExecutorHandlersCollection<IFormState<TState>>;
   readonly onState: IExecutorHandlersCollection<TState>;
 
   constructor(
@@ -35,17 +33,12 @@ export class FormBaseService<TState, TProps extends IFormProps<TState> = IFormPr
   ) {
     this.parts = new TabsContainer(name);
     this.actionsContainer = new PlaceholderContainer();
-    this.onConfigure = new ExecutorHandlersCollection();
-    this.onFillDefaultConfig = new ExecutorHandlersCollection();
-    this.onPrepareConfig = new ExecutorHandlersCollection();
     this.onFormat = new ExecutorHandlersCollection();
     this.onValidate = new ExecutorHandlersCollection();
     this.onSubmit = new ExecutorHandlersCollection();
+    this.onLoaded = new ExecutorHandlersCollection();
     this.onState = new ExecutorHandlersCollection();
 
-    this.onSubmit.before(this.onPrepareConfig);
-    this.onState.before(this.onPrepareConfig);
-
     this.onSubmit.addPostHandler(this.handleSubmittingStatus);
     this.onValidate.addPostHandler(this.handleValidation);
   }
diff --git a/webapp/packages/core-ui/src/Form/FormPart.ts b/webapp/packages/core-ui/src/Form/FormPart.ts
index 031a59e35c..65f78ff32d 100644
--- a/webapp/packages/core-ui/src/Form/FormPart.ts
+++ b/webapp/packages/core-ui/src/Form/FormPart.ts
@@ -127,6 +127,7 @@ export abstract class FormPart<TPartState, TFormState = any> implements IFormPar
       await this.promise;
       this.loaded = true;
       this.exception = null;
+      await this.formState.loadedTask.execute(this.formState);
     } catch (exception: any) {
       this.exception = exception;
     } finally {
diff --git a/webapp/packages/core-ui/src/Form/FormState.ts b/webapp/packages/core-ui/src/Form/FormState.ts
index 7bf9e76bf8..25bcc384d3 100644
--- a/webapp/packages/core-ui/src/Form/FormState.ts
+++ b/webapp/packages/core-ui/src/Form/FormState.ts
@@ -44,7 +44,7 @@ export class FormState<TState> implements IFormState<TState> {
   readonly dataContext: IDataContext;
 
   readonly formStateTask: IExecutor<TState>;
-  readonly fillDefaultConfigTask: IExecutor<IFormState<TState>>;
+  readonly loadedTask: IExecutor<IFormState<TState>>;
   readonly submitTask: IExecutor<IFormState<TState>>;
   readonly formatTask: IExecutor<IFormState<TState>>;
   readonly validationTask: IExecutor<IFormState<TState>>;
@@ -66,8 +66,8 @@ export class FormState<TState> implements IFormState<TState> {
     this.formStateTask = new Executor<TState>(state, () => true);
     this.formStateTask.addCollection(service.onState).addPostHandler(this.updateFormState.bind(this));
 
-    this.fillDefaultConfigTask = new Executor(this as IFormState<TState>, () => true);
-    this.fillDefaultConfigTask.addCollection(service.onFillDefaultConfig).next(this.formStateTask, form => form.state);
+    this.loadedTask = new Executor(this as IFormState<TState>, () => true);
+    this.loadedTask.addCollection(service.onLoaded).next(this.formStateTask).addPostHandler(this.onLoadedHandler.bind(this));
 
     this.formatTask = new Executor(this as IFormState<TState>, () => true);
     this.formatTask.addCollection(service.onFormat);
@@ -82,7 +82,7 @@ export class FormState<TState> implements IFormState<TState> {
     this.dataContext.set(DATA_CONTEXT_FORM_STATE, this, this.id);
     dataContextAddDIProvider(this.dataContext, serviceProvider, this.id);
 
-    makeObservable<this>(this, {
+    makeObservable<this, 'updateFormState'>(this, {
       mode: observable,
       parts: observable.ref,
       promise: observable.ref,
@@ -93,6 +93,7 @@ export class FormState<TState> implements IFormState<TState> {
       setMode: action,
       setPartsState: action,
       setState: action,
+      updateFormState: action,
       isChanged: computed,
       partsValues: computed<IFormPart<any>[]>({
         equals: isArraysEqual,
@@ -182,6 +183,15 @@ export class FormState<TState> implements IFormState<TState> {
     return false;
   }
 
+  private onLoadedHandler(data: IFormState<TState>, contexts: IExecutionContextProvider<IFormState<TState>>): void {
+    for (const part of this.parts.values()) {
+      if (!part.isLoaded()) {
+        ExecutorInterrupter.interrupt(contexts);
+        return;
+      }
+    }
+  }
+
   private updateFormState(data: TState, contexts: IExecutionContextProvider<TState>): void {
     const context = contexts.getContext(formStateContext);
 
diff --git a/webapp/packages/core-ui/src/Form/IFormState.ts b/webapp/packages/core-ui/src/Form/IFormState.ts
index 7bb4132074..4b30e0589b 100644
--- a/webapp/packages/core-ui/src/Form/IFormState.ts
+++ b/webapp/packages/core-ui/src/Form/IFormState.ts
@@ -30,8 +30,8 @@ export interface IFormState<TState> {
   readonly statusMessage: string | string[] | null;
   readonly statusType: ENotificationType | null;
 
+  readonly loadedTask: IExecutor<IFormState<TState>>;
   readonly formStateTask: IExecutor<TState>;
-  readonly fillDefaultConfigTask: IExecutor<IFormState<TState>>;
   readonly submitTask: IExecutor<IFormState<TState>>;
   readonly formatTask: IExecutor<IFormState<TState>>;
   readonly validationTask: IExecutor<IFormState<TState>>;
diff --git a/webapp/packages/core-ui/src/Tabs/Tab/Tab.module.css b/webapp/packages/core-ui/src/Tabs/Tab/Tab.module.css
index a75d5d9e2e..fce572857d 100644
--- a/webapp/packages/core-ui/src/Tabs/Tab/Tab.module.css
+++ b/webapp/packages/core-ui/src/Tabs/Tab/Tab.module.css
@@ -12,7 +12,6 @@
 
 .tab {
   position: relative;
-  outline: none;
   font-weight: normal;
   cursor: pointer;
   padding: 0;
@@ -28,7 +27,7 @@
     border-top-color: var(--theme-negative);
     opacity: 1;
 
-    &:before {
+    &:not(:focus-visible):before {
       display: none;
     }
   }
diff --git a/webapp/packages/core-ui/src/Tabs/Tab/TabUnderline.module.css b/webapp/packages/core-ui/src/Tabs/Tab/TabUnderline.module.css
index 5d4d9703b4..bc3f9172a1 100644
--- a/webapp/packages/core-ui/src/Tabs/Tab/TabUnderline.module.css
+++ b/webapp/packages/core-ui/src/Tabs/Tab/TabUnderline.module.css
@@ -15,7 +15,6 @@
     color: inherit;
     border: none;
     border-bottom: 2px solid var(--theme-primary);
-    outline: none;
     opacity: 1;
     border-top: none;
     font-weight: normal;
diff --git a/webapp/packages/core-ui/src/Tabs/TabList.module.css b/webapp/packages/core-ui/src/Tabs/TabList.module.css
index 4efc908985..f6d05424ea 100644
--- a/webapp/packages/core-ui/src/Tabs/TabList.module.css
+++ b/webapp/packages/core-ui/src/Tabs/TabList.module.css
@@ -9,7 +9,6 @@
 .tabList {
   display: flex;
   box-sizing: border-box;
-  outline: none;
 }
 
 .underline {
diff --git a/webapp/packages/core-ui/src/Tabs/TabListVertical.module.css b/webapp/packages/core-ui/src/Tabs/TabListVertical.module.css
index 64e1a102ff..2938cf8c1e 100644
--- a/webapp/packages/core-ui/src/Tabs/TabListVertical.module.css
+++ b/webapp/packages/core-ui/src/Tabs/TabListVertical.module.css
@@ -12,5 +12,4 @@
   flex: 0 0 auto;
   min-width: 150px;
   overflow: auto;
-  outline: none;
 }
diff --git a/webapp/packages/core-ui/src/Tabs/TabListVerticalRotated.module.css b/webapp/packages/core-ui/src/Tabs/TabListVerticalRotated.module.css
index f8ef5e818e..abadaa4eca 100644
--- a/webapp/packages/core-ui/src/Tabs/TabListVerticalRotated.module.css
+++ b/webapp/packages/core-ui/src/Tabs/TabListVerticalRotated.module.css
@@ -9,7 +9,6 @@
 .vertical.rotated.tabList {
   display: flex;
   gap: 4px;
-  outline: none;
   max-width: 32px;
   overflow: hidden;
   flex-direction: column;
diff --git a/webapp/packages/core-ui/src/Tabs/TabPanel.module.css b/webapp/packages/core-ui/src/Tabs/TabPanel.module.css
index 85708e2813..fe59718e15 100644
--- a/webapp/packages/core-ui/src/Tabs/TabPanel.module.css
+++ b/webapp/packages/core-ui/src/Tabs/TabPanel.module.css
@@ -7,7 +7,6 @@
  */
 
 .tabPanel {
-  outline: none;
   position: relative;
 
   &:not(.contents) {
diff --git a/webapp/packages/core-ui/src/Tabs/TabsBox/TabsBox.tsx b/webapp/packages/core-ui/src/Tabs/TabsBox/TabsBox.tsx
index b3476bcf38..b6c1913004 100644
--- a/webapp/packages/core-ui/src/Tabs/TabsBox/TabsBox.tsx
+++ b/webapp/packages/core-ui/src/Tabs/TabsBox/TabsBox.tsx
@@ -58,7 +58,7 @@ export const TabsBox = forwardRef<HTMLDivElement, TabsBoxProps>(function TabsBox
         enabledBaseActions={enabledBaseActions}
         onChange={onChange}
       >
-        <div ref={ref} className={s(style, { tabsBox: true }, className)} tabIndex={tabIndex}>
+        <div ref={ref} className={s(style, { tabsBox: true }, className)} tabIndex={tabIndex ?? -1}>
           {tabs && <div className={s(style, { tabs: true }, tabsClassName)}>{tabs}</div>}
           <div className={s(style, { tabPanels: true })}>{children}</div>
         </div>
diff --git a/webapp/packages/core-ui/src/Tabs/TabsBox/shared/TabsBoxTabPanel.module.css b/webapp/packages/core-ui/src/Tabs/TabsBox/shared/TabsBoxTabPanel.module.css
index 7cdb7c6e4c..8cdf752f9e 100644
--- a/webapp/packages/core-ui/src/Tabs/TabsBox/shared/TabsBoxTabPanel.module.css
+++ b/webapp/packages/core-ui/src/Tabs/TabsBox/shared/TabsBoxTabPanel.module.css
@@ -10,6 +10,5 @@
   flex: 1;
   display: flex;
   overflow: hidden;
-  outline: none;
   position: relative;
 }
diff --git a/webapp/packages/core-view/src/View/CaptureView.module.css b/webapp/packages/core-view/src/View/CaptureView.module.css
index de5ca4948e..53d59b62ce 100644
--- a/webapp/packages/core-view/src/View/CaptureView.module.css
+++ b/webapp/packages/core-view/src/View/CaptureView.module.css
@@ -5,6 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-.container {
+.container:not(:focus-visible) {
   outline: none;
 }
diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationFormPart.ts b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationFormPart.ts
index f0a03e3e7e..a38730c334 100644
--- a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationFormPart.ts
+++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationFormPart.ts
@@ -97,6 +97,14 @@ export class ServerConfigurationFormPart extends FormPart<IServerConfigurationFo
     }
   }
 
+  override get isChanged(): boolean {
+    if (this.loaded && this.administrationScreenService.isConfigurationMode) {
+      return true;
+    }
+
+    return super.isChanged;
+  }
+
   protected override async saveChanges() {
     if (!isObjectsEqual(this.state.navigatorConfig, this.initialState.navigatorConfig)) {
       await this.defaultNavigatorSettingsResource.save(this.state.navigatorConfig);
diff --git a/webapp/packages/plugin-administration/src/index.ts b/webapp/packages/plugin-administration/src/index.ts
index 0aab2652e4..cec5d64acc 100644
--- a/webapp/packages/plugin-administration/src/index.ts
+++ b/webapp/packages/plugin-administration/src/index.ts
@@ -19,3 +19,4 @@ export * from './ConfigurationWizard/ServerConfiguration/Form/ServerConfiguratio
 export * from './ConfigurationWizard/ServerConfiguration/IServerConfigurationPageState.js';
 export * from './ConfigurationWizard/ServerConfiguration/ServerConfigurationService.js';
 export * from './ConfigurationWizard/ServerConfigurationAdministrationNavService.js';
+export * from './ConfigurationWizard/ServerConfiguration/ADMINISTRATION_SERVER_CONFIGURATION_ITEM.js';
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Origin/UserFormOriginInfoPanel.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Origin/UserFormOriginInfoPanel.tsx
index 353a370913..1b07d91b50 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Origin/UserFormOriginInfoPanel.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Origin/UserFormOriginInfoPanel.tsx
@@ -5,6 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
+import { observable } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import { Fragment } from 'react';
 
@@ -17,13 +18,14 @@ import {
   Group,
   GroupItem,
   ObjectPropertyInfoForm,
+  useObservableRef,
   useResource,
   useTranslate,
 } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { CommonDialogService, DialogueStateResult } from '@cloudbeaver/core-dialogs';
 import { NotificationService } from '@cloudbeaver/core-events';
-import { FormMode, type TabContainerPanelComponent, useTab, useTabState } from '@cloudbeaver/core-ui';
+import { FormMode, type TabContainerPanelComponent, useTab } from '@cloudbeaver/core-ui';
 
 import type { UserFormProps } from '../AdministrationUserFormService.js';
 
@@ -39,9 +41,15 @@ export const UserFormOriginInfoPanel: TabContainerPanelComponent<UserFormProps>
 }) {
   const translate = useTranslate();
   const editing = mode === FormMode.Edit;
-  const localState = useTabState<IState>(() => ({
-    selectedOrigin: '0',
-  }));
+  const localState = useObservableRef<IState>(
+    () => ({
+      selectedOrigin: '0',
+    }),
+    {
+      selectedOrigin: observable.ref,
+    },
+    false,
+  );
   const userInfoLoader = useResource(UserFormOriginInfoPanel, UsersResource, state.userId, {
     active: editing,
   });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Origin/UserFormOriginPartBootstrap.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Origin/UserFormOriginPartBootstrap.ts
index b04ff82546..173f07549c 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Origin/UserFormOriginPartBootstrap.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Origin/UserFormOriginPartBootstrap.ts
@@ -7,7 +7,6 @@
  */
 import React from 'react';
 
-import { UsersResource } from '@cloudbeaver/core-authentication';
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { FormMode } from '@cloudbeaver/core-ui';
 
@@ -25,10 +24,7 @@ const UserFormOriginInfoTab = React.lazy(async () => {
 
 @injectable()
 export class UserFormOriginPartBootstrap extends Bootstrap {
-  constructor(
-    private readonly administrationUserFormService: AdministrationUserFormService,
-    private readonly usersResource: UsersResource,
-  ) {
+  constructor(private readonly administrationUserFormService: AdministrationUserFormService) {
     super();
   }
 
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUserBootstrap.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUserBootstrap.ts
index d9d393a554..091ac18c5f 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUserBootstrap.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUserBootstrap.ts
@@ -38,10 +38,11 @@ export class CreateUserBootstrap extends Bootstrap {
 
     this.actionService.addHandler({
       id: 'users-table-base',
+      menus: [MENU_USERS_ADMINISTRATION],
       actions: [ACTION_CREATE],
-      isActionApplicable: (context, action) => {
-        if (action === ACTION_CREATE && !this.administrationUsersManagementService.externalUserProviderEnabled) {
-          return this.authProvidersResource.has(AUTH_PROVIDER_LOCAL_ID);
+      isHidden: (context, action) => {
+        if (action === ACTION_CREATE) {
+          return this.administrationUsersManagementService.externalUserProviderEnabled || !this.authProvidersResource.has(AUTH_PROVIDER_LOCAL_ID);
         }
 
         return false;
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/Filters/UsersTableFilters.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/Filters/UsersTableFilters.tsx
index 603250a291..de91f23469 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/Filters/UsersTableFilters.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/Filters/UsersTableFilters.tsx
@@ -8,11 +8,11 @@
 import { observer } from 'mobx-react-lite';
 import { useState } from 'react';
 
-import { AuthRolesResource } from '@cloudbeaver/core-authentication';
-import { Combobox, Filter, Group, IconOrImage, s, useResource, useS, useTranslate } from '@cloudbeaver/core-blocks';
+import { Filter, Group, IconOrImage, Loader, s, useS, useTranslate } from '@cloudbeaver/core-blocks';
 
 import styles from './UsersTableFilters.module.css';
-import { type IUserFilters, USER_ROLE_ALL, USER_STATUSES } from './useUsersTableFilters.js';
+import { UsersTableFiltersDetails } from './UsersTableFiltersDetails.js';
+import { type IUserFilters } from './useUsersTableFilters.js';
 
 interface Props {
   filters: IUserFilters;
@@ -21,7 +21,6 @@ interface Props {
 export const UsersTableFilters = observer<Props>(function UsersTableFilters({ filters }) {
   const translate = useTranslate();
   const style = useS(styles);
-  const authRolesResource = useResource(UsersTableFilters, AuthRolesResource, undefined);
 
   const [open, setOpen] = useState(false);
 
@@ -42,23 +41,9 @@ export const UsersTableFilters = observer<Props>(function UsersTableFilters({ fi
       </div>
 
       {open && (
-        <Group box gap>
-          <Combobox
-            value={filters.status}
-            items={USER_STATUSES}
-            valueSelector={value => translate(value.label)}
-            keySelector={value => value.value}
-            keepSize
-            onSelect={filters.setStatus}
-          >
-            {translate('authentication_user_status')}
-          </Combobox>
-          {!!authRolesResource.data.length && (
-            <Combobox items={[...authRolesResource.data, USER_ROLE_ALL]} value={filters.role} keepSize onSelect={filters.setRole}>
-              {translate('authentication_user_role')}
-            </Combobox>
-          )}
-        </Group>
+        <Loader suspense inline>
+          <UsersTableFiltersDetails filters={filters} />
+        </Loader>
       )}
     </Group>
   );
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/Filters/UsersTableFiltersDetails.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/Filters/UsersTableFiltersDetails.tsx
new file mode 100644
index 0000000000..ea55448799
--- /dev/null
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/Filters/UsersTableFiltersDetails.tsx
@@ -0,0 +1,42 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 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 { observer } from 'mobx-react-lite';
+
+import { AuthRolesResource } from '@cloudbeaver/core-authentication';
+import { Combobox, Group, useResource, useTranslate } from '@cloudbeaver/core-blocks';
+
+import { type IUserFilters, USER_ROLE_ALL, USER_STATUSES } from './useUsersTableFilters.js';
+
+interface Props {
+  filters: IUserFilters;
+}
+
+export const UsersTableFiltersDetails = observer<Props>(function UsersTableFiltersDetails({ filters }) {
+  const translate = useTranslate();
+  const authRolesResource = useResource(UsersTableFiltersDetails, AuthRolesResource, undefined);
+
+  return (
+    <Group box gap>
+      <Combobox
+        value={filters.status}
+        items={USER_STATUSES}
+        valueSelector={value => translate(value.label)}
+        keySelector={value => value.value}
+        keepSize
+        onSelect={filters.setStatus}
+      >
+        {translate('authentication_user_status')}
+      </Combobox>
+      {!!authRolesResource.data.length && (
+        <Combobox items={[...authRolesResource.data, USER_ROLE_ALL]} value={filters.role} keepSize onSelect={filters.setRole}>
+          {translate('authentication_user_role')}
+        </Combobox>
+      )}
+    </Group>
+  );
+});
diff --git a/webapp/packages/plugin-authentication-administration/src/locales/en.ts b/webapp/packages/plugin-authentication-administration/src/locales/en.ts
index ad0780f4be..4e61e5157e 100644
--- a/webapp/packages/plugin-authentication-administration/src/locales/en.ts
+++ b/webapp/packages/plugin-authentication-administration/src/locales/en.ts
@@ -95,6 +95,7 @@ export default [
   ['administration_identity_providers_wizard_description', 'Add identity providers'],
   ['administration_identity_providers_configuration_add', 'Configuration creation'],
   ['administration_identity_providers_choose_provider_placeholder', 'Select provider...'],
+  ['administration_identity_providers_choose_provider_placeholder_empty', 'No available providers'],
   ['administration_identity_providers_add_tooltip', 'Add new configuration'],
   ['administration_identity_providers_refresh_tooltip', 'Refresh configuration list'],
   ['administration_identity_providers_delete_tooltip', 'Delete selected configurations'],
diff --git a/webapp/packages/plugin-authentication-administration/src/locales/fr.ts b/webapp/packages/plugin-authentication-administration/src/locales/fr.ts
index 276217c574..c9351c4be1 100644
--- a/webapp/packages/plugin-authentication-administration/src/locales/fr.ts
+++ b/webapp/packages/plugin-authentication-administration/src/locales/fr.ts
@@ -98,6 +98,7 @@ export default [
   ['administration_identity_providers_wizard_description', "Ajouter des fournisseurs d'identité"],
   ['administration_identity_providers_configuration_add', 'Création de configuration'],
   ['administration_identity_providers_choose_provider_placeholder', 'Sélectionner un fournisseur...'],
+  ['administration_identity_providers_choose_provider_placeholder_empty', 'No available providers'],
   ['administration_identity_providers_add_tooltip', 'Ajouter une nouvelle configuration'],
   ['administration_identity_providers_refresh_tooltip', 'Rafraîchir la liste des configurations'],
   ['administration_identity_providers_delete_tooltip', 'Supprimer les configurations sélectionnées'],
diff --git a/webapp/packages/plugin-authentication-administration/src/locales/ru.ts b/webapp/packages/plugin-authentication-administration/src/locales/ru.ts
index bad87efebe..70e9a8873a 100644
--- a/webapp/packages/plugin-authentication-administration/src/locales/ru.ts
+++ b/webapp/packages/plugin-authentication-administration/src/locales/ru.ts
@@ -97,6 +97,7 @@ export default [
   ['administration_identity_providers_wizard_description', 'Добавьте провайдеры идентификации'],
   ['administration_identity_providers_configuration_add', 'Создание конфигурации'],
   ['administration_identity_providers_choose_provider_placeholder', 'Выберите провайдер...'],
+  ['administration_identity_providers_choose_provider_placeholder_empty', 'Нет доступных провайдеров'],
   ['administration_identity_providers_add_tooltip', 'Добавить новую конфигурацию'],
   ['administration_identity_providers_refresh_tooltip', 'Обновить список конфигураций'],
   ['administration_identity_providers_delete_tooltip', 'Удалить выбранные конфигурации'],
diff --git a/webapp/packages/plugin-authentication-administration/src/locales/zh.ts b/webapp/packages/plugin-authentication-administration/src/locales/zh.ts
index d2818eb3de..56a7fb058e 100644
--- a/webapp/packages/plugin-authentication-administration/src/locales/zh.ts
+++ b/webapp/packages/plugin-authentication-administration/src/locales/zh.ts
@@ -49,10 +49,7 @@ export default [
 
   ['authentication_administration_user_delete_credentials_error', '删除用户凭证失败'],
   ['authentication_administration_user_delete_credentials_success', '用户凭证已移除'],
-  [
-    'authentication_administration_user_delete_credentials_confirmation_message',
-    '确定要从“{arg：userId}”中删除“{arg：originName}”身份验证方法吗?',
-  ],
+  ['authentication_administration_user_delete_credentials_confirmation_message', '确定要从“{arg：userId}”中删除“{arg：originName}”身份验证方法吗?'],
 
   ['administration_configuration_wizard_configuration_admin', '管理员凭据'],
   ['administration_configuration_wizard_configuration_admin_name', '登录'],
@@ -91,6 +88,7 @@ export default [
   ['administration_identity_providers_wizard_description', '添加身份提供者'],
   ['administration_identity_providers_configuration_add', '创建配置'],
   ['administration_identity_providers_choose_provider_placeholder', '选择提供者...'],
+  ['administration_identity_providers_choose_provider_placeholder_empty', 'No available providers'],
   ['administration_identity_providers_add_tooltip', '添加新配置'],
   ['administration_identity_providers_refresh_tooltip', '刷新配置列表'],
   ['administration_identity_providers_delete_tooltip', '删除选中配置'],
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridTable.tsx b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridTable.tsx
index 31f1b5cd8a..07057d8a7c 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridTable.tsx
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridTable.tsx
@@ -60,7 +60,7 @@ const rowHeight = 25;
 const headerHeight = 28;
 const MAX_CELL_TEXT_SIZE = 100 * 1024;
 
-export const DataGridTable = observer<IDataPresentationProps>(function DataGridTable({ model, actions, resultIndex, simple, className }) {
+export const DataGridTable = observer<IDataPresentationProps>(function DataGridTable({ model, actions, resultIndex, simple, className, ...rest }) {
   const translate = useTranslate();
   const styles = useS(classes);
 
@@ -456,8 +456,9 @@ export const DataGridTable = observer<IDataPresentationProps>(function DataGridT
           <TableDataContext.Provider value={tableData}>
             <div
               ref={setContainersRef}
-              className={s(styles, { container: true }, className)}
               tabIndex={-1}
+              {...rest}
+              className={s(styles, { container: true }, className)}
               onKeyDown={handleKeyDown}
               onMouseDown={onMouseDownHandler}
               onMouseMove={onMouseMoveHandler}
diff --git a/webapp/packages/plugin-data-viewer/src/DataPresentationService.ts b/webapp/packages/plugin-data-viewer/src/DataPresentationService.ts
index f6b287a231..2a543d3d1a 100644
--- a/webapp/packages/plugin-data-viewer/src/DataPresentationService.ts
+++ b/webapp/packages/plugin-data-viewer/src/DataPresentationService.ts
@@ -5,6 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
+import type { HTMLAttributes } from 'react';
+
 import { injectable } from '@cloudbeaver/core-di';
 import type { ResultDataFormat } from '@cloudbeaver/core-sdk';
 import type { TabProps } from '@cloudbeaver/core-ui';
@@ -12,7 +14,7 @@ import type { TabProps } from '@cloudbeaver/core-ui';
 import type { IDatabaseDataModel } from './DatabaseDataModel/IDatabaseDataModel.js';
 import type { IDataTableActions } from './TableViewer/IDataTableActions.js';
 
-export interface IDataPresentationProps {
+export interface IDataPresentationProps extends HTMLAttributes<HTMLDivElement> {
   dataFormat: ResultDataFormat;
   model: IDatabaseDataModel;
   actions: IDataTableActions;
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/DataPresentation.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/DataPresentation.tsx
index 36433921a3..b8a3e15432 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/DataPresentation.tsx
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/DataPresentation.tsx
@@ -6,6 +6,7 @@
  * you may not use this file except in compliance with the License.
  */
 import { observer } from 'mobx-react-lite';
+import type { HTMLAttributes } from 'react';
 
 import { s, TextPlaceholder } from '@cloudbeaver/core-blocks';
 import type { ResultDataFormat } from '@cloudbeaver/core-sdk';
@@ -16,7 +17,7 @@ import styles from './DataPresentation.module.css';
 import type { IDataTableActions } from './IDataTableActions.js';
 import { TableStatistics } from './TableStatistics.js';
 
-interface Props {
+interface Props extends HTMLAttributes<HTMLDivElement> {
   model: IDatabaseDataModel;
   actions: IDataTableActions;
   dataFormat: ResultDataFormat;
@@ -34,6 +35,7 @@ export const DataPresentation = observer<Props>(function DataPresentation({
   resultIndex,
   simple,
   isStatistics,
+  ...rest
 }) {
   if ((presentation.dataFormat !== undefined && dataFormat !== presentation.dataFormat) || !model.source.hasResult(resultIndex)) {
     if (model.isLoading()) {
@@ -41,13 +43,13 @@ export const DataPresentation = observer<Props>(function DataPresentation({
     }
 
     // eslint-disable-next-line react/no-unescaped-entities
-    return <TextPlaceholder>Current data can't be displayed by selected presentation</TextPlaceholder>;
+    return <TextPlaceholder {...rest}>Current data can't be displayed by selected presentation</TextPlaceholder>;
   }
 
   const Presentation = presentation.getPresentationComponent();
 
   if (isStatistics) {
-    return <TableStatistics model={model} resultIndex={resultIndex} />;
+    return <TableStatistics {...rest} model={model} resultIndex={resultIndex} />;
   }
 
   return (
@@ -58,6 +60,7 @@ export const DataPresentation = observer<Props>(function DataPresentation({
       resultIndex={resultIndex}
       simple={simple}
       className={s(styles, { presentation: true })}
+      {...rest}
     />
   );
 });
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooter.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooter.tsx
index 0d0d703d4c..d9dd475b21 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooter.tsx
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooter.tsx
@@ -6,6 +6,7 @@
  * you may not use this file except in compliance with the License.
  */
 import { observer } from 'mobx-react-lite';
+import type { HTMLAttributes } from 'react';
 
 import { Container, Fill, s, ToolsPanel, useS, useTranslate } from '@cloudbeaver/core-blocks';
 
@@ -13,18 +14,18 @@ import type { IDatabaseDataModel } from '../../DatabaseDataModel/IDatabaseDataMo
 import styles from './TableFooter.module.css';
 import { TableFooterMenu } from './TableFooterMenu/TableFooterMenu.js';
 
-interface Props {
+interface Props extends HTMLAttributes<HTMLDivElement> {
   resultIndex: number;
   model: IDatabaseDataModel;
   simple: boolean;
 }
 
-export const TableFooter = observer<Props>(function TableFooter({ resultIndex, model, simple }) {
+export const TableFooter = observer<Props>(function TableFooter({ resultIndex, model, simple, ...rest }) {
   const translate = useTranslate();
   const style = useS(styles);
 
   return (
-    <ToolsPanel type="secondary" center minHeight>
+    <ToolsPanel type="secondary" role="toolbar" center minHeight {...rest}>
       <TableFooterMenu model={model} resultIndex={resultIndex} simple={simple} />
       {model.source.requestInfo.requestMessage && (
         <>
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/TableFooterMenu.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/TableFooterMenu.tsx
index 6cc8f11177..d86808b495 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/TableFooterMenu.tsx
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/TableFooterMenu.tsx
@@ -6,6 +6,7 @@
  * you may not use this file except in compliance with the License.
  */
 import { observer } from 'mobx-react-lite';
+import type { HTMLAttributes } from 'react';
 
 import { CRegistry, s, useS } from '@cloudbeaver/core-blocks';
 import { useDataContextLink } from '@cloudbeaver/core-data-context';
@@ -24,9 +25,10 @@ interface Props {
   model: IDatabaseDataModel;
   simple: boolean;
   className?: string;
+  role?: HTMLAttributes<HTMLDivElement>['role'];
 }
 
-export const TableFooterMenu = observer<Props>(function TableFooterMenu({ resultIndex, model, simple, className }) {
+export const TableFooterMenu = observer<Props>(function TableFooterMenu({ resultIndex, model, simple, role, className }) {
   const styles = useS(MenuBarStyles, MenuBarItemStyles);
   const menu = useMenu({ menu: DATA_VIEWER_DATA_MODEL_ACTIONS_MENU });
 
@@ -38,7 +40,7 @@ export const TableFooterMenu = observer<Props>(function TableFooterMenu({ result
 
   return (
     <CRegistry registry={REFRESH_MENU_ITEM_REGISTRY}>
-      <MenuBar menu={menu} className={s(styles, { floating: true, withLabel: true }, className)} />
+      <MenuBar menu={menu} className={s(styles, { floating: true, withLabel: true }, className)} role={role} />
     </CRegistry>
   );
 });
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/TableHeader.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/TableHeader.tsx
index 43d8efe713..dc53645fed 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/TableHeader.tsx
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/TableHeader.tsx
@@ -19,14 +19,16 @@ interface Props {
   resultIndex: number;
   simple: boolean;
   className?: string;
+  tabIndex?: number;
+  'data-table-header'?: boolean;
 }
 
-export const TableHeader = observer<Props>(function TableHeader({ model, resultIndex, simple, className }) {
+export const TableHeader = observer<Props>(function TableHeader({ model, resultIndex, simple, className, ...rest }) {
   const styles = useS(classes);
   const service = useService(TableHeaderService);
 
   return (
-    <header className={s(styles, { tableHeader: true }, className)}>
+    <header {...rest} className={s(styles, { tableHeader: true }, className)}>
       <Placeholder container={service.tableHeaderPlaceholder} model={model} resultIndex={resultIndex} simple={simple} />
     </header>
   );
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TablePresentationBar/TablePresentationBar.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TablePresentationBar/TablePresentationBar.tsx
index 27cddf42dd..89251c505a 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TablePresentationBar/TablePresentationBar.tsx
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TablePresentationBar/TablePresentationBar.tsx
@@ -6,6 +6,7 @@
  * you may not use this file except in compliance with the License.
  */
 import { observer } from 'mobx-react-lite';
+import type { HTMLAttributes } from 'react';
 
 import { s, SContext, type StyleRegistry, useS } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
@@ -19,7 +20,7 @@ import styles from './shared/TablePresentationBar.module.css';
 import TablePresentationBarTab from './shared/TablePresentationBarTab.module.css';
 import TablePresentationBarTabList from './shared/TablePresentationBarTabList.module.css';
 
-interface Props {
+interface Props extends HTMLAttributes<HTMLDivElement> {
   type: DataPresentationType;
   presentationId: string | null | undefined;
   dataFormat: ResultDataFormat;
@@ -46,6 +47,7 @@ export const TablePresentationBar = observer<Props>(function TablePresentationBa
   className,
   onPresentationChange,
   onClose,
+  ...rest
 }) {
   const style = useS(styles);
   const dataPresentationService = useService(DataPresentationService);
@@ -66,7 +68,7 @@ export const TablePresentationBar = observer<Props>(function TablePresentationBa
   }
 
   return (
-    <div className={s(style, { tableLeftBar: true }, className)}>
+    <div {...rest} className={s(style, { tableLeftBar: true }, className)}>
       <TabsState currentTabId={presentationId} autoSelect={main}>
         <SContext registry={tablePresentationBarRegistry}>
           <TabList className={s(style, { tabListFlexible: main })} aria-label="Data Presentations" vertical rotated>
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableStatistics.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableStatistics.tsx
index b8c312cc78..de6a607309 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableStatistics.tsx
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableStatistics.tsx
@@ -6,6 +6,7 @@
  * you may not use this file except in compliance with the License.
  */
 import { observer } from 'mobx-react-lite';
+import type { HTMLAttributes } from 'react';
 
 import { s, useS, useTranslate } from '@cloudbeaver/core-blocks';
 
@@ -14,12 +15,12 @@ import { type IDatabaseResultSet } from '../DatabaseDataModel/IDatabaseResultSet
 import { isResultSetDataSource, ResultSetDataSource } from '../ResultSet/ResultSetDataSource.js';
 import classes from './TableStatistics.module.css';
 
-interface Props {
+interface Props extends HTMLAttributes<HTMLDivElement> {
   model: IDatabaseDataModel;
   resultIndex: number;
 }
 
-export const TableStatistics = observer<Props>(function TableStatistics({ model, resultIndex }) {
+export const TableStatistics = observer<Props>(function TableStatistics({ model, resultIndex, ...rest }) {
   const styles = useS(classes);
   const translate = useTranslate();
   const source = model.source;
@@ -31,7 +32,7 @@ export const TableStatistics = observer<Props>(function TableStatistics({ model,
   }
 
   return (
-    <div className={s(styles, { statistics: true })}>
+    <div {...rest} className={s(styles, { statistics: true })}>
       {translate('data_viewer_statistics_status')} {translate(source.requestInfo.requestMessage)}
       <br />
       {translate('data_viewer_statistics_duration')} {source.requestInfo.requestDuration} {translate('ui_ms')}
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewer.module.css b/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewer.module.css
index 1822a00754..e90a7df12f 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewer.module.css
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewer.module.css
@@ -51,6 +51,16 @@
   flex-direction: column;
   overflow: hidden;
 }
+.paneContent.grid:focus-visible::after {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  outline-offset: -1px;
+  outline: var(--theme-primary) auto 1px;
+}
 .pane {
   &:first-child {
     position: relative;
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewer.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewer.tsx
index 94006ea567..6a3ecc1d11 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewer.tsx
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewer.tsx
@@ -17,6 +17,8 @@ import {
   s,
   Split,
   TextPlaceholder,
+  useListKeyboardNavigation,
+  useMergeRefs,
   useObjectRef,
   useObservableRef,
   useS,
@@ -69,6 +71,10 @@ export const TableViewer = observer<TableViewerProps, HTMLDivElement>(
     const loading = dataModel?.isLoading() ?? true;
     const dataFormat = result?.dataFormat || ResultDataFormat.Resultset;
     const splitState = useSplitUserState('table-viewer');
+    const navRef = useListKeyboardNavigation(
+      '[data-presentation][tabindex]:not(:disabled), [data-presentation-tools][tabindex]:not(:disabled), [data-presentation-header][tabindex]:not(:disabled), [data-presentation-bar][tabindex]:not(:disabled)',
+    );
+    const mergedRef = useMergeRefs(ref, navRef);
 
     const localActions = useObjectRef({
       clearConstraints() {
@@ -201,7 +207,7 @@ export const TableViewer = observer<TableViewerProps, HTMLDivElement>(
 
     return (
       <CaptureView className={s(styles, { captureView: true })} view={dataViewerView}>
-        <div ref={ref} className={s(styles, { tableViewer: true }, className)}>
+        <div ref={mergedRef} tabIndex={0} className={s(styles, { tableViewer: true }, className)}>
           <div className={s(styles, { tableContent: true })}>
             {!isStatistics && (
               <TablePresentationBar
@@ -212,11 +218,13 @@ export const TableViewer = observer<TableViewerProps, HTMLDivElement>(
                 supportedDataFormat={dataModel.supportedDataFormats}
                 model={dataModel}
                 resultIndex={resultIndex}
+                tabIndex={0}
+                data-presentation-bar
                 onPresentationChange={dataTableActions.setPresentation}
               />
             )}
             <div className={s(styles, { tableData: true })}>
-              <TableHeader model={dataModel} resultIndex={resultIndex} simple={simple} />
+              <TableHeader model={dataModel} resultIndex={resultIndex} simple={simple} tabIndex={0} data-presentation-header />
               <Split
                 className={s(styles, { split: true, disabled: !valuePanelDisplayed })}
                 {...splitState}
@@ -227,7 +235,7 @@ export const TableViewer = observer<TableViewerProps, HTMLDivElement>(
                 disableAutoMargin
               >
                 <Pane className={s(styles, { pane: true })}>
-                  <div className={s(styles, { paneContent: true, grid: true })}>
+                  <div className={s(styles, { paneContent: true, grid: true })} tabIndex={0} data-presentation>
                     <Loader className={s(styles, { loader: true })} suspense>
                       <DataPresentation
                         model={dataModel}
@@ -276,12 +284,14 @@ export const TableViewer = observer<TableViewerProps, HTMLDivElement>(
                 supportedDataFormat={[dataFormat]}
                 model={dataModel}
                 resultIndex={resultIndex}
+                tabIndex={0}
+                data-presentation-bar
                 onPresentationChange={dataTableActions.setValuePresentation}
                 onClose={dataTableActions.closeValuePresentation}
               />
             )}
           </div>
-          <TableFooter model={dataModel} resultIndex={resultIndex} simple={simple} />
+          <TableFooter model={dataModel} resultIndex={resultIndex} simple={simple} tabIndex={0} data-presentation-tools />
         </div>
       </CaptureView>
     );
diff --git a/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/NavigationTabsBar.tsx b/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/NavigationTabsBar.tsx
index 2a60729e76..8ccc26e106 100644
--- a/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/NavigationTabsBar.tsx
+++ b/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/NavigationTabsBar.tsx
@@ -97,7 +97,6 @@ export const NavigationTabsBar = observer<Props>(function NavigationTabsBar({ cl
             </SContext>
           }
           tabList={navigation.tabIdList}
-          tabIndex={0}
           autoSelect
           enabledBaseActions
           onChange={handleTabChange}
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTree.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTree.tsx
index 53c1935788..06713feb7f 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTree.tsx
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTree.tsx
@@ -19,6 +19,8 @@ import {
   Translate,
   TreeNodeNested,
   TreeNodeNestedMessage,
+  useListKeyboardNavigation,
+  useMergeRefs,
   useS,
 } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
@@ -89,6 +91,8 @@ export const ElementsTree = observer<ElementsTreeProps>(function ElementsTree({
   const navNodeInfoResource = useService(NavNodeInfoResource);
   const [treeRootRef, setTreeRootRef] = useState<HTMLDivElement | null>(null);
   const folderExplorer = useElementsTreeFolderExplorer(baseRoot, settings);
+  const listRef = useListKeyboardNavigation('[data-tree-node-control][tabindex]:not(:disabled)');
+  const treeMergedRef = useMergeRefs<HTMLDivElement>(setTreeRootRef, listRef);
 
   const root = folderExplorer.state.folder;
 
@@ -162,7 +166,7 @@ export const ElementsTree = observer<ElementsTreeProps>(function ElementsTree({
   return (
     <>
       <ElementsTreeTools tree={tree} settingsElements={settingsElements} />
-      <div ref={setTreeRootRef} className={s(styles, { treeBox: true })}>
+      <div ref={treeMergedRef} className={s(styles, { treeBox: true })}>
         <ElementsTreeContext.Provider value={context}>
           <div className={s(styles, { box: true }, className)}>
             <FolderExplorer state={folderExplorer}>
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/TreeNodeMenu/TreeNodeMenu.module.css b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/TreeNodeMenu/TreeNodeMenu.module.css
index 606542bb53..1c07d4cae4 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/TreeNodeMenu/TreeNodeMenu.module.css
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/TreeNodeMenu/TreeNodeMenu.module.css
@@ -8,6 +8,7 @@
 .contextMenu {
   padding: 0;
   height: 16px;
+  width: 16px;
 
   &:before {
     display: none;
diff --git a/webapp/packages/plugin-top-app-bar/src/TopNavBar/shared/TopMenu.module.css b/webapp/packages/plugin-top-app-bar/src/TopNavBar/shared/TopMenu.module.css
index 9ee121c235..1155b579b3 100644
--- a/webapp/packages/plugin-top-app-bar/src/TopNavBar/shared/TopMenu.module.css
+++ b/webapp/packages/plugin-top-app-bar/src/TopNavBar/shared/TopMenu.module.css
@@ -11,7 +11,7 @@
   &:global([aria-expanded='true']) {
     background: #338ecc;
   }
-  &:before {
+  &:not(:focus-visible):before {
     display: none;
   }
   &:disabled,
diff --git a/webapp/packages/plugin-top-app-bar/src/TopNavBar/shared/TopMenuBarItem.module.css b/webapp/packages/plugin-top-app-bar/src/TopNavBar/shared/TopMenuBarItem.module.css
index 304632a4de..9c8035d70b 100644
--- a/webapp/packages/plugin-top-app-bar/src/TopNavBar/shared/TopMenuBarItem.module.css
+++ b/webapp/packages/plugin-top-app-bar/src/TopNavBar/shared/TopMenuBarItem.module.css
@@ -70,7 +70,7 @@
   &:global([aria-expanded='true']) {
     background: #338ecc;
   }
-  &:before {
+  &:not(:focus-visible):before {
     display: none;
   }
 
diff --git a/webapp/packages/plugin-top-app-bar/src/TopNavBar/shared/TopMenuItem.module.css b/webapp/packages/plugin-top-app-bar/src/TopNavBar/shared/TopMenuItem.module.css
index 5accd9130f..455c7bbc30 100644
--- a/webapp/packages/plugin-top-app-bar/src/TopNavBar/shared/TopMenuItem.module.css
+++ b/webapp/packages/plugin-top-app-bar/src/TopNavBar/shared/TopMenuItem.module.css
@@ -17,7 +17,7 @@
   &:global([aria-expanded='true']) {
     background: #236ea0;
   }
-  &:before {
+  &:not(:focus-visible):before {
     display: none;
   }
 }