diff --git a/whm/gniza-whm/remotes.cgi b/whm/gniza-whm/remotes.cgi
index c083a79..13a4cf9 100644
--- a/whm/gniza-whm/remotes.cgi
+++ b/whm/gniza-whm/remotes.cgi
@@ -525,7 +525,7 @@ sub render_remote_form {
 
     print qq{<div class="flex items-center gap-3 mb-2.5">\n};
     print qq{  <label class="w-44 font-medium text-sm">Remote Type</label>\n};
-    print qq{  <div class="join items-center">\n};
+    print qq{  <div class="join" style="display:inline-flex;align-items:stretch">\n};
     print qq{    <input type="radio" name="REMOTE_TYPE" class="join-item btn btn-sm" aria-label="SSH" value="ssh" onchange="gnizaTypeChanged()"$ssh_checked>\n};
     print qq{    <input type="radio" name="REMOTE_TYPE" class="join-item btn btn-sm" aria-label="Amazon S3" value="s3" onchange="gnizaTypeChanged()"$s3_checked>\n};
     print qq{    <input type="radio" name="REMOTE_TYPE" class="join-item btn btn-sm" aria-label="Google Drive" value="gdrive" onchange="gnizaTypeChanged()"$gdrive_checked>\n};
@@ -560,7 +560,7 @@ sub render_remote_form {
     # Auth method toggle
     print qq{<div class="flex items-center gap-3 mb-2.5">\n};
     print qq{  <label class="w-44 font-medium text-sm">Auth Method</label>\n};
-    print qq{  <div class="join items-center">\n};
+    print qq{  <div class="join" style="display:inline-flex;align-items:stretch">\n};
     print qq{    <input type="radio" name="REMOTE_AUTH_METHOD" class="join-item btn btn-sm" aria-label="SSH Key" value="key" onchange="gnizaAuthChanged()"$key_checked>\n};
     print qq{    <input type="radio" name="REMOTE_AUTH_METHOD" class="join-item btn btn-sm" aria-label="Password" value="password" onchange="gnizaAuthChanged()"$pw_checked>\n};
     print qq{  </div>\n};
diff --git a/whm/gniza-whm/restore.cgi b/whm/gniza-whm/restore.cgi
index ad32ca6..43d8f3b 100644
--- a/whm/gniza-whm/restore.cgi
+++ b/whm/gniza-whm/restore.cgi
@@ -241,7 +241,7 @@ sub handle_step2 {
     # Restore mode toggle: Full Account vs Selective
     print qq{<div class="flex items-center gap-3 mb-2.5">\n};
     print qq{  <label class="w-44 font-medium text-sm">Restore Mode</label>\n};
-    print qq{  <div class="join">\n};
+    print qq{  <div class="join" style="display:inline-flex;align-items:stretch">\n};
     print qq{    <input type="radio" name="restore_mode" class="join-item btn btn-sm" aria-label="Full Account" value="full" checked onchange="gnizaModeChanged()">\n};
     print qq{    <input type="radio" name="restore_mode" class="join-item btn btn-sm" aria-label="Selective" value="selective" onchange="gnizaModeChanged()">\n};
     print qq{  </div>\n};