diff --git a/frontend/src/main.js b/frontend/src/main.js
index 642c27f..a717c81 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -30,7 +30,7 @@ const tableContainer = $('#table-container');
 // Default column width
 const DEFAULT_COL_WIDTH = 120;
 const MIN_COL_WIDTH = 40;
-const MAX_BEST_FIT = 200;
+const MAX_BEST_FIT = 150;
 
 // ===== Helpers =====
 function colLabel(i) {
@@ -630,7 +630,9 @@ let activeCommandIndex = 0;
 function renderCommandList(filter) {
     commandList.innerHTML = '';
     const lower = filter.toLowerCase();
-    const filtered = commands.filter(c => c.Name.toLowerCase().includes(lower));
+    const filtered = commands
+        .filter(c => c.Name.toLowerCase().includes(lower))
+        .sort((a, b) => a.Name.toLowerCase().localeCompare(b.Name.toLowerCase()));
 
     activeCommandIndex = 0;
 
diff --git a/frontend/src/style.css b/frontend/src/style.css
index adf1d35..b858735 100644
--- a/frontend/src/style.css
+++ b/frontend/src/style.css
@@ -88,7 +88,7 @@ html, body {
 #table-head th {
     position: sticky;
     top: 0;
-    z-index: 2;
+    z-index: 10;
     background: var(--header-bg);
     border: 1px solid var(--border);
     border-top: none;
@@ -102,6 +102,7 @@ html, body {
     cursor: default;
     height: 26px;
     font-size: 12px;
+    max-width: 150px;
 }
 
 #table-head th.row-number-header {
@@ -110,7 +111,7 @@ html, body {
     max-width: var(--row-num-width);
     position: sticky;
     left: 0;
-    z-index: 3;
+    z-index: 11;
     text-align: center;
     background: var(--header-bg);
 }
@@ -166,6 +167,7 @@ th .header-edit-input {
     height: 24px;
     cursor: cell;
     font-size: 13px;
+    max-width: 150px;
 }
 
 #table-body td.row-number {
@@ -191,8 +193,6 @@ td.selected {
 td.cursor-cell {
     outline: 2px solid var(--selected-border);
     outline-offset: -1px;
-    z-index: 1;
-    position: relative;
 }
 
 /* Status bar */