diff --git a/packages/nc-gui-v2/components/tabs/Auth.vue b/packages/nc-gui-v2/components/tabs/Auth.vue
index 0a467a52f4..4c5c0cd80b 100644
--- a/packages/nc-gui-v2/components/tabs/Auth.vue
+++ b/packages/nc-gui-v2/components/tabs/Auth.vue
@@ -2,39 +2,39 @@
 import UserManagement from './auth/UserManagement.vue'
 import ApiTokenManagement from './auth/ApiTokenManagement.vue'
 
-interface TabGroup {
-  [key: string]: {
-    title: string
-    body: any
-  }
+interface Tab {
+  title: string
+  body: any
 }
 
-const tabsInfo: TabGroup = {
-  usersManagement: {
+const tabsInfo: Tab[] = [
+  {
     title: 'Users Management',
     body: () => UserManagement,
   },
-  apiTokenManagement: {
+  {
     title: 'API Token Management',
     body: () => ApiTokenManagement,
   },
-}
+]
 
-const firstKeyOfObject = (obj: object) => Object.keys(obj)[0]
+// const firstKeyOfObject = (obj: object) => Object.keys(obj)[0]
 
-const selectedTabKeys = $ref<string[]>([firstKeyOfObject(tabsInfo)])
-const selectedTab = $computed(() => tabsInfo[selectedTabKeys[0]])
+const selectedTabKey = $ref(0)
+const selectedTab = $computed(() => tabsInfo[selectedTabKey])
 </script>
 
 <template>
-  <div class="mt-2">
-    <a-menu v-model:selectedKeys="selectedTabKeys" :open-keys="[]" mode="horizontal">
-      <a-menu-item v-for="(tab, key) of tabsInfo" :key="key" class="select-none">
-        <div class="text-xs pb-2.5">
-          {{ tab.title }}
-        </div>
-      </a-menu-item>
-    </a-menu>
+  <div>
+    <a-tabs v-model:active-key="selectedTabKey" class="" :open-keys="[]" mode="horizontal">
+      <a-tabs-tab-pane v-for="(tab, key) of tabsInfo" :key="key" class="select-none">
+        <template #tab>
+          <span class="mx-3">
+            {{ tab.title }}
+          </span>
+        </template>
+      </a-tabs-tab-pane>
+    </a-tabs>
 
     <div class="mx-4 py-6 mt-2">
       <component :is="selectedTab.body()" />
diff --git a/packages/nc-gui-v2/components/tabs/auth/UserManagement.vue b/packages/nc-gui-v2/components/tabs/auth/UserManagement.vue
index 354a662e87..ce5cc9aa58 100644
--- a/packages/nc-gui-v2/components/tabs/auth/UserManagement.vue
+++ b/packages/nc-gui-v2/components/tabs/auth/UserManagement.vue
@@ -194,7 +194,7 @@ watchDebounced(searchText, () => loadUsers(), { debounce: 300, maxWait: 600 })
             <div class="text-gray-500">Reload</div>
           </div>
         </a-button>
-        <a-button v-if="isUIAllowed('newUser')" size="middle" @click="onInvite">
+        <a-button v-if="isUIAllowed('newUser')" size="middle" type="primary" ghost @click="onInvite">
           <div class="flex flex-row justify-center items-center caption capitalize space-x-1">
             <MidAccountIcon />
             <div>{{ $t('activity.inviteTeam') }}</div>
diff --git a/packages/nc-gui-v2/layouts/base.vue b/packages/nc-gui-v2/layouts/base.vue
index 76ced9f96a..9af3cec032 100644
--- a/packages/nc-gui-v2/layouts/base.vue
+++ b/packages/nc-gui-v2/layouts/base.vue
@@ -19,7 +19,7 @@ const logout = () => {
     <div id="nc-sidebar-left" />
 
     <a-layout class="!flex-col">
-      <a-layout-header class="flex !bg-primary items-center text-white pl-5 pr-4 shadow-lg">
+      <a-layout-header class="flex !bg-primary items-center text-white pl-4 pr-5 shadow-lg">
         <div
           v-if="route.name === 'index' || route.name === 'project-index-create' || route.name === 'project-index-create-external'"
           class="transition-all duration-200 p-2 cursor-pointer transform hover:scale-105"