diff --git a/packages/nc-gui/components/ProjectTreeView.vue b/packages/nc-gui/components/ProjectTreeView.vue
index c4fe8633f5..206bea8ec4 100644
--- a/packages/nc-gui/components/ProjectTreeView.vue
+++ b/packages/nc-gui/components/ProjectTreeView.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="height: 100%" @mouseenter="onMiniHoverEnter" @mouseleave="onMiniHoverLeave">
+  <div style="height: 100%" class="nc-tree-view" @mouseenter="onMiniHoverEnter" @mouseleave="onMiniHoverLeave">
     <!--    :expand-on-hover="mini"-->
     <v-navigation-drawer
       ref="drawer"
diff --git a/packages/nc-gui/components/authTab.vue b/packages/nc-gui/components/authTab.vue
index a324a06516..103dfd71b2 100644
--- a/packages/nc-gui/components/authTab.vue
+++ b/packages/nc-gui/components/authTab.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="h-100">
+  <div class="h-100 nc-auth-tab">
     <div class="h-100" style="width: 100%">
       <v-tabs height="30" color="x-active">
         <v-tab>
diff --git a/packages/nc-gui/components/project/appStore.vue b/packages/nc-gui/components/project/appStore.vue
index 99c2818f80..2748824824 100644
--- a/packages/nc-gui/components/project/appStore.vue
+++ b/packages/nc-gui/components/project/appStore.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="d-flex h-100">
+  <div class="d-flex h-100 nc-app-store-tab">
     <v-dialog v-model="pluginInstallOverlay" min-width="400px" max-width="700px" min-height="300">
       <v-card
         v-if="installPlugin && pluginInstallOverlay"
diff --git a/packages/nc-gui/components/project/table.vue b/packages/nc-gui/components/project/table.vue
index 96334be45b..925f8ca20b 100644
--- a/packages/nc-gui/components/project/table.vue
+++ b/packages/nc-gui/components/project/table.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-container fluid class="pa-0 ma-0" style="height: 100%">
+  <v-container fluid class="pa-0 ma-0 nc-table-tab" style="height: 100%">
     <v-alert v-if="error" type="error" class="ma-2">
       {{ error }}
     </v-alert>
diff --git a/packages/nc-gui/components/projectTabs.vue b/packages/nc-gui/components/projectTabs.vue
index 43688bfe78..75354244b9 100644
--- a/packages/nc-gui/components/projectTabs.vue
+++ b/packages/nc-gui/components/projectTabs.vue
@@ -6,7 +6,7 @@
       dark
       background-color="primary"
       height="40"
-      class="project-tabs"
+      class="project-tabs nc-project-tabs"
       color=""
       next-icon="mdi-arrow-right-bold-box-outline"
       prev-icon="mdi-arrow-left-bold-box-outline"
@@ -254,17 +254,7 @@
 <script>
 import { mapGetters, mapMutations } from 'vuex'
 // import Roles from '@/components/auth/roles'
-import GlobalAcl from '@/components/globalAcl'
-import GrpcClient from '@/components/project/grpcClient'
-import ProjectSettings from '@/components/project/projectSettings'
 // import CreateOrEditProject from '@/components/createOrEditProject'
-import DisableOrEnableModels from '@/components/project/projectMetadata/disableOrEnableModels'
-import CronJobs from '@/components/project/cronJobs'
-import AuthTab from '@/components/authTab'
-import AppStore from '@/components/project/appStore'
-import DlgTableCreate from '@/components/utils/dlgTableCreate'
-import Screensaver from '@/components/screensaver'
-import SwaggerClient from '@/components/project/swaggerClient'
 import treeViewIcons from '../helpers/treeViewIcons'
 import TableView from './project/table'
 import ViewTab from './project/view'
@@ -284,6 +274,16 @@ import xTerm from './xTerm'
 import ApiClientSwaggerTab from './project/apiClientSwagger'
 import XcMeta from './project/settings/xcMeta'
 import XcInfo from './project/xcInfo'
+import SwaggerClient from '@/components/project/swaggerClient'
+import Screensaver from '@/components/screensaver'
+import DlgTableCreate from '@/components/utils/dlgTableCreate'
+import AppStore from '@/components/project/appStore'
+import AuthTab from '@/components/authTab'
+import CronJobs from '@/components/project/cronJobs'
+import DisableOrEnableModels from '@/components/project/projectMetadata/disableOrEnableModels'
+import ProjectSettings from '@/components/project/projectSettings'
+import GrpcClient from '@/components/project/grpcClient'
+import GlobalAcl from '@/components/globalAcl'
 import AuditTab from '~/components/project/auditTab'
 
 export default {
diff --git a/packages/nc-gui/pages/index.vue b/packages/nc-gui/pages/index.vue
index bab2f05fb1..003cb21018 100644
--- a/packages/nc-gui/pages/index.vue
+++ b/packages/nc-gui/pages/index.vue
@@ -1,6 +1,6 @@
 <template>
   <v-row
-    class="welcome-page"
+    class="welcome-page nc-welcome-page"
     style="min-height: 100vh"
     align="center"
     justify="center"
diff --git a/packages/nc-lib-gui/lib/XcLibGui.js b/packages/nc-lib-gui/lib/XcLibGui.js
index c272353351..0d0b4d117b 100644
--- a/packages/nc-lib-gui/lib/XcLibGui.js
+++ b/packages/nc-lib-gui/lib/XcLibGui.js
@@ -11,6 +11,12 @@ class XcLibGui {
   expressMiddleware() {
 
     const router = express.Router();
+    router.get('/', (request, response) => {
+      response.header('Cache-Control', 'private, no-cache, no-store, must-revalidate');
+      response.header('Expires', '-1');
+      response.header('Pragma', 'no-cache');
+      response.sendFile(path.join(__dirname, 'dist','index.html'));
+    });
     router.use('/', express.static(path.join(__dirname, 'dist')));
     return router;
   }
diff --git a/packages/nc-lib-gui/package.json b/packages/nc-lib-gui/package.json
index 96881a87d9..094ace7f0f 100644
--- a/packages/nc-lib-gui/package.json
+++ b/packages/nc-lib-gui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nc-lib-gui",
-  "version": "0.2.58",
+  "version": "0.2.60",
   "description": "> TODO: description",
   "author": "“pranavxc” <pranavxc@gmail.com>",
   "homepage": "https://gitlab.com/xgenecloud-ts/xgenecloud-ts#readme",
diff --git a/packages/nocodb/package-lock.json b/packages/nocodb/package-lock.json
index 6563c1808c..9edeff186d 100644
--- a/packages/nocodb/package-lock.json
+++ b/packages/nocodb/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "nocodb",
-  "version": "0.11.39",
+  "version": "0.11.40",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -12360,9 +12360,9 @@
       }
     },
     "nc-lib-gui": {
-      "version": "0.2.58",
-      "resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.2.58.tgz",
-      "integrity": "sha512-lYjSiGqob5+CfJUwsA5v+4u3nHCZ7iHXrI3nLMfkvvWstvuRBhcUKkINhUL3AcV9yWOuuhCF8c8Txv59x2btCg==",
+      "version": "0.2.60",
+      "resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.2.60.tgz",
+      "integrity": "sha512-pOXQlAHuJxnk5Eo0lNpi3hJFPvuSgbiMDxwFM0Nme6pswGvhB86138IYujSZeai2TGcVjreNNcQaiHItvtAhrw==",
       "requires": {
         "axios": "^0.19.2",
         "body-parser": "^1.19.0",
diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json
index 7441962d06..3fa4e9ed9e 100644
--- a/packages/nocodb/package.json
+++ b/packages/nocodb/package.json
@@ -147,7 +147,7 @@
     "nanoid": "^3.1.20",
     "nc-common": "0.0.6",
     "nc-help": "^0.2.14",
-    "nc-lib-gui": "0.2.58",
+    "nc-lib-gui": "0.2.60",
     "nc-plugin": "^0.1.1",
     "ncp": "^2.0.0",
     "nodemailer": "^6.4.10",
@@ -244,4 +244,4 @@
       "**/*.spec.js"
     ]
   }
-}
\ No newline at end of file
+}