diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index e00685b..73acde9 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -3150,10 +3150,15 @@ export default function App() {
               </div>
             </div>
 
-            {/* Row 2: wide Name + QTH + Grid across the full width. */}
+            {/* Row 2: Name fixed to the Band/Mode/Country column width (300px) so
+                its right edge lines up with that column below; QTH grows to fill. */}
             <div className="flex gap-2 items-end">
-              {nameBlock}
-              {qthBlock}
+              <div className="flex flex-col w-[300px] shrink-0"><Label className="mb-1 h-3.5">Name</Label>
+                <Input value={name} onChange={(e) => { setName(e.target.value); markEdited('name'); }} />
+              </div>
+              <div className="flex flex-col flex-1 min-w-[70px]"><Label className="mb-1 h-3.5">QTH</Label>
+                <Input value={qth} onChange={(e) => { setQth(e.target.value); markEdited('qth'); }} />
+              </div>
               {gridBlock}
             </div>
 
@@ -3330,16 +3335,16 @@ export default function App() {
           />
           {/* Left-aligned single line, no scrollbar; auto-scrolled to the newest
               text (see cwScrollRef effect) so the latest stays in view. */}
-          <div ref={cwScrollRef} className="flex-1 min-w-0 overflow-hidden font-mono leading-5">
+          <div ref={cwScrollRef} className="flex-1 min-w-0 overflow-hidden font-mono leading-none flex items-center">
             {cwText.trim() === '' ? (
               <span className="text-muted-foreground italic">listening…</span>
             ) : (
-              <div className="inline-flex whitespace-nowrap">
+              <div className="inline-flex items-center whitespace-nowrap">
                 {cwText.trim().split(/\s+/).map((tok, i) => (
                   <button
                     key={i}
                     type="button"
-                    className="mr-1 shrink-0 rounded px-1 hover:bg-emerald-200/70"
+                    className="mr-1 shrink-0 rounded px-1 leading-none hover:bg-emerald-200/70"
                     title="Use as callsign"
                     onClick={() => onCallsignInput(tok, { force: true })}
                   >