diff --git a/src/dialogs/preferences/AsmOptionsWidget.ui b/src/dialogs/preferences/AsmOptionsWidget.ui
index 3b05299f..8e7cc9c8 100644
--- a/src/dialogs/preferences/AsmOptionsWidget.ui
+++ b/src/dialogs/preferences/AsmOptionsWidget.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>616</width>
-    <height>664</height>
+    <width>652</width>
+    <height>725</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -46,136 +46,106 @@
            <property name="title">
             <string>Disassembly</string>
            </property>
-           <layout class="QGridLayout" name="gridLayout_2">
-            <item row="1" column="0">
-             <layout class="QGridLayout" name="gridLayout">
-              <item row="7" column="0" colspan="2">
-               <widget class="QCheckBox" name="indentCheckBox">
-                <property name="text">
-                 <string>Indent disassembly based on reflines depth (asm.indent)</string>
-                </property>
-               </widget>
+           <layout class="QGridLayout" name="gridLayout">
+            <item row="5" column="2">
+             <widget class="QComboBox" name="caseComboBox">
+              <item>
+               <property name="text">
+                <string>Lowercase</string>
+               </property>
               </item>
-              <item row="4" column="0" colspan="2">
-               <widget class="QCheckBox" name="bblineCheckBox">
-                <property name="text">
-                 <string>Show empty line after every basic block (asm.bb.line)</string>
-                </property>
-               </widget>
+              <item>
+               <property name="text">
+                <string>Uppercase (asm.ucase)</string>
+               </property>
               </item>
-              <item row="2" column="1">
-               <widget class="QComboBox" name="caseComboBox">
-                <item>
-                 <property name="text">
-                  <string>Lowercase</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>Uppercase (asm.ucase)</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>Capitalize (asm.capitalize)</string>
-                 </property>
-                </item>
-               </widget>
+              <item>
+               <property name="text">
+                <string>Capitalize (asm.capitalize)</string>
+               </property>
               </item>
-              <item row="0" column="0">
-               <widget class="QLabel" name="label">
-                <property name="text">
-                 <string>Show Disassembly as:</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="0">
-               <widget class="QLabel" name="syntaxLabel">
-                <property name="text">
-                 <string>Syntax (asm.syntax):</string>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="1">
-               <widget class="QComboBox" name="asmComboBox">
-                <item>
-                 <property name="text">
-                  <string>Normal</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>ESIL (asm.esil)</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>Pseudocode (asm.pseudo)</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="5" column="0">
-               <widget class="QLabel" name="asmTabsLabel">
-                <property name="text">
-                 <string>Tabs in assembly (asm.tabs):</string>
-                </property>
-               </widget>
-              </item>
-              <item row="6" column="1">
-               <widget class="QSpinBox" name="asmTabsOffSpinBox">
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="singleStep">
-                 <number>5</number>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="0" colspan="2">
-               <widget class="QCheckBox" name="offsetCheckBox">
-                <property name="text">
-                 <string>Show offsets (asm.offset)</string>
-                </property>
-               </widget>
-              </item>
-              <item row="6" column="0">
-               <widget class="QLabel" name="asmTabsOffLabel">
-                <property name="text">
-                 <string>Tabs before assembly (asm.tabs.off):</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="1">
-               <widget class="QComboBox" name="syntaxComboBox"/>
-              </item>
-              <item row="5" column="1">
-               <widget class="QSpinBox" name="asmTabsSpinBox">
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="singleStep">
-                 <number>5</number>
-                </property>
-               </widget>
-              </item>
-              <item row="9" column="0" colspan="2">
-               <widget class="QCheckBox" name="bytespaceCheckBox">
-                <property name="text">
-                 <string>Separate bytes with whitespace (asm.bytespace)</string>
-                </property>
-               </widget>
-              </item>
-              <item row="8" column="0" colspan="2">
-               <widget class="QCheckBox" name="lbytesCheckBox">
-                <property name="text">
-                 <string>Align bytes to the left (asm.lbytes)</string>
-                </property>
-               </widget>
-              </item>
-             </layout>
+             </widget>
             </item>
-            <item row="0" column="0">
+            <item row="11" column="2">
+             <widget class="QSpinBox" name="asmTabsOffSpinBox">
+              <property name="maximum">
+               <number>100</number>
+              </property>
+              <property name="singleStep">
+               <number>5</number>
+              </property>
+             </widget>
+            </item>
+            <item row="10" column="1">
+             <widget class="QLabel" name="asmTabsLabel">
+              <property name="text">
+               <string>Tabs in assembly (asm.tabs):</string>
+              </property>
+             </widget>
+            </item>
+            <item row="4" column="2">
+             <widget class="QComboBox" name="syntaxComboBox"/>
+            </item>
+            <item row="10" column="2">
+             <widget class="QSpinBox" name="asmTabsSpinBox">
+              <property name="maximum">
+               <number>100</number>
+              </property>
+              <property name="singleStep">
+               <number>5</number>
+              </property>
+             </widget>
+            </item>
+            <item row="14" column="1" colspan="2">
+             <widget class="QCheckBox" name="bytespaceCheckBox">
+              <property name="text">
+               <string>Separate bytes with whitespace (asm.bytespace)</string>
+              </property>
+             </widget>
+            </item>
+            <item row="4" column="1">
+             <widget class="QLabel" name="syntaxLabel">
+              <property name="text">
+               <string>Syntax (asm.syntax):</string>
+              </property>
+             </widget>
+            </item>
+            <item row="12" column="1" colspan="2">
+             <widget class="QCheckBox" name="indentCheckBox">
+              <property name="text">
+               <string>Indent disassembly based on reflines depth (asm.indent)</string>
+              </property>
+             </widget>
+            </item>
+            <item row="7" column="1">
+             <widget class="QCheckBox" name="offsetCheckBox">
+              <property name="text">
+               <string>Show offsets (asm.offset)</string>
+              </property>
+             </widget>
+            </item>
+            <item row="11" column="1">
+             <widget class="QLabel" name="asmTabsOffLabel">
+              <property name="text">
+               <string>Tabs before assembly (asm.tabs.off):</string>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="1">
+             <widget class="QLabel" name="label">
+              <property name="text">
+               <string>Show Disassembly as:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="9" column="1" colspan="2">
+             <widget class="QCheckBox" name="bblineCheckBox">
+              <property name="text">
+               <string>Show empty line after every basic block (asm.bb.line)</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1" colspan="2">
              <spacer name="verticalSpacer_3">
               <property name="orientation">
                <enum>Qt::Vertical</enum>
@@ -191,6 +161,39 @@
               </property>
              </spacer>
             </item>
+            <item row="3" column="2" colspan="2">
+             <widget class="QComboBox" name="asmComboBox">
+              <item>
+               <property name="text">
+                <string>Normal</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>ESIL (asm.esil)</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Pseudocode (asm.pseudo)</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+            <item row="13" column="1" colspan="2">
+             <widget class="QCheckBox" name="lbytesCheckBox">
+              <property name="text">
+               <string>Align bytes to the left (asm.lbytes)</string>
+              </property>
+             </widget>
+            </item>
+            <item row="8" column="1">
+             <widget class="QCheckBox" name="bytesCheckBox">
+              <property name="text">
+               <string>Display the bytes of each instruction (asm.bytes)</string>
+              </property>
+             </widget>
+            </item>
            </layout>
           </widget>
          </item>
@@ -356,13 +359,6 @@
            </property>
           </widget>
          </item>
-         <item>
-          <widget class="QCheckBox" name="bytesCheckBox">
-           <property name="text">
-            <string>Show bytes (asm.bytes)</string>
-           </property>
-          </widget>
-         </item>
          <item>
           <layout class="QGridLayout" name="gridLayout_3">
            <property name="leftMargin">