diff --git a/packages/nc-gui-v2/app.vue b/packages/nc-gui-v2/app.vue
index d56cfb3174..9ca0b862d5 100644
--- a/packages/nc-gui-v2/app.vue
+++ b/packages/nc-gui-v2/app.vue
@@ -41,9 +41,9 @@ const toggleSidebar = () => {
NocoDB
-
+
{{ $t('general.loading') }}
-
+
diff --git a/packages/nc-gui-v2/components/smartsheet/sidebar/index.vue b/packages/nc-gui-v2/components/smartsheet/sidebar/index.vue
index e4e800d936..6f8de8eac4 100644
--- a/packages/nc-gui-v2/components/smartsheet/sidebar/index.vue
+++ b/packages/nc-gui-v2/components/smartsheet/sidebar/index.vue
@@ -2,8 +2,8 @@
import type { FormType, GalleryType, GridType, KanbanType, ViewTypes } from 'nocodb-sdk'
import MenuTop from './MenuTop.vue'
import MenuBottom from './MenuBottom.vue'
-import Toolbar from './Toolbar.vue'
-import { computed, inject, provide, ref, useApi, useViews, watch } from '#imports'
+import Toolbar from './toolbar/index.vue'
+import { computed, inject, provide, ref, useApi, useRoute, useViews, watch } from '#imports'
import { ActiveViewInj, MetaInj, RightSidebarInj, ViewListInj } from '~/context'
import MdiXml from '~icons/mdi/xml'
import MdiHook from '~icons/mdi/hook'
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/AddRow.vue b/packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/AddRow.vue
similarity index 65%
rename from packages/nc-gui-v2/components/smartsheet-toolbar/AddRow.vue
rename to packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/AddRow.vue
index 9e99331042..c75481f2a8 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/AddRow.vue
+++ b/packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/AddRow.vue
@@ -1,11 +1,15 @@