diff --git a/keepassxc-browser/options/options.html b/keepassxc-browser/options/options.html
index fd58fbb..1443c3d 100644
--- a/keepassxc-browser/options/options.html
+++ b/keepassxc-browser/options/options.html
@@ -765,7 +765,8 @@
                                       <option value="ignoreFull" data-i18n="optionsSelectionFull"></option>
                                   </select>
                                 </div>
-
+                              </div>
+                              <div class="col-auto">
                                 <div class="form-group">
                                   <div class="form-check">
                                     <label for="usernameOnly" data-i18n="optionsColumnUsernameOnly"></label>
@@ -787,28 +788,25 @@
                                   </div>
                                 </div>
                               </div>
-                              <div class="col">
+                              <div class="col-auto">
                                 <div class="form-group">
-                                  <div class="form-check">
+                                  <div class="form-check" data-i18n="[title]optionsAutoSubmitHelpText">
                                     <label for="autoSubmit" data-i18n="optionsCheckboxAutoSubmit"></label>
-                                    <input class="form-check-input" type="checkbox" id="autoSubmit" name="autoSubmit" value="false" data-i18n="[title]optionsColumnAutoSubmit">
-                                    <div class="form-text" data-i18n="optionsAutoSubmitHelpText"></div>
+                                    <input class="form-check-input" type="checkbox" id="autoSubmit" name="autoSubmit" value="false" data-i18n="[title]optionsAutoSubmitHelpText">
                                   </div>
                                 </div>
 
                                 <div class="form-group">
-                                  <div class="form-check">
+                                  <div class="form-check" data-i18n="[title]optionsAutoFillSingleEntryHelpText">
                                     <label for="autoFillSingleEntry" data-i18n="optionsCheckboxAutoFillSingleEntry"></label>
-                                    <input class="form-check-input" type="checkbox" id="autoFillSingleEntry" name="autoFillSingleEntry" value="false" data-i18n="[title]optionsColumnautoFillSingleEntry">
-                                    <div class="form-text" data-i18n="optionsAutoFillSingleEntryHelpText"></div>
+                                    <input class="form-check-input" type="checkbox" id="autoFillSingleEntry" name="autoFillSingleEntry" value="false" data-i18n="[title]optionsAutoFillSingleEntryHelpText">
                                   </div>
                                 </div>
 
                                 <div class="form-group">
-                                  <div class="form-check">
+                                  <div class="form-check" data-i18n="[title]optionsAutoFillSingleTotpHelpText">
                                     <label for="autoFillSingleTotp" data-i18n="optionsCheckboxAutoFillSingleTotp"></label>
-                                    <input class="form-check-input" type="checkbox" id="autoFillSingleTotp" name="autoFillSingleTotp" value="false" data-i18n="[title]optionsColumnautoFillSingleTotp">
-                                    <div class="form-text" data-i18n="optionsAutoFillSingleTotpHelpText"></div>
+                                    <input class="form-check-input" type="checkbox" id="autoFillSingleTotp" name="autoFillSingleTotp" value="false" data-i18n="[title]optionsAutoFillSingleTotpHelpText">
                                   </div>
                                 </div>
                               </div>