diff --git a/scripts/gui/multibootusb.ui b/scripts/gui/multibootusb.ui
index 4d36da6..50f7ccc 100644
--- a/scripts/gui/multibootusb.ui
+++ b/scripts/gui/multibootusb.ui
@@ -308,7 +308,7 @@
        <bool>false</bool>
       </property>
       <property name="currentIndex">
-       <number>0</number>
+       <number>1</number>
       </property>
       <widget class="QWidget" name="tab_multibootusb">
        <property name="enabled">
@@ -351,7 +351,7 @@
             </property>
             <property name="icon">
              <iconset>
-			  <normaloff>:/icon_uninstall</normaloff>:/icon_uninstall</iconset>
+              <normaloff>:/icon_uninstall</normaloff>:/icon_uninstall</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -374,7 +374,7 @@
             </property>
             <property name="icon">
              <iconset>
-			  <normaloff>:/icon_install</normaloff>:/icon_install</iconset>
+              <normaloff>:/icon_install</normaloff>:/icon_install</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -483,7 +483,7 @@
           <property name="bottomMargin">
            <number>5</number>
           </property>
-          <item row="1" column="2">
+          <item row="3" column="2">
            <spacer name="horizontalSpacer_7">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
@@ -496,14 +496,14 @@
             </property>
            </spacer>
           </item>
-          <item row="1" column="1">
+          <item row="3" column="1">
            <widget class="QPushButton" name="button_write_image_to_disk">
             <property name="text">
              <string>Write image to USB</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="3" colspan="2">
+          <item row="3" column="3" colspan="2">
            <widget class="QWidget" name="widget_7" native="true">
             <layout class="QVBoxLayout" name="verticalLayout_6">
              <property name="leftMargin">
@@ -521,7 +521,7 @@
             </layout>
            </widget>
           </item>
-          <item row="1" column="0">
+          <item row="3" column="0">
            <spacer name="horizontalSpacer_5">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
@@ -534,8 +534,28 @@
             </property>
            </spacer>
           </item>
+          <item row="4" column="1">
+           <spacer name="verticalSpacer_3">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>40</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="1" column="1">
+           <widget class="QLabel" name="label_6">
+            <property name="text">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:14pt; font-weight:600; color:#ff0000;&quot;&gt;WARNING!&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#000000;&quot;&gt;This operation destroys &lt;/span&gt;&lt;span style=&quot; font-weight:600; color:#000000;&quot;&gt;ALL&lt;/span&gt;&lt;span style=&quot; color:#000000;&quot;&gt; data on the selected disk.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#000000;&quot;&gt;Please select the destination disk carefully.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
+           </widget>
+          </item>
           <item row="0" column="1">
-           <spacer name="verticalSpacer_4">
+           <spacer name="verticalSpacer_2">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
@@ -548,7 +568,7 @@
            </spacer>
           </item>
           <item row="2" column="1">
-           <spacer name="verticalSpacer_5">
+           <spacer name="verticalSpacer_4">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
diff --git a/scripts/gui/ui_multibootusb.py b/scripts/gui/ui_multibootusb.py
index 6a1fecd..138c48d 100644
--- a/scripts/gui/ui_multibootusb.py
+++ b/scripts/gui/ui_multibootusb.py
@@ -217,22 +217,27 @@ class Ui_MainWindow(object):
         self.gridLayout_9.setContentsMargins(5, 5, 5, 5)
         self.gridLayout_9.setObjectName("gridLayout_9")
         spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.gridLayout_9.addItem(spacerItem, 1, 2, 1, 1)
+        self.gridLayout_9.addItem(spacerItem, 3, 2, 1, 1)
         self.button_write_image_to_disk = QtWidgets.QPushButton(self.tab_imager)
         self.button_write_image_to_disk.setObjectName("button_write_image_to_disk")
-        self.gridLayout_9.addWidget(self.button_write_image_to_disk, 1, 1, 1, 1)
+        self.gridLayout_9.addWidget(self.button_write_image_to_disk, 3, 1, 1, 1)
         self.widget_7 = QtWidgets.QWidget(self.tab_imager)
         self.widget_7.setObjectName("widget_7")
         self.verticalLayout_6 = QtWidgets.QVBoxLayout(self.widget_7)
         self.verticalLayout_6.setContentsMargins(5, 5, 5, 5)
         self.verticalLayout_6.setObjectName("verticalLayout_6")
-        self.gridLayout_9.addWidget(self.widget_7, 1, 3, 1, 2)
+        self.gridLayout_9.addWidget(self.widget_7, 3, 3, 1, 2)
         spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.gridLayout_9.addItem(spacerItem1, 1, 0, 1, 1)
+        self.gridLayout_9.addItem(spacerItem1, 3, 0, 1, 1)
         spacerItem2 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.gridLayout_9.addItem(spacerItem2, 0, 1, 1, 1)
+        self.gridLayout_9.addItem(spacerItem2, 4, 1, 1, 1)
+        self.label_6 = QtWidgets.QLabel(self.tab_imager)
+        self.label_6.setObjectName("label_6")
+        self.gridLayout_9.addWidget(self.label_6, 1, 1, 1, 1)
         spacerItem3 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.gridLayout_9.addItem(spacerItem3, 2, 1, 1, 1)
+        self.gridLayout_9.addItem(spacerItem3, 0, 1, 1, 1)
+        spacerItem4 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.gridLayout_9.addItem(spacerItem4, 2, 1, 1, 1)
         self.horizontalLayout_7.addLayout(self.gridLayout_9)
         self.tabWidget.addTab(self.tab_imager, "")
         self.tab_syslinux = QtWidgets.QWidget()
@@ -257,12 +262,12 @@ class Ui_MainWindow(object):
         self.button_install_syslinux = QtWidgets.QPushButton(self.groupBox_2)
         self.button_install_syslinux.setObjectName("button_install_syslinux")
         self.gridLayout_3.addWidget(self.button_install_syslinux, 0, 2, 2, 1)
-        spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.gridLayout_3.addItem(spacerItem4, 0, 1, 2, 1)
+        spacerItem5 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.gridLayout_3.addItem(spacerItem5, 0, 1, 2, 1)
         self.horizontalLayout_4.addLayout(self.gridLayout_3)
         self.gridLayout_2.addWidget(self.groupBox_2, 0, 0, 1, 1)
-        spacerItem5 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.gridLayout_2.addItem(spacerItem5, 3, 0, 1, 1)
+        spacerItem6 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.gridLayout_2.addItem(spacerItem6, 3, 0, 1, 1)
         self.groupBox_3 = QtWidgets.QGroupBox(self.tab_syslinux)
         self.groupBox_3.setObjectName("groupBox_3")
         self.horizontalLayout_5 = QtWidgets.QHBoxLayout(self.groupBox_3)
@@ -275,12 +280,12 @@ class Ui_MainWindow(object):
         self.label_2 = QtWidgets.QLabel(self.groupBox_3)
         self.label_2.setObjectName("label_2")
         self.gridLayout_4.addWidget(self.label_2, 0, 0, 1, 1)
-        spacerItem6 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.gridLayout_4.addItem(spacerItem6, 0, 1, 1, 1)
+        spacerItem7 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.gridLayout_4.addItem(spacerItem7, 0, 1, 1, 1)
         self.horizontalLayout_5.addLayout(self.gridLayout_4)
         self.gridLayout_2.addWidget(self.groupBox_3, 2, 0, 1, 1)
-        spacerItem7 = QtWidgets.QSpacerItem(20, 20, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
-        self.gridLayout_2.addItem(spacerItem7, 1, 0, 1, 1)
+        spacerItem8 = QtWidgets.QSpacerItem(20, 20, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
+        self.gridLayout_2.addItem(spacerItem8, 1, 0, 1, 1)
         self.horizontalLayout_3.addLayout(self.gridLayout_2)
         self.tabWidget.addTab(self.tab_syslinux, "")
         self.tab_testboot = QtWidgets.QWidget()
@@ -310,13 +315,13 @@ class Ui_MainWindow(object):
         self.label_4 = QtWidgets.QLabel(self.groupBox_4)
         self.label_4.setObjectName("label_4")
         self.gridLayout_8.addWidget(self.label_4, 0, 0, 1, 1)
-        spacerItem8 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.gridLayout_8.addItem(spacerItem8, 0, 5, 1, 1)
+        spacerItem9 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.gridLayout_8.addItem(spacerItem9, 0, 5, 1, 1)
         self.boot_usb_qemu = QtWidgets.QPushButton(self.groupBox_4)
         self.boot_usb_qemu.setObjectName("boot_usb_qemu")
         self.gridLayout_8.addWidget(self.boot_usb_qemu, 0, 4, 1, 1)
-        spacerItem9 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.gridLayout_8.addItem(spacerItem9, 0, 3, 1, 1)
+        spacerItem10 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.gridLayout_8.addItem(spacerItem10, 0, 3, 1, 1)
         self.label_5 = QtWidgets.QLabel(self.groupBox_4)
         self.label_5.setObjectName("label_5")
         self.gridLayout_8.addWidget(self.label_5, 0, 2, 1, 1)
@@ -334,8 +339,8 @@ class Ui_MainWindow(object):
         self.boot_iso_qemu = QtWidgets.QPushButton(self.groupBox_5)
         self.boot_iso_qemu.setObjectName("boot_iso_qemu")
         self.gridLayout_7.addWidget(self.boot_iso_qemu, 0, 4, 1, 1)
-        spacerItem10 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.gridLayout_7.addItem(spacerItem10, 0, 3, 1, 1)
+        spacerItem11 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.gridLayout_7.addItem(spacerItem11, 0, 3, 1, 1)
         self.combo_iso_boot_ram = QtWidgets.QComboBox(self.groupBox_5)
         self.combo_iso_boot_ram.setObjectName("combo_iso_boot_ram")
         self.combo_iso_boot_ram.addItem("")
@@ -345,16 +350,16 @@ class Ui_MainWindow(object):
         self.combo_iso_boot_ram.addItem("")
         self.combo_iso_boot_ram.addItem("")
         self.gridLayout_7.addWidget(self.combo_iso_boot_ram, 0, 1, 1, 1)
-        spacerItem11 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.gridLayout_7.addItem(spacerItem11, 0, 5, 1, 1)
+        spacerItem12 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.gridLayout_7.addItem(spacerItem12, 0, 5, 1, 1)
         self.label = QtWidgets.QLabel(self.groupBox_5)
         self.label.setObjectName("label")
         self.gridLayout_7.addWidget(self.label, 0, 2, 1, 1)
         self.verticalLayout_3.addLayout(self.gridLayout_7)
         self.gridLayout_6.addWidget(self.groupBox_5, 0, 0, 1, 1)
         self.verticalLayout_2.addLayout(self.gridLayout_6)
-        spacerItem12 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout_2.addItem(spacerItem12)
+        spacerItem13 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout_2.addItem(spacerItem13)
         self.tabWidget.addTab(self.tab_testboot, "")
         self.verticalLayout_7.addWidget(self.tabWidget)
         self.progressbar = QtWidgets.QProgressBar(self.centralwidget)
@@ -385,7 +390,7 @@ class Ui_MainWindow(object):
         self.menubar.addAction(self.menu_Help.menuAction())
 
         self.retranslateUi(MainWindow)
-        self.tabWidget.setCurrentIndex(0)
+        self.tabWidget.setCurrentIndex(1)
         QtCore.QMetaObject.connectSlotsByName(MainWindow)
 
     def retranslateUi(self, MainWindow):
@@ -415,6 +420,7 @@ class Ui_MainWindow(object):
         self.label_persistence_value.setText(_translate("MainWindow", "0 MB"))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_multibootusb), _translate("MainWindow", "MultiBootUSB"))
         self.button_write_image_to_disk.setText(_translate("MainWindow", "Write image to USB"))
+        self.label_6.setText(_translate("MainWindow", "<html><head/><body><p align=\"center\"><span style=\" font-size:14pt; font-weight:600; color:#ff0000;\">WARNING!</span></p><p align=\"center\"><span style=\" color:#000000;\">This operation destroys </span><span style=\" font-weight:600; color:#000000;\">ALL</span><span style=\" color:#000000;\"> data on the selected disk.</span></p><p align=\"center\"><span style=\" color:#000000;\">Please select the destination disk carefully.</span></p></body></html>"))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_imager), _translate("MainWindow", "Write Image to disk"))
         self.groupBox_2.setTitle(_translate("MainWindow", "Install Syslinux"))
         self.check_install_sys_only.setText(_translate("MainWindow", "Install only syslinu&x (existing configurations will not be altered)."))
diff --git a/scripts/mbusb_gui.py b/scripts/mbusb_gui.py
index d83a9de..58738f6 100644
--- a/scripts/mbusb_gui.py
+++ b/scripts/mbusb_gui.py
@@ -591,18 +591,18 @@ Are you SURE you want to enable it?",
         self.ui_disable_controls()
 
         if not config.usb_disk:
-            QtWidgets.QMessageBox.information(self, 'No USB...', 'Please Insert USB disk and rerun multibootusb.')
+            QtWidgets.QMessageBox.information(self, 'No USB disk selected', 'Please insert USB disk and click "Detect Drives".')
             self.ui_enable_controls()
         elif not config.image_path:
-            QtWidgets.QMessageBox.information(self, 'No ISO...', 'Please select an ISO.')
+            QtWidgets.QMessageBox.information(self, 'No ISO selected', 'Please select an ISO.')
             self.ui_enable_controls()
         else:
             imager = Imager()
-            if platform.system() == 'Linux' and config.usb_disk[-1].isdigit() is True:
-                gen.log('Selected disk is a partitions. Please select a disk from the drop down list')
-                QtWidgets.QMessageBox.information(self, 'Wrong Disk...!', 'Disk selected is a partition.\nISO is to '
-                                                                          'be written to whole disk for proper functioning'
-                                                                          '.\n\nPlease select the disk from the drop down list.')
+            if platform.system() == 'Linux' and config.usb_details['devtype'] == "partition":
+                gen.log('Selected device is a partition. Please select a disk from the drop down list')
+                QtWidgets.QMessageBox.information(self, 'Incompatible device', 'Selected device (%s) is a partition!\n'
+                                                                          'ISO must be written to a whole disk.'
+                                                                          '\n\nPlease select a disk from the drop down list.' % config.usb_disk)
                 self.ui_enable_controls()
             else:
                 usb_disk_size = int(imager.imager_usb_detail(config.usb_disk, partition=0).total_size)