diff --git a/src/css/tabs/firmware_flasher.less b/src/css/tabs/firmware_flasher.less
index 55a247df..01db397b 100644
--- a/src/css/tabs/firmware_flasher.less
+++ b/src/css/tabs/firmware_flasher.less
@@ -131,14 +131,14 @@
     }
     @media all and (max-width: 1455px) {
         .grid-box {
-            &.col3 {
-                grid-template-columns: repeat(2, 1fr);
+            &.col2 {
+                grid-template-columns: 1fr 1fr;
             }
         }
     }
     @media all and (max-width: 991px) {
         .grid-box {
-            &.col3 {
+            &.col2 {
                 grid-template-columns: 1fr;
             }
             .col-span-2 {
diff --git a/src/tabs/firmware_flasher.html b/src/tabs/firmware_flasher.html
index a2bb7bc5..a61d7824 100644
--- a/src/tabs/firmware_flasher.html
+++ b/src/tabs/firmware_flasher.html
@@ -6,7 +6,7 @@
         </div>
         <div class="tab_sponsor">
         </div>
-        <div class="grid-box col3">
+        <div class="grid-box col2">
             <div class="options gui_box col-span-1">
                 <div class="spacer">
                     <div>
@@ -125,18 +125,7 @@
                     </div>
                 </div>
             </div>
-            <div class="gui_box gui_warning col-span-2">
-                <div class="gui_box_titlebar">
-                    <div class="spacer_box_title" i18n="warningTitle">
-                    </div>
-                </div>
-                <div class="spacer">
-                    <p i18n="firmwareFlasherWarningText"></p>
-                    <br />
-                    <p i18n="firmwareFlasherTargetWarning"></p>
-                </div>
-            </div>
-            <div class="build_configuration gui_box col-span-3">
+            <div class="build_configuration gui_box col-span-1">
                 <div class="darkgrey_box gui_box_titlebar">
                     <div class="build_configuration_toggle_wrapper">
                         <label id="build_configuration_toggle_label">
@@ -190,7 +179,7 @@
                         </div>
                     </div>
                     <div class="spacer hide-in-core-build-mode">
-                        <div class="grid-box col2">
+                        <div class="grid-box col1">
                             <div class="select-group">
                                 <strong i18n="firmwareFlasherBuildOptions"></strong>
                                 <div id="optionsInfo" class="build-options-wrapper">
@@ -202,7 +191,7 @@
                         </div>
                     </div>
                     <div class="expertOptions spacer hide-in-core-build-mode">
-                        <div class="grid-box col2">
+                        <div class="grid-box col1">
                             <div class="select-group">
                                 <strong i18n="firmwareFlasherBuildCustomDefines"></strong>
                                 <div id="customDefinesInfo" class="build-options-wrapper">
@@ -222,7 +211,7 @@
                     </div>
                 </div>
             </div>
-            <div class="release_info gui_box col-span-3">
+            <div class="release_info gui_box col-span-1">
                 <div class="darkgrey_box gui_box_titlebar">
                     <div class="spacer_box_title" i18n="firmwareFlasherReleaseSummaryHead">
                     </div>
@@ -268,7 +257,18 @@
                     </div>
                 </div>
             </div>
-            <div class="gui_box gui_note col-span-3">
+            <div class="gui_box gui_warning col-span-1">
+                <div class="gui_box_titlebar">
+                    <div class="spacer_box_title" i18n="warningTitle">
+                    </div>
+                </div>
+                <div class="spacer">
+                    <p i18n="firmwareFlasherWarningText"></p>
+                    <br />
+                    <p i18n="firmwareFlasherTargetWarning"></p>
+                </div>
+            </div>
+            <div class="gui_box gui_note col-span-1">
                 <div class="gui_box_titlebar">
                     <div class="spacer_box_title" i18n="firmwareFlasherRecoveryHead"></div>
                 </div>