diff --git a/frontend/package.json b/frontend/package.json
index 7ee82ab..c5d9de8 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gnexus-creds-frontend",
   "private": true,
-  "version": "0.1.0",
+  "version": "0.2.0",
   "type": "module",
   "scripts": {
     "dev": "vite --host 0.0.0.0",
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 356811d..5f70419 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -86,6 +86,8 @@
 const editing = ref(false);
 const editFields = ref(false);
 const pendingDeleteSecret = ref(null);
+const pendingRevokeToken = ref(null);
+const showRevokeConfirm = ref(false);
 const importFiles = ref([]);
 const importFile = ref(null);
 const importPreview = ref(null);
@@ -762,13 +764,17 @@
   }
 }
 
-async function revokeToken(token) {
-  await api.revokeToken(token.id);
-  await loadTokens();
+function confirmRevokeToken(token) {
+  pendingRevokeToken.value = token;
+  showRevokeConfirm.value = true;
 }
 
-async function copyText(value) {
-  await copyValue(value);
+async function doRevokeToken() {
+  if (!pendingRevokeToken.value) return;
+  await api.revokeToken(pendingRevokeToken.value.id);
+  pendingRevokeToken.value = null;
+  showRevokeConfirm.value = false;
+  await loadTokens();
 }
 
 async function exportData() {
@@ -1016,6 +1022,7 @@
             </GnToolbar>
             <div class="toolbar-actions-row">
               <GnDropdown
+                class="sort-dropdown"
                 :items="sortItems"
                 @select="(item) => { secretsSort = item.value; loadSecrets(); }"
               >
@@ -1210,7 +1217,7 @@
             <GnSkeleton v-if="tokensLoading" />
             <GnActionList v-else-if="tokenItems.length" :items="tokenItems">
               <template #controls="{ item }">
-                <GnButton size="sm" variant="danger" icon="ph ph-trash" @click="revokeToken(item.raw)">
+                <GnButton size="sm" variant="danger" icon="ph ph-trash" @click="confirmRevokeToken(item.raw)">
                   Revoke
                 </GnButton>
               </template>
@@ -1243,22 +1250,23 @@
               :multiple="false"
               accept="application/json,.json"
               @change="handleImportFiles"
-            />
+            >
+              <template #actions>
+                <GnButton
+                  variant="primary"
+                  icon="ph ph-upload-simple"
+                  :disabled="!importPreview"
+                  @click="importData"
+                >
+                  Import selected file
+                </GnButton>
+              </template>
+            </GnFileUpload>
             <GnAlert v-if="importError" variant="danger" role="alert">{{ importError }}</GnAlert>
             <div v-if="importPreview" class="import-preview">
               <GnBadge variant="success">{{ importPreview.secrets?.length || 0 }} secrets ready</GnBadge>
               <span class="muted">{{ importFile?.name }}</span>
             </div>
-            <div class="create-actions">
-              <GnButton
-                variant="primary"
-                icon="ph ph-upload-simple"
-                :disabled="!importPreview"
-                @click="importData"
-              >
-                Import selected file
-              </GnButton>
-            </div>
           </section>
 
           <section class="workspace-surface">
@@ -1382,12 +1390,20 @@
                   icon="ph ph-target"
                   help="Target service, server, account, or other secret destination."
                 />
-                <GnInput
-                  v-model="form.category"
-                  label="Category"
-                  icon="ph ph-folder"
-                  help="Single grouping value for browsing, for example work or banking."
-                />
+                <div class="form-row-two">
+                  <GnInput
+                    v-model="form.category"
+                    label="Category"
+                    icon="ph ph-folder"
+                    help="Single grouping value for browsing, for example work or banking."
+                  />
+                  <GnInput
+                    v-model="form.source"
+                    label="Source"
+                    icon="ph ph-signpost"
+                    help="Where this secret came from: person, import, ticket, or note."
+                  />
+                </div>
                 <GnTagInput
                   v-model="form.tags"
                   label="Tags"
@@ -1395,12 +1411,7 @@
                   separator=","
                   unique
                   help="Keywords used by search."
-                />
-                <GnInput
-                  v-model="form.source"
-                  label="Source"
-                  icon="ph ph-signpost"
-                  help="Where this secret came from: person, import, ticket, or note."
+                  class="form-col-full"
                 />
                 <GnTextarea
                   v-model="form.notes"
@@ -1409,6 +1420,7 @@
                   rows="3"
                   maxlength="140"
                   help="Short context for the secret. Limited to 140 characters."
+                  class="form-col-full"
                 />
               </div>
             </section>
@@ -1483,16 +1495,26 @@
               <div class="form-grid two">
                 <GnInput v-model="editForm.title" label="Title" icon="ph ph-text-t" />
                 <GnInput v-model="editForm.purpose" label="Purpose" icon="ph ph-target" />
-                <GnInput v-model="editForm.category" label="Category" icon="ph ph-folder" />
+                <div class="form-row-two">
+                  <GnInput v-model="editForm.category" label="Category" icon="ph ph-folder" />
+                  <GnInput v-model="editForm.source" label="Source" icon="ph ph-signpost" />
+                </div>
                 <GnTagInput
                   v-model="editForm.tags"
                   label="Tags"
                   icon="ph ph-tag"
                   separator=","
                   unique
+                  class="form-col-full"
                 />
-                <GnInput v-model="editForm.source" label="Source" icon="ph ph-signpost" />
-                <GnInput v-model="editForm.notes" label="Notes" icon="ph ph-note-pencil" maxlength="140" />
+                <GnTextarea
+                  v-model="editForm.notes"
+                  label="Notes"
+                  icon="ph ph-note-pencil"
+                  rows="3"
+                  maxlength="140"
+                  class="form-col-full"
+                />
               </div>
             </section>
             <section class="modal-section">
@@ -1588,7 +1610,7 @@
               Create token
             </GnButton>
             <template v-else>
-              <GnButton icon="ph ph-copy" @click="copyText(newToken.token)">Copy token</GnButton>
+              <GnCopyButton :text="newToken.token" size="sm" />
               <GnButton variant="secondary" @click="closeCreateTokenModal">Close</GnButton>
             </template>
           </template>
@@ -1613,6 +1635,15 @@
           confirm-variant="danger"
           @confirm="restoreBackup"
         />
+
+        <GnConfirmDialog
+          v-model:open="showRevokeConfirm"
+          title="Revoke token"
+          :message="`This will permanently revoke token '${pendingRevokeToken?.name || 'this token'}'. It can no longer be used for API or MCP access.`"
+          confirm-text="Revoke"
+          confirm-variant="danger"
+          @confirm="doRevokeToken"
+        />
         </main>
       </template>
     </GnNavigationShell>
diff --git a/frontend/src/styles.css b/frontend/src/styles.css
index 23cee0a..8223785 100644
--- a/frontend/src/styles.css
+++ b/frontend/src/styles.css
@@ -78,13 +78,14 @@
 }
 
 .settings-metrics {
-  display: grid;
-  grid-template-columns: repeat(3, minmax(120px, 170px));
+  display: flex;
   gap: 15px;
+  flex-wrap: wrap;
 }
 
 .list-panel {
   overflow: auto;
+  padding-bottom: 40px;
 }
 
 .secrets-table {
@@ -155,6 +156,12 @@
   transform-origin: top right;
 }
 
+.sort-dropdown .dropdown-menu {
+  right: 0;
+  left: auto;
+  transform-origin: top right;
+}
+
 .detail-panel .description-list {
   max-width: none;
 }
@@ -179,6 +186,17 @@
   grid-template-columns: repeat(2, minmax(0, 1fr));
 }
 
+.form-grid.two .form-row-two {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  gap: 12px;
+  grid-column: 1 / -1;
+}
+
+.form-grid.two .form-col-full {
+  grid-column: 1 / -1;
+}
+
 .create-modal-body {
   display: grid;
   gap: 12px;
@@ -236,7 +254,8 @@
   padding-top: 28px;
 }
 
-.create-access-grid {
+.create-access-grid,
+.access-grid {
   display: grid;
   grid-template-columns: repeat(3, minmax(0, 1fr));
   gap: 10px;
@@ -322,6 +341,7 @@
   gap: 10px;
   align-items: center;
   flex-wrap: wrap;
+  justify-content: flex-end;
 }
 
 .revealed-fields-list.list-actions {