diff --git a/app/css/custom.php b/app/css/custom.php
index 167b4473..ae3049c2 100644
--- a/app/css/custom.php
+++ b/app/css/custom.php
@@ -36,7 +36,6 @@ body {
   .row { margin-left: 0rem; margin-right: 0rem; }
   .col-lg-12 { padding-right: 0.25rem; padding-left: 0.25rem; }
   .form-group.col-md-6 { margin-left: -0.5rem; }
-  .js-wifi-stations { margin-left: -0.5rem; margin-right: -0.5rem; }
   h4.mt-3 { margin-left: 0.5rem; }
 }
 
@@ -194,9 +193,6 @@ pre.unstyled {
   width: 100%;
 }
 
-.js-reload-wifi-stations {
-  min-width: 10rem;
-}
 .card-deck--wifi-stations {
   justify-content: space-between;
 }
diff --git a/app/css/hackernews.css b/app/css/hackernews.css
index d7c1695f..395794b5 100644
--- a/app/css/hackernews.css
+++ b/app/css/hackernews.css
@@ -115,7 +115,6 @@ ul.nav-tabs, .nav-tabs .nav-link {
   .row { margin-left: 0rem; margin-right: 0rem; }
   .col-lg-12 { padding-right: 0.25rem; padding-left: 0.25rem; }
   .form-group.col-md-6 { margin-left: -0.5rem; }
-  .js-wifi-stations { margin-left: -0.5rem; margin-right: -0.5rem; }
   h4.mt-3 { margin-left: 0.5rem; }
 }
 
@@ -226,9 +225,6 @@ pre.unstyled {
   width: 100%;
 }
 
-.js-reload-wifi-stations {
-  min-width: 10rem;
-}
 .card-deck--wifi-stations {
   justify-content: space-between;
 }
diff --git a/app/css/lightsout.css b/app/css/lightsout.css
index ea213711..aea36af0 100644
--- a/app/css/lightsout.css
+++ b/app/css/lightsout.css
@@ -57,7 +57,6 @@ h5.card-title {
   .row { margin-left: 0rem; margin-right: 0rem; }
   .col-lg-12 { padding-right: 0.25rem; padding-left: 0.25rem; }
   .form-group.col-md-6 { margin-left: -0.5rem; }
-  .js-wifi-stations { margin-left: -0.5rem; margin-right: -0.5rem; }
   h4.mt-3 { margin-left: 0.5rem; }
 }
 
diff --git a/templates/configure_client.php b/templates/configure_client.php
index 21a3e2a0..3ac2ff0e 100755
--- a/templates/configure_client.php
+++ b/templates/configure_client.php
@@ -16,19 +16,23 @@
       </div><!-- /.card-header -->
       <div class="card-body">
         <?php $status->showMessages(); ?>
-        <div class="row">
+        <div class="row align-items-center">
           <div class="col">
-            <h4 class="mb-2"><?php echo _("Client settings"); ?></h4>
+            <h4 class="m-0"><?php echo _("Client settings"); ?></h4>
           </div>
-          <div class="col-xs mr-3 mb-3">
-            <button type="button" class="btn btn-info btn-block float-right js-reload-wifi-stations"><?php echo _("Rescan"); ?></button>
+          <div class="col">
+            <button type="button" class="btn btn-info float-right js-reload-wifi-stations"><?php echo _("Rescan"); ?></button>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col">
+            <form method="POST" action="wpa_conf" name="wpa_conf_form">
+              <?php echo CSRFTokenFieldTag() ?>
+              <input type="hidden" name="client_settings" ?>
+              <div class="js-wifi-stations loading-spinner"></div>
+            </form>
           </div>
         </div>
-        <form method="POST" action="wpa_conf" name="wpa_conf_form">
-            <?php echo CSRFTokenFieldTag() ?>
-          <input type="hidden" name="client_settings" ?>
-          <div class="js-wifi-stations w-100 loading-spinner"></div>
-        </form>
       </div><!-- ./ card-body -->
       <div class="card-footer"><?php echo _("<strong>Note:</strong> WEP access points appear as 'Open'. RaspAP does not currently support connecting to WEP"); ?></div>
     </div><!-- /.card -->