diff --git a/yocto_console_view/src/views/ConsoleView/ConsoleView.scss b/yocto_console_view/src/views/ConsoleView/ConsoleView.scss
index 15dd3a61bcbd..3f693917f13c 100644
--- a/yocto_console_view/src/views/ConsoleView/ConsoleView.scss
+++ b/yocto_console_view/src/views/ConsoleView/ConsoleView.scss
@@ -55,32 +55,45 @@ div.form-group {
   div.col-sm-10 {
     display: inline-block;
     width: 80%;
+    vertical-align: middle;
   };
 
   label {
-    display: inline-block;
     width: 20%;
     font-weight: bold;
-    margin-bottom: 0;
-    top: .5em;
+    padding-right: .5em;
+    vertical-align: middle;
   }
 
   .control-label {
     text-align: right;
-    float: left;
   }
 
   div.col-sm-10.col-sm-offset-2 {
     width: 100%;
     max-width: 100%;
+    margin-left: 0;
+
     label {
-      width: 80%;
-      float: right;
-      padding-left: 8px;
+      display: grid;
+      grid-template-columns: 20% 1fr auto;
+      align-items: center;
+      width: 100%;
+      float: none;
+      padding-left: 0;
+
+      input[type="checkbox"] {
+        justify-self: end;
+        margin-right: .5em;
+      }
     }
-  };
+  }
 
   .row > div.col-sm-6 {
     margin-bottom: 5px;
   }
+
+  label.col-sm-10 {
+    text-align: right;
+  }
 };
