diff --git a/docs/src/plasma/qtplasmac.adoc b/docs/src/plasma/qtplasmac.adoc
index bffff11feb0..0ee56ee141f 100644
--- a/docs/src/plasma/qtplasmac.adoc
+++ b/docs/src/plasma/qtplasmac.adoc
@@ -4182,6 +4182,8 @@ These are the files that require creating/editing for each language.
 
 The .qm files are the compiled translation files used by pyqt.
 
+The directories qtplasmac_4x3/languages and qtplasmac_9x16/languages are only for links to the .qm files in qtplasmac/languages.
+
 The language is determined by an underscore plus the first two letters of the locale.
 For example, if an Italian translation was being done then it would be `_it`.
 It will be referred to as `_xx` in this document, so `qtplasmac_xx.ts` in this document would actually be `qtplasmac_it.ts` for an Italian translation.
@@ -4228,22 +4230,26 @@ The user needs to be careful with the length of strings that appear on widgets a
 When editing is complete save the file: +
 `File -> Save`
 
-
 Then create the .qm file: +
 `File -> Release`
 
+Close linguist.
 
 Then create links to the compiled .qm file for the other QtPlasmaC GUIs.
 ----
-$ ln -s qtplasmac_en.qm ../../qtplasmac_4x3/languages/
-$ ln -s qtplasmac_en.qm ../../qtplasmac_9x16/languages/
+$ ./langlink xx
 ----
 
+[NOTE]
+this command is a script which creates a link in both qtplasmac_4x3/languages and qtplasmac_9x16/languages to the above .qm file and then renames the link to match the GUI name.
+
 QtPlasmaC will be translated to the language of the current locale on the next start so long as a .qm file exists in that language.
 
 Users are welcome to submit translation files for inclusion into QtPlasmaC.
+An easy method is to post the up to date qtplasmac_xx.ts file on the forum and the maintainers will install the translations.
+
 The preferred method is to submit a pull request from the users GitHub account as described in the https://www.linuxcnc.org/docs/html/code/contributing-to-linuxcnc.html[contributing to LinuxCNC] documentation.
-The only files required to be committed are qtplasmac_xx.ts and qtplasmac_xx.qm.
+The files required to be committed are qtplasmac_xx.ts and qtplasmac_xx.qm in the qtplasmc/languages directory plus the links in both the qtplasmac_4x3/languages and qtplasmac_9x16/languages directories.
 
 == Appendix
 
diff --git a/share/qtvcp/screens/qtplasmac/language_howto b/share/qtvcp/screens/qtplasmac/language_howto
index 73382fc1abd..4c6d8a959c1 100644
--- a/share/qtvcp/screens/qtplasmac/language_howto
+++ b/share/qtvcp/screens/qtplasmac/language_howto
@@ -10,6 +10,8 @@ The .ts files are the translation source files for the translations. These are t
 
 The .qm files are the compiled translation files used by pyqt.
 
+The directories qtplasmac_4x3/languages and qtplasmac_9x16/languages are only for links to the .qm files in qtplasmac/languages.
+
 The language is determined by an underscore plus the first two letters of the locale, for example if an Italian translation was being done then it would be "_it". We will refer to it in the following as _xx, so "qtplasmac_xx.ts" for an Italian translation would be "qtplasmac_it.ts".
 
 If any of the following utilities are not installed then you will need to install pyqt5-dev-tools:
@@ -24,7 +26,7 @@ $ pyuic5 ../qtplasmac.ui > qtplasmac.py
 You can either create a new translation source file for a non existing language translation or modify an existing translation source file due to changes being made to some text in a QtPlasmaC source file. If modifying an existing translation that has had no source file changes then this step is not required.
 
 Create/edit a .ts file:
-$ langfile xx
+$ ./langfile xx
 
 (this command is a script which runs the following: $ pylupdate5 *.py ../*.py ../../../../../lib/python/qtvcp/lib/qtplasmac/*.py -ts qtplasmac_xx.ts)
 
@@ -40,9 +42,15 @@ When editing is complete save the file: File > Save
 
 Then create the .qm file: File > Release
 
+Close linguist.
+
 Then create links to the compiled .qm file for the other QtPlasmaC GUIs.
-$ ln -s qtplasmac_en.qm ../../qtplasmac_4x3/languages/
-$ ln -s qtplasmac_en.qm ../../qtplasmac_9x16/languages/
+$ ./langlink xx
 
 QtPlasmaC will be translated to the language of the current locale on the next start so long as a .qm file exists in that language.
 
+Users are welcome to submit translation files for inclusion into QtPlasmaC.
+An easy method is to post the up to date qtplasmac_xx.ts file on the forum and the maintainers will install the translations.
+
+The preferred method is to submit a pull request from the users GitHub account as described in the documentation: https://www.linuxcnc.org/docs/html/code/contributing-to-linuxcnc.html
+The files required to be committed are qtplasmac_xx.ts and qtplasmac_xx.qm in the qtplasmc/languages directory plus the links in both the qtplasmac_4x3/languages and qtplasmac_9x16/languages directories.
diff --git a/share/qtvcp/screens/qtplasmac/languages/langfile b/share/qtvcp/screens/qtplasmac/languages/langfile
index 3255b133380..bc0cafb0b5e 100755
--- a/share/qtvcp/screens/qtplasmac/languages/langfile
+++ b/share/qtvcp/screens/qtplasmac/languages/langfile
@@ -1,13 +1,15 @@
 #!/bin/bash
 
+# creates a .ts file for language translation using Qt Linguist
+
 if [ $# -eq 0 ]; then
-    echo -e '\nlocale is missing\n'
+    echo -e "\nlocale is missing\n"
     exit
 elif [ ${#1} -ne 2 ]; then
-    echo -e '\nlocale needs to be two characters\n'
+    echo -e "\nlocale needs to be two characters\n"
     exit
 fi
 
-echo -e '\ncreating language translation file qtplasmac_'$1'.ts\n'
+echo -e "\ncreating language translation file qtplasmac_$1.ts\n"
 
 pylupdate5 *.py ../*.py ../../../../../lib/python/qtvcp/lib/qtplasmac/*.py -ts qtplasmac_$1.ts
diff --git a/share/qtvcp/screens/qtplasmac/languages/langlink b/share/qtvcp/screens/qtplasmac/languages/langlink
new file mode 100755
index 00000000000..e56591ebe3d
--- /dev/null
+++ b/share/qtvcp/screens/qtplasmac/languages/langlink
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# creates links to the Qt translation .qm filefor the 4x3 and 9x16 GUIs
+
+if [ $# -eq 0 ]; then
+    echo -e "\nlocale is missing\n"
+    exit
+elif [ ${#1} -ne 2 ]; then
+    echo -e "\nlocale needs to be two characters\n"
+    exit
+fi
+
+
+if [ ! -f "qtplasmac_$1.qm" ]
+then
+    echo -e "\nlanguage file qtplasmac_$1.qm does not exist\n"
+    exit
+else
+    echo -e "\ncreating links to qtplasmac_$1.qn translation for qtplasmac_4x3 and qtplasmac_9x16\n"
+    mkdir -p "../../qtplasmac_4x3/languages"
+    mkdir -p "../../qtplasmac_9x16/languages"
+    ln -rs qtplasmac_sk.qm -t ../../qtplasmac_4x3/languages
+    ln -rs qtplasmac_sk.qm -t ../../qtplasmac_9x16/languages
+    mv ../../qtplasmac_4x3/languages/qtplasmac_sk.qm ../../qtplasmac_4x3/languages/qtplasmac_4x3_sk.qm
+    mv ../../qtplasmac_9x16/languages/qtplasmac_sk.qm ../../qtplasmac_9x16/languages/qtplasmac_9x16_sk.qm
+fi
diff --git a/share/qtvcp/screens/qtplasmac/languages/qtplasmac.py b/share/qtvcp/screens/qtplasmac/languages/qtplasmac.py
index ca39afdcc7e..7b237582e04 100644
--- a/share/qtvcp/screens/qtplasmac/languages/qtplasmac.py
+++ b/share/qtvcp/screens/qtplasmac/languages/qtplasmac.py
@@ -2,16 +2,19 @@
 
 # Form implementation generated from reading ui file '../qtplasmac.ui'
 #
-# Created by: PyQt5 UI code generator 5.11.3
+# Created by: PyQt5 UI code generator 5.15.9
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# run again.  Do not edit this file unless you know what you are doing.
+
 
 from PyQt5 import QtCore, QtGui, QtWidgets
 
+
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
         MainWindow.setObjectName("MainWindow")
-        MainWindow.resize(1348, 871)
+        MainWindow.resize(1348, 866)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -39,13 +42,12 @@ def setupUi(self, MainWindow):
         self.screen_options.setStyleSheet("")
         self.screen_options.setProperty("notify_option", True)
         self.screen_options.setProperty("catch_close_option", False)
+        self.screen_options.setProperty("close_overlay_color", QtGui.QColor(128, 128, 128, 128))
         self.screen_options.setProperty("play_sounds_option", False)
         self.screen_options.setProperty("use_pref_file_option", True)
-        self.screen_options.setProperty("pref_filename_string", "CONFIGFOLDER/qtplasmac.prefs")
         self.screen_options.setProperty("focusOverlay_option", True)
         self.screen_options.setProperty("message_overlay_color", QtGui.QColor(128, 128, 128, 128))
         self.screen_options.setProperty("closeDialog_option", True)
-        self.screen_options.setProperty("close_overlay_color", QtGui.QColor(128, 128, 128, 128))
         self.screen_options.setProperty("entryDialog_option", True)
         self.screen_options.setProperty("entryDialogSoftkey_option", True)
         self.screen_options.setProperty("entry_overlay_color", QtGui.QColor(128, 128, 128, 128))
@@ -59,6 +61,7 @@ def setupUi(self, MainWindow):
         self.screen_options.setProperty("camViewDialog_option", False)
         self.screen_options.setProperty("camView_overlay_color", QtGui.QColor(128, 128, 128, 128))
         self.screen_options.setProperty("toolOffset_overlay_color", QtGui.QColor(128, 128, 128, 128))
+        self.screen_options.setProperty("originOffsetDialog_option", False)
         self.screen_options.setProperty("originOffset_overlay_color", QtGui.QColor(128, 128, 128, 128))
         self.screen_options.setProperty("calculatorDialog_option", True)
         self.screen_options.setProperty("calculator_overlay_color", QtGui.QColor(128, 128, 128, 128))
@@ -77,6 +80,7 @@ def setupUi(self, MainWindow):
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.main_tab_widget.sizePolicy().hasHeightForWidth())
         self.main_tab_widget.setSizePolicy(sizePolicy)
+        self.main_tab_widget.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.main_tab_widget.setTabPosition(QtWidgets.QTabWidget.South)
         self.main_tab_widget.setUsesScrollButtons(False)
         self.main_tab_widget.setObjectName("main_tab_widget")
@@ -128,6 +132,11 @@ def setupUi(self, MainWindow):
         self.horizontalLayout_3.setContentsMargins(0, 0, 0, 0)
         self.horizontalLayout_3.setSpacing(0)
         self.horizontalLayout_3.setObjectName("horizontalLayout_3")
+        self.material_label = QtWidgets.QLabel(self.frame_22)
+        self.material_label.setMinimumSize(QtCore.QSize(0, 16))
+        self.material_label.setMaximumSize(QtCore.QSize(16777215, 16))
+        self.material_label.setObjectName("material_label")
+        self.horizontalLayout_3.addWidget(self.material_label)
         self.material_selector = QtWidgets.QComboBox(self.frame_22)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
@@ -135,6 +144,7 @@ def setupUi(self, MainWindow):
         sizePolicy.setHeightForWidth(self.material_selector.sizePolicy().hasHeightForWidth())
         self.material_selector.setSizePolicy(sizePolicy)
         self.material_selector.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.material_selector.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.material_selector.setObjectName("material_selector")
         self.horizontalLayout_3.addWidget(self.material_selector)
         self.velocity_label = QtWidgets.QLabel(self.frame_22)
@@ -187,9 +197,19 @@ def setupUi(self, MainWindow):
         self.verticalLayout_3.setObjectName("verticalLayout_3")
         spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
         self.verticalLayout_3.addItem(spacerItem)
+        self.view_t = QtWidgets.QPushButton(self.preview_buttons)
+        self.view_t.setMinimumSize(QtCore.QSize(40, 28))
+        self.view_t.setMaximumSize(QtCore.QSize(40, 28))
+        self.view_t.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.view_t.setText("T")
+        self.view_t.setCheckable(True)
+        self.view_t.setAutoExclusive(True)
+        self.view_t.setObjectName("view_t")
+        self.verticalLayout_3.addWidget(self.view_t)
         self.view_p = QtWidgets.QPushButton(self.preview_buttons)
         self.view_p.setMinimumSize(QtCore.QSize(40, 28))
         self.view_p.setMaximumSize(QtCore.QSize(40, 28))
+        self.view_p.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.view_p.setText("P")
         self.view_p.setCheckable(True)
         self.view_p.setAutoExclusive(True)
@@ -198,6 +218,7 @@ def setupUi(self, MainWindow):
         self.view_z = QtWidgets.QPushButton(self.preview_buttons)
         self.view_z.setMinimumSize(QtCore.QSize(40, 28))
         self.view_z.setMaximumSize(QtCore.QSize(40, 28))
+        self.view_z.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.view_z.setText("Z")
         self.view_z.setCheckable(True)
         self.view_z.setChecked(True)
@@ -213,6 +234,7 @@ def setupUi(self, MainWindow):
         self.pan_right = QtWidgets.QPushButton(self.preview_buttons)
         self.pan_right.setMinimumSize(QtCore.QSize(40, 28))
         self.pan_right.setMaximumSize(QtCore.QSize(40, 28))
+        self.pan_right.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.pan_right.setText("→")
         self.pan_right.setAutoRepeat(True)
         self.pan_right.setObjectName("pan_right")
@@ -220,6 +242,7 @@ def setupUi(self, MainWindow):
         self.pan_left = QtWidgets.QPushButton(self.preview_buttons)
         self.pan_left.setMinimumSize(QtCore.QSize(40, 28))
         self.pan_left.setMaximumSize(QtCore.QSize(40, 28))
+        self.pan_left.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.pan_left.setText("←")
         self.pan_left.setAutoRepeat(True)
         self.pan_left.setObjectName("pan_left")
@@ -227,6 +250,7 @@ def setupUi(self, MainWindow):
         self.pan_up = QtWidgets.QPushButton(self.preview_buttons)
         self.pan_up.setMinimumSize(QtCore.QSize(40, 28))
         self.pan_up.setMaximumSize(QtCore.QSize(40, 28))
+        self.pan_up.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.pan_up.setText("↑")
         self.pan_up.setAutoRepeat(True)
         self.pan_up.setObjectName("pan_up")
@@ -234,6 +258,7 @@ def setupUi(self, MainWindow):
         self.pan_down = QtWidgets.QPushButton(self.preview_buttons)
         self.pan_down.setMinimumSize(QtCore.QSize(40, 28))
         self.pan_down.setMaximumSize(QtCore.QSize(40, 28))
+        self.pan_down.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.pan_down.setText("↓")
         self.pan_down.setAutoRepeat(True)
         self.pan_down.setObjectName("pan_down")
@@ -247,6 +272,7 @@ def setupUi(self, MainWindow):
         self.zoom_in = QtWidgets.QPushButton(self.preview_buttons)
         self.zoom_in.setMinimumSize(QtCore.QSize(40, 28))
         self.zoom_in.setMaximumSize(QtCore.QSize(40, 28))
+        self.zoom_in.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.zoom_in.setText("+")
         self.zoom_in.setAutoRepeat(True)
         self.zoom_in.setObjectName("zoom_in")
@@ -254,6 +280,7 @@ def setupUi(self, MainWindow):
         self.zoom_out = QtWidgets.QPushButton(self.preview_buttons)
         self.zoom_out.setMinimumSize(QtCore.QSize(40, 28))
         self.zoom_out.setMaximumSize(QtCore.QSize(40, 28))
+        self.zoom_out.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.zoom_out.setText("-")
         self.zoom_out.setAutoRepeat(True)
         self.zoom_out.setObjectName("zoom_out")
@@ -267,6 +294,7 @@ def setupUi(self, MainWindow):
         self.view_clear = QtWidgets.QPushButton(self.preview_buttons)
         self.view_clear.setMinimumSize(QtCore.QSize(40, 28))
         self.view_clear.setMaximumSize(QtCore.QSize(40, 28))
+        self.view_clear.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.view_clear.setText("C")
         self.view_clear.setObjectName("view_clear")
         self.verticalLayout_3.addWidget(self.view_clear)
@@ -316,7 +344,7 @@ def setupUi(self, MainWindow):
         self.horizontalLayout_20.setContentsMargins(4, 0, 4, 0)
         self.horizontalLayout_20.setSpacing(4)
         self.horizontalLayout_20.setObjectName("horizontalLayout_20")
-        self.file_select = PushButton(self.file_buttons_2)
+        self.file_select = IndicatedPushButton(self.file_buttons_2)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -325,11 +353,10 @@ def setupUi(self, MainWindow):
         self.file_select.setMinimumSize(QtCore.QSize(40, 40))
         self.file_select.setMaximumSize(QtCore.QSize(16777215, 16777215))
         self.file_select.setProperty("python_command_option", True)
-        self.file_select.setProperty("true_python_cmd_string", "INSTANCE.filemanager.load()")
         self.file_select.setProperty("false_python_cmd_string", "")
         self.file_select.setObjectName("file_select")
         self.horizontalLayout_20.addWidget(self.file_select)
-        self.file_next = PushButton(self.file_buttons_2)
+        self.file_next = IndicatedPushButton(self.file_buttons_2)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -339,11 +366,10 @@ def setupUi(self, MainWindow):
         self.file_next.setMaximumSize(QtCore.QSize(16777215, 16777215))
         self.file_next.setAutoRepeat(True)
         self.file_next.setProperty("python_command_option", True)
-        self.file_next.setProperty("true_python_cmd_string", "INSTANCE.filemanager.down()")
         self.file_next.setProperty("false_python_cmd_string", "")
         self.file_next.setObjectName("file_next")
         self.horizontalLayout_20.addWidget(self.file_next)
-        self.file_prev = PushButton(self.file_buttons_2)
+        self.file_prev = IndicatedPushButton(self.file_buttons_2)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -353,7 +379,6 @@ def setupUi(self, MainWindow):
         self.file_prev.setMaximumSize(QtCore.QSize(16777215, 16777215))
         self.file_prev.setAutoRepeat(True)
         self.file_prev.setProperty("python_command_option", True)
-        self.file_prev.setProperty("true_python_cmd_string", "INSTANCE.filemanager.up()")
         self.file_prev.setProperty("false_python_cmd_string", "")
         self.file_prev.setObjectName("file_prev")
         self.horizontalLayout_20.addWidget(self.file_prev)
@@ -497,6 +522,84 @@ def setupUi(self, MainWindow):
         self.verticalLayout_47.addWidget(self.camview_widgets)
         self.horizontalLayout_13.addWidget(self.camview_frame)
         self.preview_stack.addWidget(self.camview_page)
+        self.offsets_page = QtWidgets.QWidget()
+        self.offsets_page.setObjectName("offsets_page")
+        self.horizontalLayout_36 = QtWidgets.QHBoxLayout(self.offsets_page)
+        self.horizontalLayout_36.setContentsMargins(0, 0, 0, 0)
+        self.horizontalLayout_36.setSpacing(0)
+        self.horizontalLayout_36.setObjectName("horizontalLayout_36")
+        self.originoffsetview = OriginOffsetView(self.offsets_page)
+        self.originoffsetview.setProperty("dialog_code_string", "")
+        self.originoffsetview.setProperty("text_dialog_code_string", "")
+        self.originoffsetview.setObjectName("originoffsetview")
+        self.horizontalLayout_36.addWidget(self.originoffsetview)
+        self.preview_stack.addWidget(self.offsets_page)
+        self.webview_page = QtWidgets.QWidget()
+        self.webview_page.setObjectName("webview_page")
+        self.verticalLayout_60 = QtWidgets.QVBoxLayout(self.webview_page)
+        self.verticalLayout_60.setContentsMargins(0, 0, 0, 0)
+        self.verticalLayout_60.setSpacing(0)
+        self.verticalLayout_60.setObjectName("verticalLayout_60")
+        self.webview_frame = QtWidgets.QFrame(self.webview_page)
+        self.webview_frame.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.webview_frame.setFrameShadow(QtWidgets.QFrame.Plain)
+        self.webview_frame.setObjectName("webview_frame")
+        self.verticalLayout_61 = QtWidgets.QVBoxLayout(self.webview_frame)
+        self.verticalLayout_61.setContentsMargins(0, 0, 0, 2)
+        self.verticalLayout_61.setSpacing(2)
+        self.verticalLayout_61.setObjectName("verticalLayout_61")
+        self.webview_buttons = QtWidgets.QFrame(self.webview_frame)
+        self.webview_buttons.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.webview_buttons.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.webview_buttons.setFrameShadow(QtWidgets.QFrame.Plain)
+        self.webview_buttons.setObjectName("webview_buttons")
+        self.horizontalLayout_10 = QtWidgets.QHBoxLayout(self.webview_buttons)
+        self.horizontalLayout_10.setContentsMargins(0, 0, 0, 0)
+        self.horizontalLayout_10.setSpacing(1)
+        self.horizontalLayout_10.setObjectName("horizontalLayout_10")
+        self.webview_back = QtWidgets.QPushButton(self.webview_buttons)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.webview_back.sizePolicy().hasHeightForWidth())
+        self.webview_back.setSizePolicy(sizePolicy)
+        self.webview_back.setMaximumSize(QtCore.QSize(16777215, 16))
+        self.webview_back.setObjectName("webview_back")
+        self.horizontalLayout_10.addWidget(self.webview_back)
+        self.webview_reload = QtWidgets.QPushButton(self.webview_buttons)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.webview_reload.sizePolicy().hasHeightForWidth())
+        self.webview_reload.setSizePolicy(sizePolicy)
+        self.webview_reload.setMaximumSize(QtCore.QSize(16777215, 16))
+        self.webview_reload.setObjectName("webview_reload")
+        self.horizontalLayout_10.addWidget(self.webview_reload)
+        self.webview_forward = QtWidgets.QPushButton(self.webview_buttons)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.webview_forward.sizePolicy().hasHeightForWidth())
+        self.webview_forward.setSizePolicy(sizePolicy)
+        self.webview_forward.setMaximumSize(QtCore.QSize(16777215, 16))
+        self.webview_forward.setObjectName("webview_forward")
+        self.horizontalLayout_10.addWidget(self.webview_forward)
+        self.verticalLayout_61.addWidget(self.webview_buttons)
+        self.webview_place = QtWidgets.QFrame(self.webview_frame)
+        self.webview_place.setFrameShape(QtWidgets.QFrame.StyledPanel)
+        self.webview_place.setFrameShadow(QtWidgets.QFrame.Raised)
+        self.webview_place.setObjectName("webview_place")
+        self.horizontalLayout_40 = QtWidgets.QHBoxLayout(self.webview_place)
+        self.horizontalLayout_40.setContentsMargins(2, 0, 2, 0)
+        self.horizontalLayout_40.setSpacing(2)
+        self.horizontalLayout_40.setObjectName("horizontalLayout_40")
+        self.webview = WebWidget(self.webview_place)
+        self.webview.setObjectName("webview")
+        self.horizontalLayout_40.addWidget(self.webview)
+        self.verticalLayout_61.addWidget(self.webview_place)
+        self.verticalLayout_61.setStretch(1, 1)
+        self.verticalLayout_60.addWidget(self.webview_frame)
+        self.preview_stack.addWidget(self.webview_page)
         self.verticalLayout_31.addWidget(self.preview_stack)
         self.main_tab_Layout.addWidget(self.main_c1)
         self.main_c2 = QtWidgets.QFrame(self.main_tab)
@@ -547,6 +650,7 @@ def setupUi(self, MainWindow):
         self.estop.setMinimumSize(QtCore.QSize(60, 40))
         self.estop.setMaximumSize(QtCore.QSize(16777215, 40))
         self.estop.setBaseSize(QtCore.QSize(0, 0))
+        self.estop.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.estop.setIconSize(QtCore.QSize(0, 0))
         self.estop.setCheckable(True)
         self.estop.setChecked(False)
@@ -576,7 +680,7 @@ def setupUi(self, MainWindow):
         self.estop.setProperty("alt_textTemplate", "%1.2f mm")
         self.estop.setObjectName("estop")
         self.horizontalLayout_8.addWidget(self.estop)
-        self.power = ActionButton(self.frame_31)
+        self.power = QtWidgets.QPushButton(self.frame_31)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -585,21 +689,10 @@ def setupUi(self, MainWindow):
         self.power.setMinimumSize(QtCore.QSize(60, 40))
         self.power.setMaximumSize(QtCore.QSize(16777215, 40))
         self.power.setBaseSize(QtCore.QSize(0, 0))
+        self.power.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.power.setToolTip("")
         self.power.setIconSize(QtCore.QSize(0, 0))
         self.power.setCheckable(True)
-        self.power.setProperty("indicator_option", False)
-        self.power.setProperty("indicator_HAL_pin_option", False)
-        self.power.setProperty("indicator_status_option", False)
-        self.power.setProperty("checked_state_text_option", False)
-        self.power.setProperty("on_color", QtGui.QColor(255, 0, 0))
-        self.power.setProperty("off_color", QtGui.QColor(0, 0, 0))
-        self.power.setProperty("indicator_size", 0.2)
-        self.power.setProperty("true_state_string", "")
-        self.power.setProperty("false_state_string", "")
-        self.power.setProperty("is_estopped_status", False)
-        self.power.setProperty("is_on_status", True)
-        self.power.setProperty("machine_on_action", True)
         self.power.setObjectName("power")
         self.horizontalLayout_8.addWidget(self.power)
         self.verticalLayout_8.addWidget(self.frame_31)
@@ -625,71 +718,73 @@ def setupUi(self, MainWindow):
         self.run.setSizePolicy(sizePolicy)
         self.run.setMinimumSize(QtCore.QSize(60, 40))
         self.run.setMaximumSize(QtCore.QSize(16777215, 40))
+        self.run.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.run.setObjectName("run")
         self.verticalLayout_17.addWidget(self.run)
-        self.pause = ActionButton(self.machine_buttons)
+        self.pause_resume = ActionButton(self.machine_buttons)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.pause.sizePolicy().hasHeightForWidth())
-        self.pause.setSizePolicy(sizePolicy)
-        self.pause.setMinimumSize(QtCore.QSize(60, 40))
-        self.pause.setMaximumSize(QtCore.QSize(16777215, 40))
-        self.pause.setProperty("indicator_option", False)
-        self.pause.setProperty("indicator_HAL_pin_option", False)
-        self.pause.setProperty("indicator_status_option", False)
-        self.pause.setProperty("checked_state_text_option", False)
-        self.pause.setProperty("python_command_option", False)
-        self.pause.setProperty("on_color", QtGui.QColor(255, 0, 0))
-        self.pause.setProperty("shape_option", 0)
-        self.pause.setProperty("off_color", QtGui.QColor(0, 0, 0))
-        self.pause.setProperty("indicator_size", 0.3)
-        self.pause.setProperty("circle_diameter", 10.0)
-        self.pause.setProperty("right_edge_offset", 0.0)
-        self.pause.setProperty("top_edge_offset", 0.0)
-        self.pause.setProperty("corner_radius", 5.0)
-        self.pause.setProperty("height_fraction", 0.3)
-        self.pause.setProperty("width_fraction", 0.9)
-        self.pause.setProperty("true_state_string", "True")
-        self.pause.setProperty("false_state_string", "False")
-        self.pause.setProperty("true_python_cmd_string", "print\"true command\"")
-        self.pause.setProperty("false_python_cmd_string", "print\"false command\"")
-        self.pause.setProperty("invert_the_status", False)
-        self.pause.setProperty("is_paused_status", False)
-        self.pause.setProperty("is_estopped_status", False)
-        self.pause.setProperty("is_on_status", False)
-        self.pause.setProperty("is_idle_status", False)
-        self.pause.setProperty("is_homed_status", False)
-        self.pause.setProperty("is_flood_status", False)
-        self.pause.setProperty("is_mist_status", False)
-        self.pause.setProperty("is_block_delete_status", False)
-        self.pause.setProperty("is_optional_stop_status", False)
-        self.pause.setProperty("is_joint_homed_status", False)
-        self.pause.setProperty("is_limits_overridden_status", False)
-        self.pause.setProperty("is_manual_status", False)
-        self.pause.setProperty("is_mdi_status", False)
-        self.pause.setProperty("is_auto_status", False)
-        self.pause.setProperty("is_spindle_stopped_status", False)
-        self.pause.setProperty("is_spindle_fwd_status", False)
-        self.pause.setProperty("is_spindle_rev_status", False)
-        self.pause.setProperty("joint_number_status", 0)
-        self.pause.setProperty("run_action", False)
-        self.pause.setProperty("pause_action", True)
-        self.pause.setProperty("template_label_option", False)
-        self.pause.setProperty("joint_number", 0)
-        self.pause.setProperty("incr_imperial_number", 0.01)
-        self.pause.setProperty("incr_mm_number", 0.025)
-        self.pause.setProperty("incr_angular_number", -1.0)
-        self.pause.setProperty("toggle_float_option", False)
-        self.pause.setProperty("float_num", 0.3)
-        self.pause.setProperty("float_alt_num", 50.0)
-        self.pause.setProperty("view_type_string", "P")
-        self.pause.setProperty("command_text_string", "")
-        self.pause.setProperty("ini_mdi_number", 0)
-        self.pause.setProperty("textTemplate", "")
-        self.pause.setProperty("alt_textTemplate", "%1.2f mm")
-        self.pause.setObjectName("pause")
-        self.verticalLayout_17.addWidget(self.pause)
+        sizePolicy.setHeightForWidth(self.pause_resume.sizePolicy().hasHeightForWidth())
+        self.pause_resume.setSizePolicy(sizePolicy)
+        self.pause_resume.setMinimumSize(QtCore.QSize(60, 40))
+        self.pause_resume.setMaximumSize(QtCore.QSize(16777215, 40))
+        self.pause_resume.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.pause_resume.setProperty("indicator_option", False)
+        self.pause_resume.setProperty("indicator_HAL_pin_option", False)
+        self.pause_resume.setProperty("indicator_status_option", False)
+        self.pause_resume.setProperty("checked_state_text_option", False)
+        self.pause_resume.setProperty("python_command_option", False)
+        self.pause_resume.setProperty("on_color", QtGui.QColor(255, 0, 0))
+        self.pause_resume.setProperty("shape_option", 0)
+        self.pause_resume.setProperty("off_color", QtGui.QColor(0, 0, 0))
+        self.pause_resume.setProperty("indicator_size", 0.3)
+        self.pause_resume.setProperty("circle_diameter", 10)
+        self.pause_resume.setProperty("right_edge_offset", 0)
+        self.pause_resume.setProperty("top_edge_offset", 0)
+        self.pause_resume.setProperty("corner_radius", 5.0)
+        self.pause_resume.setProperty("height_fraction", 0.3)
+        self.pause_resume.setProperty("width_fraction", 0.9)
+        self.pause_resume.setProperty("true_state_string", "True")
+        self.pause_resume.setProperty("false_state_string", "False")
+        self.pause_resume.setProperty("true_python_cmd_string", "print\"true command\"")
+        self.pause_resume.setProperty("false_python_cmd_string", "print\"false command\"")
+        self.pause_resume.setProperty("invert_the_status", False)
+        self.pause_resume.setProperty("is_paused_status", False)
+        self.pause_resume.setProperty("is_estopped_status", False)
+        self.pause_resume.setProperty("is_on_status", False)
+        self.pause_resume.setProperty("is_idle_status", False)
+        self.pause_resume.setProperty("is_homed_status", False)
+        self.pause_resume.setProperty("is_flood_status", False)
+        self.pause_resume.setProperty("is_mist_status", False)
+        self.pause_resume.setProperty("is_block_delete_status", False)
+        self.pause_resume.setProperty("is_optional_stop_status", False)
+        self.pause_resume.setProperty("is_joint_homed_status", False)
+        self.pause_resume.setProperty("is_limits_overridden_status", False)
+        self.pause_resume.setProperty("is_manual_status", False)
+        self.pause_resume.setProperty("is_mdi_status", False)
+        self.pause_resume.setProperty("is_auto_status", False)
+        self.pause_resume.setProperty("is_spindle_stopped_status", False)
+        self.pause_resume.setProperty("is_spindle_fwd_status", False)
+        self.pause_resume.setProperty("is_spindle_rev_status", False)
+        self.pause_resume.setProperty("joint_number_status", 0)
+        self.pause_resume.setProperty("run_action", False)
+        self.pause_resume.setProperty("pause_action", True)
+        self.pause_resume.setProperty("template_label_option", False)
+        self.pause_resume.setProperty("joint_number", 0)
+        self.pause_resume.setProperty("incr_imperial_number", 0.01)
+        self.pause_resume.setProperty("incr_mm_number", 0.025)
+        self.pause_resume.setProperty("incr_angular_number", -1.0)
+        self.pause_resume.setProperty("toggle_float_option", False)
+        self.pause_resume.setProperty("float_num", 0.3)
+        self.pause_resume.setProperty("float_alt_num", 50.0)
+        self.pause_resume.setProperty("view_type_string", "P")
+        self.pause_resume.setProperty("command_text_string", "")
+        self.pause_resume.setProperty("ini_mdi_number", 0)
+        self.pause_resume.setProperty("textTemplate", "")
+        self.pause_resume.setProperty("alt_textTemplate", "%1.2f mm")
+        self.pause_resume.setObjectName("pause_resume")
+        self.verticalLayout_17.addWidget(self.pause_resume)
         self.abort = QtWidgets.QPushButton(self.machine_buttons)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
@@ -698,6 +793,7 @@ def setupUi(self, MainWindow):
         self.abort.setSizePolicy(sizePolicy)
         self.abort.setMinimumSize(QtCore.QSize(60, 40))
         self.abort.setMaximumSize(QtCore.QSize(16777215, 40))
+        self.abort.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.abort.setToolTip("")
         self.abort.setObjectName("abort")
         self.verticalLayout_17.addWidget(self.abort)
@@ -736,6 +832,7 @@ def setupUi(self, MainWindow):
         sizePolicy.setHeightForWidth(self.feed_label.sizePolicy().hasHeightForWidth())
         self.feed_label.setSizePolicy(sizePolicy)
         self.feed_label.setMaximumSize(QtCore.QSize(41, 16777215))
+        self.feed_label.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.feed_label.setObjectName("feed_label")
         self.verticalLayout_9.addWidget(self.feed_label)
         self.feed_slider = StatusSlider(self.frame_4)
@@ -746,6 +843,7 @@ def setupUi(self, MainWindow):
         self.feed_slider.setSizePolicy(sizePolicy)
         self.feed_slider.setMinimumSize(QtCore.QSize(0, 0))
         self.feed_slider.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.feed_slider.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.feed_slider.setMaximum(100)
         self.feed_slider.setTickPosition(QtWidgets.QSlider.NoTicks)
         self.feed_slider.setProperty("feed_rate", True)
@@ -767,6 +865,7 @@ def setupUi(self, MainWindow):
         self.verticalLayout_10.setObjectName("verticalLayout_10")
         self.rapid_label = QtWidgets.QPushButton(self.frame_5)
         self.rapid_label.setMaximumSize(QtCore.QSize(41, 16777215))
+        self.rapid_label.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.rapid_label.setObjectName("rapid_label")
         self.verticalLayout_10.addWidget(self.rapid_label)
         self.rapid_slider = StatusSlider(self.frame_5)
@@ -776,6 +875,7 @@ def setupUi(self, MainWindow):
         sizePolicy.setHeightForWidth(self.rapid_slider.sizePolicy().hasHeightForWidth())
         self.rapid_slider.setSizePolicy(sizePolicy)
         self.rapid_slider.setMinimumSize(QtCore.QSize(0, 0))
+        self.rapid_slider.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.rapid_slider.setMaximum(100)
         self.rapid_slider.setObjectName("rapid_slider")
         self.verticalLayout_10.addWidget(self.rapid_slider)
@@ -795,6 +895,7 @@ def setupUi(self, MainWindow):
         self.verticalLayout_11.setObjectName("verticalLayout_11")
         self.jogs_label = QtWidgets.QPushButton(self.frame_6)
         self.jogs_label.setMaximumSize(QtCore.QSize(41, 16777215))
+        self.jogs_label.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.jogs_label.setObjectName("jogs_label")
         self.verticalLayout_11.addWidget(self.jogs_label)
         self.jog_slider = StatusSlider(self.frame_6)
@@ -804,6 +905,7 @@ def setupUi(self, MainWindow):
         sizePolicy.setHeightForWidth(self.jog_slider.sizePolicy().hasHeightForWidth())
         self.jog_slider.setSizePolicy(sizePolicy)
         self.jog_slider.setMinimumSize(QtCore.QSize(0, 0))
+        self.jog_slider.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.jog_slider.setMaximum(100)
         self.jog_slider.setProperty("jograte_rate", True)
         self.jog_slider.setObjectName("jog_slider")
@@ -832,18 +934,20 @@ def setupUi(self, MainWindow):
         self.button_label.setObjectName("button_label")
         self.verticalLayout_24.addWidget(self.button_label)
         self.button_grid = QtWidgets.QGridLayout()
-        self.button_grid.setContentsMargins(4, -1, 4, 0)
+        self.button_grid.setContentsMargins(5, -1, 5, 0)
         self.button_grid.setSpacing(4)
         self.button_grid.setObjectName("button_grid")
         self.button_10 = QtWidgets.QPushButton(self.button_frame)
         self.button_10.setMinimumSize(QtCore.QSize(60, 40))
         self.button_10.setMaximumSize(QtCore.QSize(16777215, 40))
+        self.button_10.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.button_10.setText("10")
         self.button_10.setObjectName("button_10")
         self.button_grid.addWidget(self.button_10, 5, 1, 1, 1)
         self.button_18 = QtWidgets.QPushButton(self.button_frame)
         self.button_18.setMinimumSize(QtCore.QSize(60, 40))
         self.button_18.setMaximumSize(QtCore.QSize(16777215, 40))
+        self.button_18.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.button_18.setText("18")
         self.button_18.setObjectName("button_18")
         self.button_grid.addWidget(self.button_18, 9, 1, 1, 1)
@@ -855,6 +959,7 @@ def setupUi(self, MainWindow):
         self.button_8.setSizePolicy(sizePolicy)
         self.button_8.setMinimumSize(QtCore.QSize(60, 40))
         self.button_8.setMaximumSize(QtCore.QSize(16777215, 40))
+        self.button_8.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.button_8.setText("8")
         self.button_8.setObjectName("button_8")
         self.button_grid.addWidget(self.button_8, 4, 1, 1, 1)
@@ -866,36 +971,42 @@ def setupUi(self, MainWindow):
         self.button_7.setSizePolicy(sizePolicy)
         self.button_7.setMinimumSize(QtCore.QSize(60, 40))
         self.button_7.setMaximumSize(QtCore.QSize(16777215, 40))
+        self.button_7.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.button_7.setText("7")
         self.button_7.setObjectName("button_7")
         self.button_grid.addWidget(self.button_7, 4, 0, 1, 1)
         self.button_9 = QtWidgets.QPushButton(self.button_frame)
         self.button_9.setMinimumSize(QtCore.QSize(60, 40))
         self.button_9.setMaximumSize(QtCore.QSize(16777215, 40))
+        self.button_9.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.button_9.setText("9")
         self.button_9.setObjectName("button_9")
         self.button_grid.addWidget(self.button_9, 5, 0, 1, 1)
         self.button_12 = QtWidgets.QPushButton(self.button_frame)
         self.button_12.setMinimumSize(QtCore.QSize(60, 40))
         self.button_12.setMaximumSize(QtCore.QSize(16777215, 40))
+        self.button_12.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.button_12.setText("12")
         self.button_12.setObjectName("button_12")
         self.button_grid.addWidget(self.button_12, 6, 1, 1, 1)
         self.button_14 = QtWidgets.QPushButton(self.button_frame)
         self.button_14.setMinimumSize(QtCore.QSize(60, 40))
         self.button_14.setMaximumSize(QtCore.QSize(16777215, 40))
+        self.button_14.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.button_14.setText("14")
         self.button_14.setObjectName("button_14")
         self.button_grid.addWidget(self.button_14, 7, 1, 1, 1)
         self.button_13 = QtWidgets.QPushButton(self.button_frame)
         self.button_13.setMinimumSize(QtCore.QSize(60, 40))
         self.button_13.setMaximumSize(QtCore.QSize(16777215, 40))
+        self.button_13.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.button_13.setText("13")
         self.button_13.setObjectName("button_13")
         self.button_grid.addWidget(self.button_13, 7, 0, 1, 1)
         self.button_17 = QtWidgets.QPushButton(self.button_frame)
         self.button_17.setMinimumSize(QtCore.QSize(60, 40))
         self.button_17.setMaximumSize(QtCore.QSize(16777215, 40))
+        self.button_17.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.button_17.setText("17")
         self.button_17.setObjectName("button_17")
         self.button_grid.addWidget(self.button_17, 9, 0, 1, 1)
@@ -907,6 +1018,7 @@ def setupUi(self, MainWindow):
         self.button_4.setSizePolicy(sizePolicy)
         self.button_4.setMinimumSize(QtCore.QSize(60, 40))
         self.button_4.setMaximumSize(QtCore.QSize(16777215, 40))
+        self.button_4.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.button_4.setText("4")
         self.button_4.setObjectName("button_4")
         self.button_grid.addWidget(self.button_4, 2, 1, 1, 1)
@@ -918,23 +1030,27 @@ def setupUi(self, MainWindow):
         self.button_5.setSizePolicy(sizePolicy)
         self.button_5.setMinimumSize(QtCore.QSize(60, 40))
         self.button_5.setMaximumSize(QtCore.QSize(16777215, 40))
+        self.button_5.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.button_5.setText("5")
         self.button_5.setObjectName("button_5")
         self.button_grid.addWidget(self.button_5, 3, 0, 1, 1)
         self.file_edit = PushButton(self.button_frame)
         self.file_edit.setMinimumSize(QtCore.QSize(60, 40))
         self.file_edit.setMaximumSize(QtCore.QSize(16777215, 40))
+        self.file_edit.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.file_edit.setObjectName("file_edit")
         self.button_grid.addWidget(self.file_edit, 0, 0, 1, 1)
         self.button_16 = QtWidgets.QPushButton(self.button_frame)
         self.button_16.setMinimumSize(QtCore.QSize(60, 40))
         self.button_16.setMaximumSize(QtCore.QSize(16777215, 40))
+        self.button_16.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.button_16.setText("16")
         self.button_16.setObjectName("button_16")
         self.button_grid.addWidget(self.button_16, 8, 1, 1, 1)
         self.button_11 = QtWidgets.QPushButton(self.button_frame)
         self.button_11.setMinimumSize(QtCore.QSize(60, 40))
         self.button_11.setMaximumSize(QtCore.QSize(16777215, 40))
+        self.button_11.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.button_11.setText("11")
         self.button_11.setObjectName("button_11")
         self.button_grid.addWidget(self.button_11, 6, 0, 1, 1)
@@ -946,6 +1062,7 @@ def setupUi(self, MainWindow):
         self.button_2.setSizePolicy(sizePolicy)
         self.button_2.setMinimumSize(QtCore.QSize(60, 40))
         self.button_2.setMaximumSize(QtCore.QSize(16777215, 40))
+        self.button_2.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.button_2.setText("2")
         self.button_2.setObjectName("button_2")
         self.button_grid.addWidget(self.button_2, 1, 1, 1, 1)
@@ -957,12 +1074,14 @@ def setupUi(self, MainWindow):
         self.button_1.setSizePolicy(sizePolicy)
         self.button_1.setMinimumSize(QtCore.QSize(60, 40))
         self.button_1.setMaximumSize(QtCore.QSize(16777215, 40))
+        self.button_1.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.button_1.setText("1")
         self.button_1.setObjectName("button_1")
         self.button_grid.addWidget(self.button_1, 1, 0, 1, 1)
         self.button_15 = QtWidgets.QPushButton(self.button_frame)
         self.button_15.setMinimumSize(QtCore.QSize(60, 40))
         self.button_15.setMaximumSize(QtCore.QSize(16777215, 40))
+        self.button_15.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.button_15.setText("15")
         self.button_15.setObjectName("button_15")
         self.button_grid.addWidget(self.button_15, 8, 0, 1, 1)
@@ -974,12 +1093,14 @@ def setupUi(self, MainWindow):
         self.button_6.setSizePolicy(sizePolicy)
         self.button_6.setMinimumSize(QtCore.QSize(60, 40))
         self.button_6.setMaximumSize(QtCore.QSize(16777215, 40))
+        self.button_6.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.button_6.setText("6")
         self.button_6.setObjectName("button_6")
         self.button_grid.addWidget(self.button_6, 3, 1, 1, 1)
         self.mdi_show = PushButton(self.button_frame)
         self.mdi_show.setMinimumSize(QtCore.QSize(60, 40))
         self.mdi_show.setMaximumSize(QtCore.QSize(16777215, 40))
+        self.mdi_show.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.mdi_show.setObjectName("mdi_show")
         self.button_grid.addWidget(self.mdi_show, 0, 1, 1, 1)
         self.button_3 = QtWidgets.QPushButton(self.button_frame)
@@ -990,18 +1111,21 @@ def setupUi(self, MainWindow):
         self.button_3.setSizePolicy(sizePolicy)
         self.button_3.setMinimumSize(QtCore.QSize(60, 40))
         self.button_3.setMaximumSize(QtCore.QSize(16777215, 40))
+        self.button_3.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.button_3.setText("3")
         self.button_3.setObjectName("button_3")
         self.button_grid.addWidget(self.button_3, 2, 0, 1, 1)
         self.button_19 = QtWidgets.QPushButton(self.button_frame)
         self.button_19.setMinimumSize(QtCore.QSize(60, 40))
         self.button_19.setMaximumSize(QtCore.QSize(16777215, 40))
+        self.button_19.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.button_19.setText("19")
         self.button_19.setObjectName("button_19")
         self.button_grid.addWidget(self.button_19, 10, 0, 1, 1)
         self.button_20 = QtWidgets.QPushButton(self.button_frame)
         self.button_20.setMinimumSize(QtCore.QSize(60, 40))
         self.button_20.setMaximumSize(QtCore.QSize(16777215, 40))
+        self.button_20.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.button_20.setText("20")
         self.button_20.setObjectName("button_20")
         self.button_grid.addWidget(self.button_20, 10, 1, 1, 1)
@@ -1013,7 +1137,7 @@ def setupUi(self, MainWindow):
         self.main_tab_Layout.addWidget(self.main_c2)
         self.main_c3 = QtWidgets.QFrame(self.main_tab)
         self.main_c3.setMinimumSize(QtCore.QSize(0, 0))
-        self.main_c3.setMaximumSize(QtCore.QSize(236, 16777215))
+        self.main_c3.setMaximumSize(QtCore.QSize(268, 16777215))
         self.main_c3.setFrameShape(QtWidgets.QFrame.NoFrame)
         self.main_c3.setFrameShadow(QtWidgets.QFrame.Plain)
         self.main_c3.setObjectName("main_c3")
@@ -1063,7 +1187,7 @@ def setupUi(self, MainWindow):
         self.frame_24.setFrameShadow(QtWidgets.QFrame.Plain)
         self.frame_24.setObjectName("frame_24")
         self.horizontalLayout_44 = QtWidgets.QHBoxLayout(self.frame_24)
-        self.horizontalLayout_44.setContentsMargins(4, 0, 4, 0)
+        self.horizontalLayout_44.setContentsMargins(4, 2, 4, 0)
         self.horizontalLayout_44.setSpacing(0)
         self.horizontalLayout_44.setObjectName("horizontalLayout_44")
         self.arc_voltage = HALLabel(self.frame_24)
@@ -1126,6 +1250,7 @@ def setupUi(self, MainWindow):
         self.height_reset = QtWidgets.QPushButton(self.arc_override_frm)
         self.height_reset.setMinimumSize(QtCore.QSize(82, 16))
         self.height_reset.setMaximumSize(QtCore.QSize(82, 16))
+        self.height_reset.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.height_reset.setObjectName("height_reset")
         self.verticalLayout_25.addWidget(self.height_reset)
         self.frame_26 = QtWidgets.QFrame(self.arc_override_frm)
@@ -1144,6 +1269,7 @@ def setupUi(self, MainWindow):
         sizePolicy.setHeightForWidth(self.height_lower.sizePolicy().hasHeightForWidth())
         self.height_lower.setSizePolicy(sizePolicy)
         self.height_lower.setMaximumSize(QtCore.QSize(24, 24))
+        self.height_lower.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.height_lower.setText("-")
         self.height_lower.setAutoRepeat(True)
         self.height_lower.setAutoRepeatInterval(250)
@@ -1162,6 +1288,7 @@ def setupUi(self, MainWindow):
         sizePolicy.setHeightForWidth(self.height_raise.sizePolicy().hasHeightForWidth())
         self.height_raise.setSizePolicy(sizePolicy)
         self.height_raise.setMaximumSize(QtCore.QSize(24, 24))
+        self.height_raise.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.height_raise.setText("+")
         self.height_raise.setAutoRepeat(True)
         self.height_raise.setAutoRepeatInterval(250)
@@ -1202,6 +1329,7 @@ def setupUi(self, MainWindow):
         self.ignore_arc_ok.setSizePolicy(sizePolicy)
         self.ignore_arc_ok.setMinimumSize(QtCore.QSize(0, 0))
         self.ignore_arc_ok.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.ignore_arc_ok.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.ignore_arc_ok.setLayoutDirection(QtCore.Qt.LeftToRight)
         self.ignore_arc_ok.setText("")
         self.ignore_arc_ok.setObjectName("ignore_arc_ok")
@@ -1228,6 +1356,7 @@ def setupUi(self, MainWindow):
         self.ohmic_probe_enable.setSizePolicy(sizePolicy)
         self.ohmic_probe_enable.setMinimumSize(QtCore.QSize(0, 0))
         self.ohmic_probe_enable.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.ohmic_probe_enable.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.ohmic_probe_enable.setLayoutDirection(QtCore.Qt.LeftToRight)
         self.ohmic_probe_enable.setText("")
         self.ohmic_probe_enable.setObjectName("ohmic_probe_enable")
@@ -1277,6 +1406,7 @@ def setupUi(self, MainWindow):
         self.torch_enable.setSizePolicy(sizePolicy)
         self.torch_enable.setMinimumSize(QtCore.QSize(0, 0))
         self.torch_enable.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.torch_enable.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.torch_enable.setLayoutDirection(QtCore.Qt.LeftToRight)
         self.torch_enable.setText("")
         self.torch_enable.setObjectName("torch_enable")
@@ -1299,6 +1429,7 @@ def setupUi(self, MainWindow):
         self.mesh_enable.setSizePolicy(sizePolicy)
         self.mesh_enable.setMinimumSize(QtCore.QSize(0, 0))
         self.mesh_enable.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.mesh_enable.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.mesh_enable.setLayoutDirection(QtCore.Qt.LeftToRight)
         self.mesh_enable.setText("")
         self.mesh_enable.setObjectName("mesh_enable")
@@ -1324,27 +1455,28 @@ def setupUi(self, MainWindow):
         sizePolicy.setHeightForWidth(self.use_auto_volts.sizePolicy().hasHeightForWidth())
         self.use_auto_volts.setSizePolicy(sizePolicy)
         self.use_auto_volts.setMinimumSize(QtCore.QSize(0, 0))
+        self.use_auto_volts.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.use_auto_volts.setChecked(False)
         self.use_auto_volts.setObjectName("use_auto_volts")
         self.horizontalLayout_24.addWidget(self.use_auto_volts)
         self.gridLayout_12.addWidget(self.frame_27, 4, 1, 1, 1)
-        self.kerfcross_frm = QtWidgets.QFrame(self.control_frame)
-        self.kerfcross_frm.setMinimumSize(QtCore.QSize(18, 0))
-        self.kerfcross_frm.setMaximumSize(QtCore.QSize(16777215, 16777215))
-        self.kerfcross_frm.setFrameShape(QtWidgets.QFrame.NoFrame)
-        self.kerfcross_frm.setFrameShadow(QtWidgets.QFrame.Plain)
-        self.kerfcross_frm.setObjectName("kerfcross_frm")
-        self.horizontalLayout_29 = QtWidgets.QHBoxLayout(self.kerfcross_frm)
+        self.voidlock_frm = QtWidgets.QFrame(self.control_frame)
+        self.voidlock_frm.setMinimumSize(QtCore.QSize(18, 0))
+        self.voidlock_frm.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.voidlock_frm.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.voidlock_frm.setFrameShadow(QtWidgets.QFrame.Plain)
+        self.voidlock_frm.setObjectName("voidlock_frm")
+        self.horizontalLayout_29 = QtWidgets.QHBoxLayout(self.voidlock_frm)
         self.horizontalLayout_29.setContentsMargins(4, 0, 4, 0)
         self.horizontalLayout_29.setSpacing(2)
         self.horizontalLayout_29.setObjectName("horizontalLayout_29")
-        self.led_kerf_lock = LED(self.kerfcross_frm)
-        self.led_kerf_lock.setMinimumSize(QtCore.QSize(0, 0))
-        self.led_kerf_lock.setMaximumSize(QtCore.QSize(16777215, 16777215))
-        self.led_kerf_lock.setColor(QtGui.QColor(252, 233, 79))
-        self.led_kerf_lock.setObjectName("led_kerf_lock")
-        self.horizontalLayout_29.addWidget(self.led_kerf_lock)
-        self.label_72 = QtWidgets.QLabel(self.kerfcross_frm)
+        self.led_void_lock = LED(self.voidlock_frm)
+        self.led_void_lock.setMinimumSize(QtCore.QSize(0, 0))
+        self.led_void_lock.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.led_void_lock.setColor(QtGui.QColor(252, 233, 79))
+        self.led_void_lock.setObjectName("led_void_lock")
+        self.horizontalLayout_29.addWidget(self.led_void_lock)
+        self.label_72 = QtWidgets.QLabel(self.voidlock_frm)
         self.label_72.setMinimumSize(QtCore.QSize(0, 0))
         self.label_72.setMaximumSize(QtCore.QSize(16777215, 16777215))
         self.label_72.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
@@ -1352,26 +1484,27 @@ def setupUi(self, MainWindow):
         self.horizontalLayout_29.addWidget(self.label_72)
         spacerItem8 = QtWidgets.QSpacerItem(51, 15, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
         self.horizontalLayout_29.addItem(spacerItem8)
-        self.label_73 = QtWidgets.QLabel(self.kerfcross_frm)
+        self.label_73 = QtWidgets.QLabel(self.voidlock_frm)
         self.label_73.setMinimumSize(QtCore.QSize(0, 0))
         self.label_73.setMaximumSize(QtCore.QSize(16777215, 16777215))
         self.label_73.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
         self.label_73.setObjectName("label_73")
         self.horizontalLayout_29.addWidget(self.label_73)
-        self.kerfcross_enable = CheckBox(self.kerfcross_frm)
+        self.voidlock_enable = CheckBox(self.voidlock_frm)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.kerfcross_enable.sizePolicy().hasHeightForWidth())
-        self.kerfcross_enable.setSizePolicy(sizePolicy)
-        self.kerfcross_enable.setMinimumSize(QtCore.QSize(0, 0))
-        self.kerfcross_enable.setMaximumSize(QtCore.QSize(16777215, 16777215))
-        self.kerfcross_enable.setLayoutDirection(QtCore.Qt.LeftToRight)
-        self.kerfcross_enable.setText("")
-        self.kerfcross_enable.setChecked(False)
-        self.kerfcross_enable.setObjectName("kerfcross_enable")
-        self.horizontalLayout_29.addWidget(self.kerfcross_enable)
-        self.gridLayout_12.addWidget(self.kerfcross_frm, 3, 1, 1, 1)
+        sizePolicy.setHeightForWidth(self.voidlock_enable.sizePolicy().hasHeightForWidth())
+        self.voidlock_enable.setSizePolicy(sizePolicy)
+        self.voidlock_enable.setMinimumSize(QtCore.QSize(0, 0))
+        self.voidlock_enable.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.voidlock_enable.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.voidlock_enable.setLayoutDirection(QtCore.Qt.LeftToRight)
+        self.voidlock_enable.setText("")
+        self.voidlock_enable.setChecked(False)
+        self.voidlock_enable.setObjectName("voidlock_enable")
+        self.horizontalLayout_29.addWidget(self.voidlock_enable)
+        self.gridLayout_12.addWidget(self.voidlock_frm, 3, 1, 1, 1)
         self.pmx485_frame = QtWidgets.QFrame(self.control_frame)
         self.pmx485_frame.setMinimumSize(QtCore.QSize(18, 0))
         self.pmx485_frame.setFrameShape(QtWidgets.QFrame.NoFrame)
@@ -1404,6 +1537,7 @@ def setupUi(self, MainWindow):
         self.pmx485_enable.setSizePolicy(sizePolicy)
         self.pmx485_enable.setMinimumSize(QtCore.QSize(0, 0))
         self.pmx485_enable.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.pmx485_enable.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.pmx485_enable.setText("")
         self.pmx485_enable.setObjectName("pmx485_enable")
         self.horizontalLayout_30.addWidget(self.pmx485_enable)
@@ -1446,6 +1580,7 @@ def setupUi(self, MainWindow):
         self.cornerlock_enable.setSizePolicy(sizePolicy)
         self.cornerlock_enable.setMinimumSize(QtCore.QSize(0, 0))
         self.cornerlock_enable.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.cornerlock_enable.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.cornerlock_enable.setLayoutDirection(QtCore.Qt.LeftToRight)
         self.cornerlock_enable.setText("")
         self.cornerlock_enable.setChecked(False)
@@ -1590,6 +1725,7 @@ def setupUi(self, MainWindow):
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.thc_enable.sizePolicy().hasHeightForWidth())
         self.thc_enable.setSizePolicy(sizePolicy)
+        self.thc_enable.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.thc_enable.setObjectName("thc_enable")
         self.horizontalLayout.addWidget(self.thc_enable)
         self.verticalLayout_35.addWidget(self.frame_14)
@@ -1706,11 +1842,12 @@ def setupUi(self, MainWindow):
         self.frame_18.setFrameShadow(QtWidgets.QFrame.Plain)
         self.frame_18.setObjectName("frame_18")
         self.horizontalLayout_16 = QtWidgets.QHBoxLayout(self.frame_18)
-        self.horizontalLayout_16.setContentsMargins(0, 0, 0, 0)
+        self.horizontalLayout_16.setContentsMargins(0, 2, 0, 0)
         self.horizontalLayout_16.setObjectName("horizontalLayout_16")
         self.jogincrements = JogIncrements(self.frame_18)
         self.jogincrements.setMinimumSize(QtCore.QSize(128, 40))
         self.jogincrements.setMaximumSize(QtCore.QSize(128, 40))
+        self.jogincrements.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.jogincrements.setObjectName("jogincrements")
         self.horizontalLayout_16.addWidget(self.jogincrements)
         self.jog_slow = PushButton(self.frame_18)
@@ -1721,6 +1858,7 @@ def setupUi(self, MainWindow):
         self.jog_slow.setSizePolicy(sizePolicy)
         self.jog_slow.setMinimumSize(QtCore.QSize(40, 40))
         self.jog_slow.setMaximumSize(QtCore.QSize(40, 40))
+        self.jog_slow.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.jog_slow.setToolTip("")
         self.jog_slow.setCheckable(True)
         self.jog_slow.setProperty("checked_state_text_option", False)
@@ -1741,17 +1879,19 @@ def setupUi(self, MainWindow):
         self.gridLayout.setContentsMargins(4, 0, 4, 0)
         self.gridLayout.setSpacing(4)
         self.gridLayout.setObjectName("gridLayout")
-        self.jog_z_plus = QtWidgets.QPushButton(self.jog_grid)
+        self.jog_b_minus = QtWidgets.QPushButton(self.jog_grid)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.jog_z_plus.sizePolicy().hasHeightForWidth())
-        self.jog_z_plus.setSizePolicy(sizePolicy)
-        self.jog_z_plus.setMinimumSize(QtCore.QSize(40, 40))
-        self.jog_z_plus.setMaximumSize(QtCore.QSize(40, 40))
-        self.jog_z_plus.setIconSize(QtCore.QSize(40, 40))
-        self.jog_z_plus.setObjectName("jog_z_plus")
-        self.gridLayout.addWidget(self.jog_z_plus, 1, 3, 1, 1)
+        sizePolicy.setHeightForWidth(self.jog_b_minus.sizePolicy().hasHeightForWidth())
+        self.jog_b_minus.setSizePolicy(sizePolicy)
+        self.jog_b_minus.setMinimumSize(QtCore.QSize(40, 40))
+        self.jog_b_minus.setMaximumSize(QtCore.QSize(40, 40))
+        self.jog_b_minus.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.jog_b_minus.setText("")
+        self.jog_b_minus.setIconSize(QtCore.QSize(32, 32))
+        self.jog_b_minus.setObjectName("jog_b_minus")
+        self.gridLayout.addWidget(self.jog_b_minus, 4, 0, 1, 1)
         self.jog_x_minus = QtWidgets.QPushButton(self.jog_grid)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
@@ -1760,9 +1900,22 @@ def setupUi(self, MainWindow):
         self.jog_x_minus.setSizePolicy(sizePolicy)
         self.jog_x_minus.setMinimumSize(QtCore.QSize(40, 40))
         self.jog_x_minus.setMaximumSize(QtCore.QSize(40, 40))
+        self.jog_x_minus.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.jog_x_minus.setIconSize(QtCore.QSize(40, 40))
         self.jog_x_minus.setObjectName("jog_x_minus")
         self.gridLayout.addWidget(self.jog_x_minus, 2, 0, 1, 1)
+        self.jog_a_minus = QtWidgets.QPushButton(self.jog_grid)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.jog_a_minus.sizePolicy().hasHeightForWidth())
+        self.jog_a_minus.setSizePolicy(sizePolicy)
+        self.jog_a_minus.setMinimumSize(QtCore.QSize(40, 40))
+        self.jog_a_minus.setMaximumSize(QtCore.QSize(40, 40))
+        self.jog_a_minus.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.jog_a_minus.setIconSize(QtCore.QSize(32, 32))
+        self.jog_a_minus.setObjectName("jog_a_minus")
+        self.gridLayout.addWidget(self.jog_a_minus, 3, 0, 1, 1)
         self.jog_x_plus = QtWidgets.QPushButton(self.jog_grid)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
@@ -1771,31 +1924,42 @@ def setupUi(self, MainWindow):
         self.jog_x_plus.setSizePolicy(sizePolicy)
         self.jog_x_plus.setMinimumSize(QtCore.QSize(40, 40))
         self.jog_x_plus.setMaximumSize(QtCore.QSize(40, 40))
+        self.jog_x_plus.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.jog_x_plus.setIconSize(QtCore.QSize(40, 40))
         self.jog_x_plus.setObjectName("jog_x_plus")
         self.gridLayout.addWidget(self.jog_x_plus, 2, 2, 1, 1)
-        self.jog_a_plus = QtWidgets.QPushButton(self.jog_grid)
+        self.jog_y_minus = QtWidgets.QPushButton(self.jog_grid)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.jog_a_plus.sizePolicy().hasHeightForWidth())
-        self.jog_a_plus.setSizePolicy(sizePolicy)
-        self.jog_a_plus.setMinimumSize(QtCore.QSize(40, 40))
-        self.jog_a_plus.setMaximumSize(QtCore.QSize(40, 40))
-        self.jog_a_plus.setIconSize(QtCore.QSize(32, 32))
-        self.jog_a_plus.setObjectName("jog_a_plus")
-        self.gridLayout.addWidget(self.jog_a_plus, 1, 0, 1, 1)
-        self.jog_a_minus = QtWidgets.QPushButton(self.jog_grid)
+        sizePolicy.setHeightForWidth(self.jog_y_minus.sizePolicy().hasHeightForWidth())
+        self.jog_y_minus.setSizePolicy(sizePolicy)
+        self.jog_y_minus.setMinimumSize(QtCore.QSize(40, 40))
+        self.jog_y_minus.setMaximumSize(QtCore.QSize(40, 40))
+        self.jog_y_minus.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.jog_y_minus.setIconSize(QtCore.QSize(40, 40))
+        self.jog_y_minus.setObjectName("jog_y_minus")
+        self.gridLayout.addWidget(self.jog_y_minus, 3, 1, 1, 1)
+        self.jog_b_plus = QtWidgets.QPushButton(self.jog_grid)
+        self.jog_b_plus.setMinimumSize(QtCore.QSize(40, 40))
+        self.jog_b_plus.setMaximumSize(QtCore.QSize(40, 40))
+        self.jog_b_plus.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.jog_b_plus.setText("")
+        self.jog_b_plus.setIconSize(QtCore.QSize(32, 32))
+        self.jog_b_plus.setObjectName("jog_b_plus")
+        self.gridLayout.addWidget(self.jog_b_plus, 4, 2, 1, 1)
+        self.jog_z_plus = QtWidgets.QPushButton(self.jog_grid)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.jog_a_minus.sizePolicy().hasHeightForWidth())
-        self.jog_a_minus.setSizePolicy(sizePolicy)
-        self.jog_a_minus.setMinimumSize(QtCore.QSize(40, 40))
-        self.jog_a_minus.setMaximumSize(QtCore.QSize(40, 40))
-        self.jog_a_minus.setIconSize(QtCore.QSize(32, 32))
-        self.jog_a_minus.setObjectName("jog_a_minus")
-        self.gridLayout.addWidget(self.jog_a_minus, 3, 0, 1, 1)
+        sizePolicy.setHeightForWidth(self.jog_z_plus.sizePolicy().hasHeightForWidth())
+        self.jog_z_plus.setSizePolicy(sizePolicy)
+        self.jog_z_plus.setMinimumSize(QtCore.QSize(40, 40))
+        self.jog_z_plus.setMaximumSize(QtCore.QSize(40, 40))
+        self.jog_z_plus.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.jog_z_plus.setIconSize(QtCore.QSize(40, 40))
+        self.jog_z_plus.setObjectName("jog_z_plus")
+        self.gridLayout.addWidget(self.jog_z_plus, 1, 3, 1, 1)
         self.jog_y_plus = QtWidgets.QPushButton(self.jog_grid)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
@@ -1804,20 +1968,22 @@ def setupUi(self, MainWindow):
         self.jog_y_plus.setSizePolicy(sizePolicy)
         self.jog_y_plus.setMinimumSize(QtCore.QSize(40, 40))
         self.jog_y_plus.setMaximumSize(QtCore.QSize(40, 40))
+        self.jog_y_plus.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.jog_y_plus.setIconSize(QtCore.QSize(40, 40))
         self.jog_y_plus.setObjectName("jog_y_plus")
         self.gridLayout.addWidget(self.jog_y_plus, 1, 1, 1, 1)
-        self.jog_y_minus = QtWidgets.QPushButton(self.jog_grid)
+        self.jog_a_plus = QtWidgets.QPushButton(self.jog_grid)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.jog_y_minus.sizePolicy().hasHeightForWidth())
-        self.jog_y_minus.setSizePolicy(sizePolicy)
-        self.jog_y_minus.setMinimumSize(QtCore.QSize(40, 40))
-        self.jog_y_minus.setMaximumSize(QtCore.QSize(40, 40))
-        self.jog_y_minus.setIconSize(QtCore.QSize(40, 40))
-        self.jog_y_minus.setObjectName("jog_y_minus")
-        self.gridLayout.addWidget(self.jog_y_minus, 3, 1, 1, 1)
+        sizePolicy.setHeightForWidth(self.jog_a_plus.sizePolicy().hasHeightForWidth())
+        self.jog_a_plus.setSizePolicy(sizePolicy)
+        self.jog_a_plus.setMinimumSize(QtCore.QSize(40, 40))
+        self.jog_a_plus.setMaximumSize(QtCore.QSize(40, 40))
+        self.jog_a_plus.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.jog_a_plus.setIconSize(QtCore.QSize(32, 32))
+        self.jog_a_plus.setObjectName("jog_a_plus")
+        self.gridLayout.addWidget(self.jog_a_plus, 1, 0, 1, 1)
         self.jog_z_minus = QtWidgets.QPushButton(self.jog_grid)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
@@ -1826,28 +1992,36 @@ def setupUi(self, MainWindow):
         self.jog_z_minus.setSizePolicy(sizePolicy)
         self.jog_z_minus.setMinimumSize(QtCore.QSize(40, 40))
         self.jog_z_minus.setMaximumSize(QtCore.QSize(40, 40))
+        self.jog_z_minus.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.jog_z_minus.setIconSize(QtCore.QSize(40, 40))
         self.jog_z_minus.setObjectName("jog_z_minus")
         self.gridLayout.addWidget(self.jog_z_minus, 3, 3, 1, 1)
-        self.jog_b_minus = QtWidgets.QPushButton(self.jog_grid)
+        self.jog_c_plus = QtWidgets.QPushButton(self.jog_grid)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.jog_b_minus.sizePolicy().hasHeightForWidth())
-        self.jog_b_minus.setSizePolicy(sizePolicy)
-        self.jog_b_minus.setMinimumSize(QtCore.QSize(40, 40))
-        self.jog_b_minus.setMaximumSize(QtCore.QSize(40, 40))
-        self.jog_b_minus.setText("")
-        self.jog_b_minus.setIconSize(QtCore.QSize(32, 32))
-        self.jog_b_minus.setObjectName("jog_b_minus")
-        self.gridLayout.addWidget(self.jog_b_minus, 4, 0, 1, 1)
-        self.jog_b_plus = QtWidgets.QPushButton(self.jog_grid)
-        self.jog_b_plus.setMinimumSize(QtCore.QSize(40, 40))
-        self.jog_b_plus.setMaximumSize(QtCore.QSize(40, 40))
-        self.jog_b_plus.setText("")
-        self.jog_b_plus.setIconSize(QtCore.QSize(32, 32))
-        self.jog_b_plus.setObjectName("jog_b_plus")
-        self.gridLayout.addWidget(self.jog_b_plus, 4, 2, 1, 1)
+        sizePolicy.setHeightForWidth(self.jog_c_plus.sizePolicy().hasHeightForWidth())
+        self.jog_c_plus.setSizePolicy(sizePolicy)
+        self.jog_c_plus.setMinimumSize(QtCore.QSize(40, 40))
+        self.jog_c_plus.setMaximumSize(QtCore.QSize(40, 40))
+        self.jog_c_plus.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.jog_c_plus.setText("")
+        self.jog_c_plus.setIconSize(QtCore.QSize(32, 32))
+        self.jog_c_plus.setObjectName("jog_c_plus")
+        self.gridLayout.addWidget(self.jog_c_plus, 1, 4, 1, 1)
+        self.jog_c_minus = QtWidgets.QPushButton(self.jog_grid)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.jog_c_minus.sizePolicy().hasHeightForWidth())
+        self.jog_c_minus.setSizePolicy(sizePolicy)
+        self.jog_c_minus.setMinimumSize(QtCore.QSize(40, 40))
+        self.jog_c_minus.setMaximumSize(QtCore.QSize(40, 40))
+        self.jog_c_minus.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.jog_c_minus.setText("")
+        self.jog_c_minus.setIconSize(QtCore.QSize(32, 32))
+        self.jog_c_minus.setObjectName("jog_c_minus")
+        self.gridLayout.addWidget(self.jog_c_minus, 1, 2, 1, 1)
         self.verticalLayout_18.addWidget(self.jog_grid)
         self.verticalLayout_18.setStretch(2, 1)
         self.verticalLayout_21.addWidget(self.jog_frame)
@@ -1957,7 +2131,7 @@ def setupUi(self, MainWindow):
         self.frame_16.setFrameShadow(QtWidgets.QFrame.Plain)
         self.frame_16.setObjectName("frame_16")
         self.horizontalLayout_14 = QtWidgets.QHBoxLayout(self.frame_16)
-        self.horizontalLayout_14.setContentsMargins(0, 0, 0, 0)
+        self.horizontalLayout_14.setContentsMargins(0, 0, 4, 0)
         self.horizontalLayout_14.setObjectName("horizontalLayout_14")
         spacerItem17 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
         self.horizontalLayout_14.addItem(spacerItem17)
@@ -2143,6 +2317,20 @@ def setupUi(self, MainWindow):
         self.horizontalLayout_2.setContentsMargins(0, 0, 0, 0)
         self.horizontalLayout_2.setSpacing(1)
         self.horizontalLayout_2.setObjectName("horizontalLayout_2")
+        self.file_clear = PushButton(self.frame_21)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.file_clear.sizePolicy().hasHeightForWidth())
+        self.file_clear.setSizePolicy(sizePolicy)
+        self.file_clear.setMinimumSize(QtCore.QSize(60, 16))
+        self.file_clear.setMaximumSize(QtCore.QSize(60, 16))
+        self.file_clear.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.file_clear.setProperty("python_command_option", False)
+        self.file_clear.setProperty("true_python_cmd_string", "")
+        self.file_clear.setProperty("false_python_cmd_string", "")
+        self.file_clear.setObjectName("file_clear")
+        self.horizontalLayout_2.addWidget(self.file_clear)
         self.file_open = QtWidgets.QPushButton(self.frame_21)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
@@ -2151,6 +2339,7 @@ def setupUi(self, MainWindow):
         self.file_open.setSizePolicy(sizePolicy)
         self.file_open.setMinimumSize(QtCore.QSize(60, 16))
         self.file_open.setMaximumSize(QtCore.QSize(16777215, 16))
+        self.file_open.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.file_open.setObjectName("file_open")
         self.horizontalLayout_2.addWidget(self.file_open)
         self.file_reload = PushButton(self.frame_21)
@@ -2161,6 +2350,7 @@ def setupUi(self, MainWindow):
         self.file_reload.setSizePolicy(sizePolicy)
         self.file_reload.setMinimumSize(QtCore.QSize(60, 16))
         self.file_reload.setMaximumSize(QtCore.QSize(60, 16))
+        self.file_reload.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.file_reload.setProperty("python_command_option", False)
         self.file_reload.setProperty("true_python_cmd_string", "")
         self.file_reload.setProperty("false_python_cmd_string", "")
@@ -2181,22 +2371,6 @@ def setupUi(self, MainWindow):
         self.gcode_display.setProperty("auto_show_mdi_status", False)
         self.gcode_display.setObjectName("gcode_display")
         self.verticalLayout_6.addWidget(self.gcode_display)
-        self.gcode_progress = QtWidgets.QProgressBar(self.gcode_place)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.gcode_progress.sizePolicy().hasHeightForWidth())
-        self.gcode_progress.setSizePolicy(sizePolicy)
-        self.gcode_progress.setMinimumSize(QtCore.QSize(0, 20))
-        self.gcode_progress.setMaximumSize(QtCore.QSize(16777215, 20))
-        self.gcode_progress.setWhatsThis("")
-        self.gcode_progress.setAutoFillBackground(False)
-        self.gcode_progress.setMaximum(99)
-        self.gcode_progress.setProperty("value", 0)
-        self.gcode_progress.setAlignment(QtCore.Qt.AlignCenter)
-        self.gcode_progress.setInvertedAppearance(False)
-        self.gcode_progress.setObjectName("gcode_progress")
-        self.verticalLayout_6.addWidget(self.gcode_progress)
         self.verticalLayout_12.addWidget(self.gcode_place)
         self.gcode_stack.addWidget(self.gcode_page)
         self.mdi_page = QtWidgets.QWidget()
@@ -2277,38 +2451,6 @@ def setupUi(self, MainWindow):
         self.gridLayout_2.setContentsMargins(4, 0, 4, 0)
         self.gridLayout_2.setSpacing(4)
         self.gridLayout_2.setObjectName("gridLayout_2")
-        self.touch_y = AxisToolButton(self.dro_place)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.touch_y.sizePolicy().hasHeightForWidth())
-        self.touch_y.setSizePolicy(sizePolicy)
-        self.touch_y.setMinimumSize(QtCore.QSize(40, 40))
-        self.touch_y.setMaximumSize(QtCore.QSize(40, 40))
-        self.touch_y.setText("0")
-        self.touch_y.setPopupMode(QtWidgets.QToolButton.InstantPopup)
-        self.touch_y.setArrowType(QtCore.Qt.NoArrow)
-        self.touch_y.setProperty("joint_number", 1)
-        self.touch_y.setProperty("axis_letter", "Y")
-        self.touch_y.setProperty("halpin_option", False)
-        self.touch_y.setObjectName("touch_y")
-        self.gridLayout_2.addWidget(self.touch_y, 2, 4, 1, 1)
-        self.touch_z = AxisToolButton(self.dro_place)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.touch_z.sizePolicy().hasHeightForWidth())
-        self.touch_z.setSizePolicy(sizePolicy)
-        self.touch_z.setMinimumSize(QtCore.QSize(40, 40))
-        self.touch_z.setMaximumSize(QtCore.QSize(40, 40))
-        self.touch_z.setText("0")
-        self.touch_z.setPopupMode(QtWidgets.QToolButton.InstantPopup)
-        self.touch_z.setArrowType(QtCore.Qt.NoArrow)
-        self.touch_z.setProperty("joint_number", 2)
-        self.touch_z.setProperty("axis_letter", "Z")
-        self.touch_z.setProperty("halpin_option", False)
-        self.touch_z.setObjectName("touch_z")
-        self.gridLayout_2.addWidget(self.touch_z, 3, 4, 1, 1)
         self.dro_y = DROLabel(self.dro_place)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
@@ -2325,6 +2467,83 @@ def setupUi(self, MainWindow):
         self.dro_y.setProperty("homed", False)
         self.dro_y.setObjectName("dro_y")
         self.gridLayout_2.addWidget(self.dro_y, 2, 3, 1, 1)
+        self.frame_10 = QtWidgets.QFrame(self.dro_place)
+        self.frame_10.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.frame_10.setFrameShadow(QtWidgets.QFrame.Plain)
+        self.frame_10.setObjectName("frame_10")
+        self.horizontalLayout_46 = QtWidgets.QHBoxLayout(self.frame_10)
+        self.horizontalLayout_46.setContentsMargins(0, 0, 0, 0)
+        self.horizontalLayout_46.setSpacing(4)
+        self.horizontalLayout_46.setObjectName("horizontalLayout_46")
+        self.wcs_button = SystemToolButton(self.frame_10)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.wcs_button.sizePolicy().hasHeightForWidth())
+        self.wcs_button.setSizePolicy(sizePolicy)
+        self.wcs_button.setMinimumSize(QtCore.QSize(48, 40))
+        self.wcs_button.setMaximumSize(QtCore.QSize(48, 40))
+        self.wcs_button.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.wcs_button.setText("")
+        self.wcs_button.setPopupMode(QtWidgets.QToolButton.InstantPopup)
+        self.wcs_button.setObjectName("wcs_button")
+        self.horizontalLayout_46.addWidget(self.wcs_button)
+        spacerItem19 = QtWidgets.QSpacerItem(64, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_46.addItem(spacerItem19)
+        self.camera = PushButton(self.frame_10)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.camera.sizePolicy().hasHeightForWidth())
+        self.camera.setSizePolicy(sizePolicy)
+        self.camera.setMinimumSize(QtCore.QSize(60, 40))
+        self.camera.setMaximumSize(QtCore.QSize(60, 40))
+        self.camera.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.camera.setObjectName("camera")
+        self.horizontalLayout_46.addWidget(self.camera)
+        self.laser = PushButton(self.frame_10)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.laser.sizePolicy().hasHeightForWidth())
+        self.laser.setSizePolicy(sizePolicy)
+        self.laser.setMinimumSize(QtCore.QSize(60, 40))
+        self.laser.setMaximumSize(QtCore.QSize(60, 40))
+        self.laser.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.laser.setObjectName("laser")
+        self.horizontalLayout_46.addWidget(self.laser)
+        self.gridLayout_2.addWidget(self.frame_10, 0, 3, 1, 1)
+        self.dro_label_a = QtWidgets.QLabel(self.dro_place)
+        self.dro_label_a.setMinimumSize(QtCore.QSize(30, 40))
+        self.dro_label_a.setMaximumSize(QtCore.QSize(30, 40))
+        self.dro_label_a.setText("A")
+        self.dro_label_a.setAlignment(QtCore.Qt.AlignCenter)
+        self.dro_label_a.setObjectName("dro_label_a")
+        self.gridLayout_2.addWidget(self.dro_label_a, 4, 2, 1, 1)
+        self.dro_label_z = QtWidgets.QLabel(self.dro_place)
+        self.dro_label_z.setMinimumSize(QtCore.QSize(30, 40))
+        self.dro_label_z.setMaximumSize(QtCore.QSize(40, 40))
+        self.dro_label_z.setText("Z")
+        self.dro_label_z.setAlignment(QtCore.Qt.AlignCenter)
+        self.dro_label_z.setObjectName("dro_label_z")
+        self.gridLayout_2.addWidget(self.dro_label_z, 3, 2, 1, 1)
+        self.home_b = ActionButton(self.dro_place)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.home_b.sizePolicy().hasHeightForWidth())
+        self.home_b.setSizePolicy(sizePolicy)
+        self.home_b.setMinimumSize(QtCore.QSize(48, 40))
+        self.home_b.setMaximumSize(QtCore.QSize(48, 40))
+        self.home_b.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.home_b.setProperty("home_action", True)
+        self.home_b.setProperty("joint_number", 4)
+        self.home_b.setProperty("axis_letter", "B")
+        self.home_b.setProperty("view_type_string", "P")
+        self.home_b.setProperty("textTemplate", "%1.3f in")
+        self.home_b.setProperty("alt_textTemplate", "%1.2f mm")
+        self.home_b.setObjectName("home_b")
+        self.gridLayout_2.addWidget(self.home_b, 5, 1, 1, 1)
         self.dro_label_y = QtWidgets.QLabel(self.dro_place)
         self.dro_label_y.setMinimumSize(QtCore.QSize(30, 40))
         self.dro_label_y.setMaximumSize(QtCore.QSize(40, 40))
@@ -2332,30 +2551,164 @@ def setupUi(self, MainWindow):
         self.dro_label_y.setAlignment(QtCore.Qt.AlignCenter)
         self.dro_label_y.setObjectName("dro_label_y")
         self.gridLayout_2.addWidget(self.dro_label_y, 2, 2, 1, 1)
-        self.dro_z = DROLabel(self.dro_place)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.dro_z.sizePolicy().hasHeightForWidth())
-        self.dro_z.setSizePolicy(sizePolicy)
-        self.dro_z.setMinimumSize(QtCore.QSize(0, 40))
-        self.dro_z.setMaximumSize(QtCore.QSize(16777215, 40))
-        self.dro_z.setStyleSheet("")
-        self.dro_z.setFrameShape(QtWidgets.QFrame.NoFrame)
-        self.dro_z.setFrameShadow(QtWidgets.QFrame.Plain)
-        self.dro_z.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.dro_z.setProperty("Qjoint_number", 2)
-        self.dro_z.setProperty("homed", False)
-        self.dro_z.setObjectName("dro_z")
-        self.gridLayout_2.addWidget(self.dro_z, 3, 3, 1, 1)
-        self.home_y = ActionButton(self.dro_place)
+        self.dro_b = DROLabel(self.dro_place)
+        self.dro_b.setMinimumSize(QtCore.QSize(0, 40))
+        self.dro_b.setMaximumSize(QtCore.QSize(200, 40))
+        self.dro_b.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.dro_b.setProperty("Qjoint_number", 4)
+        self.dro_b.setObjectName("dro_b")
+        self.gridLayout_2.addWidget(self.dro_b, 5, 3, 1, 1)
+        self.dro_a = DROLabel(self.dro_place)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.home_y.sizePolicy().hasHeightForWidth())
-        self.home_y.setSizePolicy(sizePolicy)
-        self.home_y.setMinimumSize(QtCore.QSize(48, 40))
-        self.home_y.setMaximumSize(QtCore.QSize(48, 40))
+        sizePolicy.setHeightForWidth(self.dro_a.sizePolicy().hasHeightForWidth())
+        self.dro_a.setSizePolicy(sizePolicy)
+        self.dro_a.setMinimumSize(QtCore.QSize(0, 40))
+        self.dro_a.setMaximumSize(QtCore.QSize(200, 40))
+        self.dro_a.setStyleSheet("")
+        self.dro_a.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.dro_a.setFrameShadow(QtWidgets.QFrame.Plain)
+        self.dro_a.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.dro_a.setProperty("Qjoint_number", 3)
+        self.dro_a.setProperty("Qreference_type", 0)
+        self.dro_a.setProperty("homed", False)
+        self.dro_a.setObjectName("dro_a")
+        self.gridLayout_2.addWidget(self.dro_a, 4, 3, 1, 1)
+        self.touch_x = AxisToolButton(self.dro_place)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.touch_x.sizePolicy().hasHeightForWidth())
+        self.touch_x.setSizePolicy(sizePolicy)
+        self.touch_x.setMinimumSize(QtCore.QSize(40, 40))
+        self.touch_x.setMaximumSize(QtCore.QSize(40, 40))
+        self.touch_x.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.touch_x.setText("0")
+        self.touch_x.setPopupMode(QtWidgets.QToolButton.InstantPopup)
+        self.touch_x.setArrowType(QtCore.Qt.NoArrow)
+        self.touch_x.setProperty("axis_letter", "X")
+        self.touch_x.setProperty("halpin_option", False)
+        self.touch_x.setObjectName("touch_x")
+        self.gridLayout_2.addWidget(self.touch_x, 1, 4, 1, 1)
+        self.touch_y = AxisToolButton(self.dro_place)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.touch_y.sizePolicy().hasHeightForWidth())
+        self.touch_y.setSizePolicy(sizePolicy)
+        self.touch_y.setMinimumSize(QtCore.QSize(40, 40))
+        self.touch_y.setMaximumSize(QtCore.QSize(40, 40))
+        self.touch_y.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.touch_y.setText("0")
+        self.touch_y.setPopupMode(QtWidgets.QToolButton.InstantPopup)
+        self.touch_y.setArrowType(QtCore.Qt.NoArrow)
+        self.touch_y.setProperty("joint_number", 1)
+        self.touch_y.setProperty("axis_letter", "Y")
+        self.touch_y.setProperty("halpin_option", False)
+        self.touch_y.setObjectName("touch_y")
+        self.gridLayout_2.addWidget(self.touch_y, 2, 4, 1, 1)
+        self.touch_z = AxisToolButton(self.dro_place)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.touch_z.sizePolicy().hasHeightForWidth())
+        self.touch_z.setSizePolicy(sizePolicy)
+        self.touch_z.setMinimumSize(QtCore.QSize(40, 40))
+        self.touch_z.setMaximumSize(QtCore.QSize(40, 40))
+        self.touch_z.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.touch_z.setText("0")
+        self.touch_z.setPopupMode(QtWidgets.QToolButton.InstantPopup)
+        self.touch_z.setArrowType(QtCore.Qt.NoArrow)
+        self.touch_z.setProperty("joint_number", 2)
+        self.touch_z.setProperty("axis_letter", "Z")
+        self.touch_z.setProperty("halpin_option", False)
+        self.touch_z.setObjectName("touch_z")
+        self.gridLayout_2.addWidget(self.touch_z, 3, 4, 1, 1)
+        self.dro_z = DROLabel(self.dro_place)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.dro_z.sizePolicy().hasHeightForWidth())
+        self.dro_z.setSizePolicy(sizePolicy)
+        self.dro_z.setMinimumSize(QtCore.QSize(0, 40))
+        self.dro_z.setMaximumSize(QtCore.QSize(16777215, 40))
+        self.dro_z.setStyleSheet("")
+        self.dro_z.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.dro_z.setFrameShadow(QtWidgets.QFrame.Plain)
+        self.dro_z.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.dro_z.setProperty("Qjoint_number", 2)
+        self.dro_z.setProperty("homed", False)
+        self.dro_z.setObjectName("dro_z")
+        self.gridLayout_2.addWidget(self.dro_z, 3, 3, 1, 1)
+        self.dro_label_b = QtWidgets.QLabel(self.dro_place)
+        self.dro_label_b.setMinimumSize(QtCore.QSize(30, 40))
+        self.dro_label_b.setMaximumSize(QtCore.QSize(30, 40))
+        self.dro_label_b.setText("B")
+        self.dro_label_b.setAlignment(QtCore.Qt.AlignCenter)
+        self.dro_label_b.setObjectName("dro_label_b")
+        self.gridLayout_2.addWidget(self.dro_label_b, 5, 2, 1, 1)
+        self.touch_b = AxisToolButton(self.dro_place)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.touch_b.sizePolicy().hasHeightForWidth())
+        self.touch_b.setSizePolicy(sizePolicy)
+        self.touch_b.setMinimumSize(QtCore.QSize(40, 40))
+        self.touch_b.setMaximumSize(QtCore.QSize(40, 40))
+        self.touch_b.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.touch_b.setText("0")
+        self.touch_b.setPopupMode(QtWidgets.QToolButton.InstantPopup)
+        self.touch_b.setProperty("joint_number", 4)
+        self.touch_b.setProperty("axis_letter", "B")
+        self.touch_b.setProperty("halpin_option", False)
+        self.touch_b.setObjectName("touch_b")
+        self.gridLayout_2.addWidget(self.touch_b, 5, 4, 1, 1)
+        self.home_a = ActionButton(self.dro_place)
+        self.home_a.setEnabled(True)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.home_a.sizePolicy().hasHeightForWidth())
+        self.home_a.setSizePolicy(sizePolicy)
+        self.home_a.setMinimumSize(QtCore.QSize(48, 40))
+        self.home_a.setMaximumSize(QtCore.QSize(48, 40))
+        self.home_a.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.home_a.setProperty("indicator_option", False)
+        self.home_a.setProperty("indicator_HAL_pin_option", False)
+        self.home_a.setProperty("indicator_status_option", False)
+        self.home_a.setProperty("checked_state_text_option", False)
+        self.home_a.setProperty("on_color", QtGui.QColor(255, 0, 0))
+        self.home_a.setProperty("off_color", QtGui.QColor(0, 0, 0))
+        self.home_a.setProperty("indicator_size", 0.2)
+        self.home_a.setProperty("is_joint_homed_status", False)
+        self.home_a.setProperty("mdi_action", False)
+        self.home_a.setProperty("home_action", True)
+        self.home_a.setProperty("mdi_command_action", False)
+        self.home_a.setProperty("template_label_option", False)
+        self.home_a.setProperty("joint_number", 3)
+        self.home_a.setProperty("axis_letter", "A")
+        self.home_a.setProperty("incr_imperial_number", 0.01)
+        self.home_a.setProperty("incr_mm_number", 0.025)
+        self.home_a.setProperty("incr_angular_number", -1.0)
+        self.home_a.setProperty("toggle_float_option", False)
+        self.home_a.setProperty("float_num", 100.0)
+        self.home_a.setProperty("float_alt_num", 50.0)
+        self.home_a.setProperty("view_type_string", "P")
+        self.home_a.setProperty("ini_mdi_number", 0)
+        self.home_a.setProperty("textTemplate", "%1.3f in")
+        self.home_a.setProperty("alt_textTemplate", "%1.2f mm")
+        self.home_a.setObjectName("home_a")
+        self.gridLayout_2.addWidget(self.home_a, 4, 1, 1, 1)
+        self.home_y = ActionButton(self.dro_place)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.home_y.sizePolicy().hasHeightForWidth())
+        self.home_y.setSizePolicy(sizePolicy)
+        self.home_y.setMinimumSize(QtCore.QSize(48, 40))
+        self.home_y.setMaximumSize(QtCore.QSize(48, 40))
+        self.home_y.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.home_y.setProperty("indicator_option", False)
         self.home_y.setProperty("indicator_HAL_pin_option", False)
         self.home_y.setProperty("indicator_status_option", False)
@@ -2382,23 +2735,13 @@ def setupUi(self, MainWindow):
         self.home_y.setProperty("alt_textTemplate", "%1.2f mm")
         self.home_y.setObjectName("home_y")
         self.gridLayout_2.addWidget(self.home_y, 2, 1, 1, 1)
-        self.dro_a = DROLabel(self.dro_place)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.dro_a.sizePolicy().hasHeightForWidth())
-        self.dro_a.setSizePolicy(sizePolicy)
-        self.dro_a.setMinimumSize(QtCore.QSize(0, 40))
-        self.dro_a.setMaximumSize(QtCore.QSize(200, 40))
-        self.dro_a.setStyleSheet("")
-        self.dro_a.setFrameShape(QtWidgets.QFrame.NoFrame)
-        self.dro_a.setFrameShadow(QtWidgets.QFrame.Plain)
-        self.dro_a.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.dro_a.setProperty("Qjoint_number", 3)
-        self.dro_a.setProperty("Qreference_type", 0)
-        self.dro_a.setProperty("homed", False)
-        self.dro_a.setObjectName("dro_a")
-        self.gridLayout_2.addWidget(self.dro_a, 4, 3, 1, 1)
+        self.touch_xy = PushButton(self.dro_place)
+        self.touch_xy.setMinimumSize(QtCore.QSize(40, 40))
+        self.touch_xy.setMaximumSize(QtCore.QSize(40, 40))
+        self.touch_xy.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.touch_xy.setText("X0Y0")
+        self.touch_xy.setObjectName("touch_xy")
+        self.gridLayout_2.addWidget(self.touch_xy, 0, 4, 1, 1)
         self.home_x = ActionButton(self.dro_place)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
@@ -2407,6 +2750,7 @@ def setupUi(self, MainWindow):
         self.home_x.setSizePolicy(sizePolicy)
         self.home_x.setMinimumSize(QtCore.QSize(48, 40))
         self.home_x.setMaximumSize(QtCore.QSize(48, 40))
+        self.home_x.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.home_x.setProperty("indicator_option", False)
         self.home_x.setProperty("indicator_HAL_pin_option", False)
         self.home_x.setProperty("indicator_status_option", False)
@@ -2442,6 +2786,7 @@ def setupUi(self, MainWindow):
         self.home_z.setSizePolicy(sizePolicy)
         self.home_z.setMinimumSize(QtCore.QSize(48, 40))
         self.home_z.setMaximumSize(QtCore.QSize(48, 40))
+        self.home_z.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.home_z.setProperty("indicator_option", False)
         self.home_z.setProperty("indicator_HAL_pin_option", False)
         self.home_z.setProperty("indicator_status_option", False)
@@ -2459,13 +2804,6 @@ def setupUi(self, MainWindow):
         self.home_z.setProperty("alt_textTemplate", "%1.2f mm")
         self.home_z.setObjectName("home_z")
         self.gridLayout_2.addWidget(self.home_z, 3, 1, 1, 1)
-        self.dro_label_a = QtWidgets.QLabel(self.dro_place)
-        self.dro_label_a.setMinimumSize(QtCore.QSize(30, 40))
-        self.dro_label_a.setMaximumSize(QtCore.QSize(30, 40))
-        self.dro_label_a.setText("A")
-        self.dro_label_a.setAlignment(QtCore.Qt.AlignCenter)
-        self.dro_label_a.setObjectName("dro_label_a")
-        self.gridLayout_2.addWidget(self.dro_label_a, 4, 2, 1, 1)
         self.touch_a = AxisToolButton(self.dro_place)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
@@ -2474,6 +2812,7 @@ def setupUi(self, MainWindow):
         self.touch_a.setSizePolicy(sizePolicy)
         self.touch_a.setMinimumSize(QtCore.QSize(40, 40))
         self.touch_a.setMaximumSize(QtCore.QSize(40, 40))
+        self.touch_a.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.touch_a.setText("0")
         self.touch_a.setPopupMode(QtWidgets.QToolButton.InstantPopup)
         self.touch_a.setArrowType(QtCore.Qt.NoArrow)
@@ -2482,86 +2821,6 @@ def setupUi(self, MainWindow):
         self.touch_a.setProperty("halpin_option", False)
         self.touch_a.setObjectName("touch_a")
         self.gridLayout_2.addWidget(self.touch_a, 4, 4, 1, 1)
-        self.home_a = ActionButton(self.dro_place)
-        self.home_a.setEnabled(True)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.home_a.sizePolicy().hasHeightForWidth())
-        self.home_a.setSizePolicy(sizePolicy)
-        self.home_a.setMinimumSize(QtCore.QSize(48, 40))
-        self.home_a.setMaximumSize(QtCore.QSize(48, 40))
-        self.home_a.setProperty("indicator_option", False)
-        self.home_a.setProperty("indicator_HAL_pin_option", False)
-        self.home_a.setProperty("indicator_status_option", False)
-        self.home_a.setProperty("checked_state_text_option", False)
-        self.home_a.setProperty("on_color", QtGui.QColor(255, 0, 0))
-        self.home_a.setProperty("off_color", QtGui.QColor(0, 0, 0))
-        self.home_a.setProperty("indicator_size", 0.2)
-        self.home_a.setProperty("is_joint_homed_status", False)
-        self.home_a.setProperty("mdi_action", False)
-        self.home_a.setProperty("home_action", True)
-        self.home_a.setProperty("mdi_command_action", False)
-        self.home_a.setProperty("template_label_option", False)
-        self.home_a.setProperty("joint_number", 3)
-        self.home_a.setProperty("axis_letter", "A")
-        self.home_a.setProperty("incr_imperial_number", 0.01)
-        self.home_a.setProperty("incr_mm_number", 0.025)
-        self.home_a.setProperty("incr_angular_number", -1.0)
-        self.home_a.setProperty("toggle_float_option", False)
-        self.home_a.setProperty("float_num", 100.0)
-        self.home_a.setProperty("float_alt_num", 50.0)
-        self.home_a.setProperty("view_type_string", "P")
-        self.home_a.setProperty("ini_mdi_number", 0)
-        self.home_a.setProperty("textTemplate", "%1.3f in")
-        self.home_a.setProperty("alt_textTemplate", "%1.2f mm")
-        self.home_a.setObjectName("home_a")
-        self.gridLayout_2.addWidget(self.home_a, 4, 1, 1, 1)
-        self.touch_x = AxisToolButton(self.dro_place)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.touch_x.sizePolicy().hasHeightForWidth())
-        self.touch_x.setSizePolicy(sizePolicy)
-        self.touch_x.setMinimumSize(QtCore.QSize(40, 40))
-        self.touch_x.setMaximumSize(QtCore.QSize(40, 40))
-        self.touch_x.setText("0")
-        self.touch_x.setPopupMode(QtWidgets.QToolButton.InstantPopup)
-        self.touch_x.setArrowType(QtCore.Qt.NoArrow)
-        self.touch_x.setProperty("axis_letter", "X")
-        self.touch_x.setProperty("halpin_option", False)
-        self.touch_x.setObjectName("touch_x")
-        self.gridLayout_2.addWidget(self.touch_x, 1, 4, 1, 1)
-        self.dro_x = DROLabel(self.dro_place)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.dro_x.sizePolicy().hasHeightForWidth())
-        self.dro_x.setSizePolicy(sizePolicy)
-        self.dro_x.setMinimumSize(QtCore.QSize(0, 40))
-        self.dro_x.setMaximumSize(QtCore.QSize(16777215, 40))
-        self.dro_x.setStyleSheet("")
-        self.dro_x.setFrameShape(QtWidgets.QFrame.NoFrame)
-        self.dro_x.setFrameShadow(QtWidgets.QFrame.Plain)
-        self.dro_x.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.dro_x.setProperty("Qjoint_number", 0)
-        self.dro_x.setProperty("homed", False)
-        self.dro_x.setObjectName("dro_x")
-        self.gridLayout_2.addWidget(self.dro_x, 1, 3, 1, 1)
-        self.dro_label_z = QtWidgets.QLabel(self.dro_place)
-        self.dro_label_z.setMinimumSize(QtCore.QSize(30, 40))
-        self.dro_label_z.setMaximumSize(QtCore.QSize(40, 40))
-        self.dro_label_z.setText("Z")
-        self.dro_label_z.setAlignment(QtCore.Qt.AlignCenter)
-        self.dro_label_z.setObjectName("dro_label_z")
-        self.gridLayout_2.addWidget(self.dro_label_z, 3, 2, 1, 1)
-        self.dro_label_x = QtWidgets.QLabel(self.dro_place)
-        self.dro_label_x.setMinimumSize(QtCore.QSize(30, 40))
-        self.dro_label_x.setMaximumSize(QtCore.QSize(30, 40))
-        self.dro_label_x.setText("X")
-        self.dro_label_x.setAlignment(QtCore.Qt.AlignCenter)
-        self.dro_label_x.setObjectName("dro_label_x")
-        self.gridLayout_2.addWidget(self.dro_label_x, 1, 2, 1, 1)
         self.home_all = ActionButton(self.dro_place)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
@@ -2570,6 +2829,7 @@ def setupUi(self, MainWindow):
         self.home_all.setSizePolicy(sizePolicy)
         self.home_all.setMinimumSize(QtCore.QSize(48, 40))
         self.home_all.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.home_all.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.home_all.setToolTip("")
         self.home_all.setProperty("indicator_option", False)
         self.home_all.setProperty("indicator_HAL_pin_option", False)
@@ -2580,9 +2840,9 @@ def setupUi(self, MainWindow):
         self.home_all.setProperty("shape_option", 0)
         self.home_all.setProperty("off_color", QtGui.QColor(0, 0, 0))
         self.home_all.setProperty("indicator_size", 0.3)
-        self.home_all.setProperty("circle_diameter", 10.0)
-        self.home_all.setProperty("right_edge_offset", 0.0)
-        self.home_all.setProperty("top_edge_offset", 0.0)
+        self.home_all.setProperty("circle_diameter", 10)
+        self.home_all.setProperty("right_edge_offset", 0)
+        self.home_all.setProperty("top_edge_offset", 0)
         self.home_all.setProperty("corner_radius", 5.0)
         self.home_all.setProperty("height_fraction", 0.3)
         self.home_all.setProperty("width_fraction", 0.9)
@@ -2623,99 +2883,70 @@ def setupUi(self, MainWindow):
         self.home_all.setProperty("alt_textTemplate", "%1.2f mm")
         self.home_all.setObjectName("home_all")
         self.gridLayout_2.addWidget(self.home_all, 0, 1, 1, 2)
-        self.touch_xy = PushButton(self.dro_place)
-        self.touch_xy.setMinimumSize(QtCore.QSize(40, 40))
-        self.touch_xy.setMaximumSize(QtCore.QSize(40, 40))
-        self.touch_xy.setText("X0Y0")
-        self.touch_xy.setObjectName("touch_xy")
-        self.gridLayout_2.addWidget(self.touch_xy, 0, 4, 1, 1)
-        self.frame_10 = QtWidgets.QFrame(self.dro_place)
-        self.frame_10.setFrameShape(QtWidgets.QFrame.NoFrame)
-        self.frame_10.setFrameShadow(QtWidgets.QFrame.Plain)
-        self.frame_10.setObjectName("frame_10")
-        self.horizontalLayout_46 = QtWidgets.QHBoxLayout(self.frame_10)
-        self.horizontalLayout_46.setContentsMargins(0, 0, 0, 0)
-        self.horizontalLayout_46.setSpacing(4)
-        self.horizontalLayout_46.setObjectName("horizontalLayout_46")
-        self.wcs_button = SystemToolButton(self.frame_10)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.wcs_button.sizePolicy().hasHeightForWidth())
-        self.wcs_button.setSizePolicy(sizePolicy)
-        self.wcs_button.setMinimumSize(QtCore.QSize(48, 40))
-        self.wcs_button.setMaximumSize(QtCore.QSize(48, 40))
-        self.wcs_button.setText("")
-        self.wcs_button.setPopupMode(QtWidgets.QToolButton.InstantPopup)
-        self.wcs_button.setObjectName("wcs_button")
-        self.horizontalLayout_46.addWidget(self.wcs_button)
-        spacerItem19 = QtWidgets.QSpacerItem(64, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_46.addItem(spacerItem19)
-        self.camera = PushButton(self.frame_10)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.camera.sizePolicy().hasHeightForWidth())
-        self.camera.setSizePolicy(sizePolicy)
-        self.camera.setMinimumSize(QtCore.QSize(60, 40))
-        self.camera.setMaximumSize(QtCore.QSize(60, 40))
-        self.camera.setObjectName("camera")
-        self.horizontalLayout_46.addWidget(self.camera)
-        self.laser = PushButton(self.frame_10)
+        self.dro_label_x = QtWidgets.QLabel(self.dro_place)
+        self.dro_label_x.setMinimumSize(QtCore.QSize(30, 40))
+        self.dro_label_x.setMaximumSize(QtCore.QSize(30, 40))
+        self.dro_label_x.setText("X")
+        self.dro_label_x.setAlignment(QtCore.Qt.AlignCenter)
+        self.dro_label_x.setObjectName("dro_label_x")
+        self.gridLayout_2.addWidget(self.dro_label_x, 1, 2, 1, 1)
+        self.dro_x = DROLabel(self.dro_place)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.laser.sizePolicy().hasHeightForWidth())
-        self.laser.setSizePolicy(sizePolicy)
-        self.laser.setMinimumSize(QtCore.QSize(60, 40))
-        self.laser.setMaximumSize(QtCore.QSize(60, 40))
-        self.laser.setObjectName("laser")
-        self.horizontalLayout_46.addWidget(self.laser)
-        self.gridLayout_2.addWidget(self.frame_10, 0, 3, 1, 1)
-        self.home_b = ActionButton(self.dro_place)
+        sizePolicy.setHeightForWidth(self.dro_x.sizePolicy().hasHeightForWidth())
+        self.dro_x.setSizePolicy(sizePolicy)
+        self.dro_x.setMinimumSize(QtCore.QSize(0, 40))
+        self.dro_x.setMaximumSize(QtCore.QSize(16777215, 40))
+        self.dro_x.setStyleSheet("")
+        self.dro_x.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.dro_x.setFrameShadow(QtWidgets.QFrame.Plain)
+        self.dro_x.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.dro_x.setProperty("Qjoint_number", 0)
+        self.dro_x.setProperty("homed", False)
+        self.dro_x.setObjectName("dro_x")
+        self.gridLayout_2.addWidget(self.dro_x, 1, 3, 1, 1)
+        self.home_c = ActionButton(self.dro_place)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.home_b.sizePolicy().hasHeightForWidth())
-        self.home_b.setSizePolicy(sizePolicy)
-        self.home_b.setMinimumSize(QtCore.QSize(48, 40))
-        self.home_b.setMaximumSize(QtCore.QSize(48, 40))
-        self.home_b.setProperty("home_action", True)
-        self.home_b.setProperty("joint_number", 4)
-        self.home_b.setProperty("axis_letter", "B")
-        self.home_b.setProperty("view_type_string", "P")
-        self.home_b.setProperty("textTemplate", "%1.3f in")
-        self.home_b.setProperty("alt_textTemplate", "%1.2f mm")
-        self.home_b.setObjectName("home_b")
-        self.gridLayout_2.addWidget(self.home_b, 5, 1, 1, 1)
-        self.dro_label_b = QtWidgets.QLabel(self.dro_place)
-        self.dro_label_b.setMinimumSize(QtCore.QSize(30, 40))
-        self.dro_label_b.setMaximumSize(QtCore.QSize(30, 40))
-        self.dro_label_b.setText("B")
-        self.dro_label_b.setAlignment(QtCore.Qt.AlignCenter)
-        self.dro_label_b.setObjectName("dro_label_b")
-        self.gridLayout_2.addWidget(self.dro_label_b, 5, 2, 1, 1)
-        self.dro_b = DROLabel(self.dro_place)
-        self.dro_b.setMinimumSize(QtCore.QSize(0, 40))
-        self.dro_b.setMaximumSize(QtCore.QSize(200, 40))
-        self.dro_b.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.dro_b.setProperty("Qjoint_number", 4)
-        self.dro_b.setObjectName("dro_b")
-        self.gridLayout_2.addWidget(self.dro_b, 5, 3, 1, 1)
-        self.touch_b = AxisToolButton(self.dro_place)
+        sizePolicy.setHeightForWidth(self.home_c.sizePolicy().hasHeightForWidth())
+        self.home_c.setSizePolicy(sizePolicy)
+        self.home_c.setMinimumSize(QtCore.QSize(48, 40))
+        self.home_c.setMaximumSize(QtCore.QSize(48, 40))
+        self.home_c.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.home_c.setProperty("home_action", True)
+        self.home_c.setProperty("joint_number", 5)
+        self.home_c.setProperty("axis_letter", "C")
+        self.home_c.setObjectName("home_c")
+        self.gridLayout_2.addWidget(self.home_c, 6, 1, 1, 1)
+        self.dro_label_c = QtWidgets.QLabel(self.dro_place)
+        self.dro_label_c.setMinimumSize(QtCore.QSize(30, 40))
+        self.dro_label_c.setMaximumSize(QtCore.QSize(30, 40))
+        self.dro_label_c.setAlignment(QtCore.Qt.AlignCenter)
+        self.dro_label_c.setObjectName("dro_label_c")
+        self.gridLayout_2.addWidget(self.dro_label_c, 6, 2, 1, 1)
+        self.dro_c = DROLabel(self.dro_place)
+        self.dro_c.setMinimumSize(QtCore.QSize(0, 40))
+        self.dro_c.setMaximumSize(QtCore.QSize(200, 40))
+        self.dro_c.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.dro_c.setProperty("Qjoint_number", 5)
+        self.dro_c.setObjectName("dro_c")
+        self.gridLayout_2.addWidget(self.dro_c, 6, 3, 1, 1)
+        self.touch_c = AxisToolButton(self.dro_place)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.touch_b.sizePolicy().hasHeightForWidth())
-        self.touch_b.setSizePolicy(sizePolicy)
-        self.touch_b.setMinimumSize(QtCore.QSize(40, 40))
-        self.touch_b.setMaximumSize(QtCore.QSize(40, 40))
-        self.touch_b.setText("0")
-        self.touch_b.setProperty("joint_number", 4)
-        self.touch_b.setProperty("axis_letter", "B")
-        self.touch_b.setProperty("halpin_option", False)
-        self.touch_b.setObjectName("touch_b")
-        self.gridLayout_2.addWidget(self.touch_b, 5, 4, 1, 1)
+        sizePolicy.setHeightForWidth(self.touch_c.sizePolicy().hasHeightForWidth())
+        self.touch_c.setSizePolicy(sizePolicy)
+        self.touch_c.setMinimumSize(QtCore.QSize(40, 40))
+        self.touch_c.setMaximumSize(QtCore.QSize(40, 40))
+        self.touch_c.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.touch_c.setPopupMode(QtWidgets.QToolButton.InstantPopup)
+        self.touch_c.setProperty("joint_number", 5)
+        self.touch_c.setProperty("halpin_option", False)
+        self.touch_c.setObjectName("touch_c")
+        self.gridLayout_2.addWidget(self.touch_c, 6, 4, 1, 1)
         self.verticalLayout_2.addWidget(self.dro_place)
         self.dro_gcode_layout.addWidget(self.dro_frame)
         self.main_tab_Layout.addWidget(self.dro_gcode_frame)
@@ -2768,6 +2999,7 @@ def setupUi(self, MainWindow):
         self.conv_line.setSizePolicy(sizePolicy)
         self.conv_line.setMinimumSize(QtCore.QSize(60, 60))
         self.conv_line.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.conv_line.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.conv_line.setIconSize(QtCore.QSize(48, 48))
         self.conv_line.setCheckable(False)
         self.conv_line.setAutoExclusive(True)
@@ -2781,6 +3013,7 @@ def setupUi(self, MainWindow):
         self.conv_circle.setSizePolicy(sizePolicy)
         self.conv_circle.setMinimumSize(QtCore.QSize(60, 60))
         self.conv_circle.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.conv_circle.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.conv_circle.setIconSize(QtCore.QSize(48, 48))
         self.conv_circle.setCheckable(False)
         self.conv_circle.setAutoExclusive(True)
@@ -2793,6 +3026,7 @@ def setupUi(self, MainWindow):
         sizePolicy.setHeightForWidth(self.conv_ellipse.sizePolicy().hasHeightForWidth())
         self.conv_ellipse.setSizePolicy(sizePolicy)
         self.conv_ellipse.setMinimumSize(QtCore.QSize(60, 60))
+        self.conv_ellipse.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.conv_ellipse.setText("")
         self.conv_ellipse.setIconSize(QtCore.QSize(48, 48))
         self.conv_ellipse.setObjectName("conv_ellipse")
@@ -2805,6 +3039,7 @@ def setupUi(self, MainWindow):
         self.conv_triangle.setSizePolicy(sizePolicy)
         self.conv_triangle.setMinimumSize(QtCore.QSize(60, 60))
         self.conv_triangle.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.conv_triangle.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.conv_triangle.setIconSize(QtCore.QSize(48, 48))
         self.conv_triangle.setCheckable(False)
         self.conv_triangle.setAutoExclusive(True)
@@ -2818,6 +3053,7 @@ def setupUi(self, MainWindow):
         self.conv_rectangle.setSizePolicy(sizePolicy)
         self.conv_rectangle.setMinimumSize(QtCore.QSize(60, 60))
         self.conv_rectangle.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.conv_rectangle.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.conv_rectangle.setIconSize(QtCore.QSize(48, 48))
         self.conv_rectangle.setCheckable(False)
         self.conv_rectangle.setAutoExclusive(True)
@@ -2831,6 +3067,7 @@ def setupUi(self, MainWindow):
         self.conv_polygon.setSizePolicy(sizePolicy)
         self.conv_polygon.setMinimumSize(QtCore.QSize(60, 60))
         self.conv_polygon.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.conv_polygon.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.conv_polygon.setIconSize(QtCore.QSize(48, 48))
         self.conv_polygon.setCheckable(False)
         self.conv_polygon.setAutoExclusive(True)
@@ -2844,6 +3081,7 @@ def setupUi(self, MainWindow):
         self.conv_bolt.setSizePolicy(sizePolicy)
         self.conv_bolt.setMinimumSize(QtCore.QSize(60, 60))
         self.conv_bolt.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.conv_bolt.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.conv_bolt.setIconSize(QtCore.QSize(48, 48))
         self.conv_bolt.setCheckable(False)
         self.conv_bolt.setAutoExclusive(True)
@@ -2857,6 +3095,7 @@ def setupUi(self, MainWindow):
         self.conv_slot.setSizePolicy(sizePolicy)
         self.conv_slot.setMinimumSize(QtCore.QSize(60, 60))
         self.conv_slot.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.conv_slot.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.conv_slot.setIconSize(QtCore.QSize(48, 48))
         self.conv_slot.setCheckable(False)
         self.conv_slot.setAutoExclusive(True)
@@ -2870,6 +3109,7 @@ def setupUi(self, MainWindow):
         self.conv_star.setSizePolicy(sizePolicy)
         self.conv_star.setMinimumSize(QtCore.QSize(60, 60))
         self.conv_star.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.conv_star.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.conv_star.setIconSize(QtCore.QSize(48, 48))
         self.conv_star.setCheckable(False)
         self.conv_star.setAutoExclusive(True)
@@ -2883,6 +3123,7 @@ def setupUi(self, MainWindow):
         self.conv_gusset.setSizePolicy(sizePolicy)
         self.conv_gusset.setMinimumSize(QtCore.QSize(60, 60))
         self.conv_gusset.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.conv_gusset.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.conv_gusset.setIconSize(QtCore.QSize(48, 48))
         self.conv_gusset.setCheckable(False)
         self.conv_gusset.setAutoExclusive(True)
@@ -2896,48 +3137,26 @@ def setupUi(self, MainWindow):
         self.conv_sector.setSizePolicy(sizePolicy)
         self.conv_sector.setMinimumSize(QtCore.QSize(60, 60))
         self.conv_sector.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.conv_sector.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.conv_sector.setIconSize(QtCore.QSize(48, 48))
         self.conv_sector.setCheckable(False)
         self.conv_sector.setAutoExclusive(True)
         self.conv_sector.setObjectName("conv_sector")
         self.horizontalLayout_33.addWidget(self.conv_sector)
-        self.conv_rotate = PushButton(self.conv_top)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.conv_rotate.sizePolicy().hasHeightForWidth())
-        self.conv_rotate.setSizePolicy(sizePolicy)
-        self.conv_rotate.setMinimumSize(QtCore.QSize(60, 60))
-        self.conv_rotate.setMaximumSize(QtCore.QSize(16777215, 16777215))
-        self.conv_rotate.setIconSize(QtCore.QSize(48, 48))
-        self.conv_rotate.setCheckable(False)
-        self.conv_rotate.setAutoExclusive(True)
-        self.conv_rotate.setObjectName("conv_rotate")
-        self.horizontalLayout_33.addWidget(self.conv_rotate)
-        self.conv_scale = PushButton(self.conv_top)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.conv_scale.sizePolicy().hasHeightForWidth())
-        self.conv_scale.setSizePolicy(sizePolicy)
-        self.conv_scale.setMinimumSize(QtCore.QSize(60, 60))
-        self.conv_scale.setIconSize(QtCore.QSize(48, 48))
-        self.conv_scale.setAutoExclusive(True)
-        self.conv_scale.setObjectName("conv_scale")
-        self.horizontalLayout_33.addWidget(self.conv_scale)
-        self.conv_array = PushButton(self.conv_top)
+        spacerItem20 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_33.addItem(spacerItem20)
+        self.conv_block = QtWidgets.QPushButton(self.conv_top)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.conv_array.sizePolicy().hasHeightForWidth())
-        self.conv_array.setSizePolicy(sizePolicy)
-        self.conv_array.setMinimumSize(QtCore.QSize(60, 60))
-        self.conv_array.setMaximumSize(QtCore.QSize(16777215, 16777215))
-        self.conv_array.setIconSize(QtCore.QSize(48, 48))
-        self.conv_array.setCheckable(False)
-        self.conv_array.setAutoExclusive(True)
-        self.conv_array.setObjectName("conv_array")
-        self.horizontalLayout_33.addWidget(self.conv_array)
+        sizePolicy.setHeightForWidth(self.conv_block.sizePolicy().hasHeightForWidth())
+        self.conv_block.setSizePolicy(sizePolicy)
+        self.conv_block.setMinimumSize(QtCore.QSize(60, 60))
+        self.conv_block.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.conv_block.setText("")
+        self.conv_block.setIconSize(QtCore.QSize(48, 48))
+        self.conv_block.setObjectName("conv_block")
+        self.horizontalLayout_33.addWidget(self.conv_block)
         self.verticalLayout_51.addWidget(self.conv_top)
         self.conv_bottom = QtWidgets.QFrame(self.conv_main)
         self.conv_bottom.setFrameShape(QtWidgets.QFrame.NoFrame)
@@ -2965,6 +3184,7 @@ def setupUi(self, MainWindow):
         self.verticalLayout_54 = QtWidgets.QVBoxLayout(self.frame_34)
         self.verticalLayout_54.setObjectName("verticalLayout_54")
         self.conv_material = QtWidgets.QComboBox(self.frame_34)
+        self.conv_material.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.conv_material.setObjectName("conv_material")
         self.verticalLayout_54.addWidget(self.conv_material)
         self.entries = QtWidgets.QGridLayout()
@@ -2972,8 +3192,8 @@ def setupUi(self, MainWindow):
         self.entries.setObjectName("entries")
         self.verticalLayout_54.addLayout(self.entries)
         self.verticalLayout_53.addWidget(self.frame_34)
-        spacerItem20 = QtWidgets.QSpacerItem(20, 505, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout_53.addItem(spacerItem20)
+        spacerItem21 = QtWidgets.QSpacerItem(20, 505, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout_53.addItem(spacerItem21)
         self.frame_38 = QtWidgets.QFrame(self.conv_left)
         self.frame_38.setFrameShape(QtWidgets.QFrame.NoFrame)
         self.frame_38.setFrameShadow(QtWidgets.QFrame.Plain)
@@ -2989,6 +3209,7 @@ def setupUi(self, MainWindow):
         self.conv_new.setSizePolicy(sizePolicy)
         self.conv_new.setMinimumSize(QtCore.QSize(90, 0))
         self.conv_new.setMaximumSize(QtCore.QSize(90, 16777215))
+        self.conv_new.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.conv_new.setObjectName("conv_new")
         self.horizontalLayout_35.addWidget(self.conv_new)
         self.conv_save = PushButton(self.frame_38)
@@ -2999,6 +3220,7 @@ def setupUi(self, MainWindow):
         self.conv_save.setSizePolicy(sizePolicy)
         self.conv_save.setMinimumSize(QtCore.QSize(90, 0))
         self.conv_save.setMaximumSize(QtCore.QSize(90, 16777215))
+        self.conv_save.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.conv_save.setObjectName("conv_save")
         self.horizontalLayout_35.addWidget(self.conv_save)
         self.conv_settings = PushButton(self.frame_38)
@@ -3009,6 +3231,7 @@ def setupUi(self, MainWindow):
         self.conv_settings.setSizePolicy(sizePolicy)
         self.conv_settings.setMinimumSize(QtCore.QSize(90, 0))
         self.conv_settings.setMaximumSize(QtCore.QSize(90, 16777215))
+        self.conv_settings.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.conv_settings.setObjectName("conv_settings")
         self.horizontalLayout_35.addWidget(self.conv_settings)
         self.conv_send = PushButton(self.frame_38)
@@ -3019,6 +3242,7 @@ def setupUi(self, MainWindow):
         self.conv_send.setSizePolicy(sizePolicy)
         self.conv_send.setMinimumSize(QtCore.QSize(90, 0))
         self.conv_send.setMaximumSize(QtCore.QSize(90, 16777215))
+        self.conv_send.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.conv_send.setObjectName("conv_send")
         self.horizontalLayout_35.addWidget(self.conv_send)
         self.horizontalLayout_35.setStretch(0, 1)
@@ -3031,15 +3255,108 @@ def setupUi(self, MainWindow):
         self.conv_right.setFrameShape(QtWidgets.QFrame.NoFrame)
         self.conv_right.setFrameShadow(QtWidgets.QFrame.Plain)
         self.conv_right.setObjectName("conv_right")
-        self.verticalLayout_52 = QtWidgets.QVBoxLayout(self.conv_right)
-        self.verticalLayout_52.setContentsMargins(0, 0, 0, 0)
-        self.verticalLayout_52.setSpacing(0)
-        self.verticalLayout_52.setObjectName("verticalLayout_52")
+        self.horizontalLayout_43 = QtWidgets.QHBoxLayout(self.conv_right)
+        self.horizontalLayout_43.setObjectName("horizontalLayout_43")
         self.conv_preview = GCodeGraphics(self.conv_right)
         self.conv_preview.setObjectName("conv_preview")
-        self.verticalLayout_52.addWidget(self.conv_preview)
+        self.horizontalLayout_43.addWidget(self.conv_preview)
+        self.conv_preview_buttons = QtWidgets.QFrame(self.conv_right)
+        self.conv_preview_buttons.setEnabled(True)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.conv_preview_buttons.sizePolicy().hasHeightForWidth())
+        self.conv_preview_buttons.setSizePolicy(sizePolicy)
+        self.conv_preview_buttons.setMaximumSize(QtCore.QSize(40, 16777215))
+        self.conv_preview_buttons.setAutoFillBackground(True)
+        self.conv_preview_buttons.setObjectName("conv_preview_buttons")
+        self.verticalLayout_52 = QtWidgets.QVBoxLayout(self.conv_preview_buttons)
+        self.verticalLayout_52.setContentsMargins(0, 2, 0, 2)
+        self.verticalLayout_52.setSpacing(8)
+        self.verticalLayout_52.setObjectName("verticalLayout_52")
+        spacerItem22 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout_52.addItem(spacerItem22)
+        self.conv_view_t = QtWidgets.QPushButton(self.conv_preview_buttons)
+        self.conv_view_t.setMinimumSize(QtCore.QSize(40, 28))
+        self.conv_view_t.setMaximumSize(QtCore.QSize(40, 28))
+        self.conv_view_t.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.conv_view_t.setText("T")
+        self.conv_view_t.setCheckable(True)
+        self.conv_view_t.setAutoExclusive(True)
+        self.conv_view_t.setObjectName("conv_view_t")
+        self.verticalLayout_52.addWidget(self.conv_view_t)
+        self.conv_view_z = QtWidgets.QPushButton(self.conv_preview_buttons)
+        self.conv_view_z.setMinimumSize(QtCore.QSize(40, 28))
+        self.conv_view_z.setMaximumSize(QtCore.QSize(40, 28))
+        self.conv_view_z.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.conv_view_z.setText("Z")
+        self.conv_view_z.setCheckable(True)
+        self.conv_view_z.setChecked(True)
+        self.conv_view_z.setAutoExclusive(True)
+        self.conv_view_z.setObjectName("conv_view_z")
+        self.verticalLayout_52.addWidget(self.conv_view_z)
+        self.view_spacer_4 = QtWidgets.QLabel(self.conv_preview_buttons)
+        self.view_spacer_4.setMinimumSize(QtCore.QSize(0, 10))
+        self.view_spacer_4.setMaximumSize(QtCore.QSize(16777215, 10))
+        self.view_spacer_4.setText("")
+        self.view_spacer_4.setObjectName("view_spacer_4")
+        self.verticalLayout_52.addWidget(self.view_spacer_4)
+        self.conv_pan_right = QtWidgets.QPushButton(self.conv_preview_buttons)
+        self.conv_pan_right.setMinimumSize(QtCore.QSize(40, 28))
+        self.conv_pan_right.setMaximumSize(QtCore.QSize(40, 28))
+        self.conv_pan_right.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.conv_pan_right.setText("→")
+        self.conv_pan_right.setAutoRepeat(True)
+        self.conv_pan_right.setObjectName("conv_pan_right")
+        self.verticalLayout_52.addWidget(self.conv_pan_right)
+        self.conv_pan_left = QtWidgets.QPushButton(self.conv_preview_buttons)
+        self.conv_pan_left.setMinimumSize(QtCore.QSize(40, 28))
+        self.conv_pan_left.setMaximumSize(QtCore.QSize(40, 28))
+        self.conv_pan_left.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.conv_pan_left.setText("←")
+        self.conv_pan_left.setAutoRepeat(True)
+        self.conv_pan_left.setObjectName("conv_pan_left")
+        self.verticalLayout_52.addWidget(self.conv_pan_left)
+        self.conv_pan_up = QtWidgets.QPushButton(self.conv_preview_buttons)
+        self.conv_pan_up.setMinimumSize(QtCore.QSize(40, 28))
+        self.conv_pan_up.setMaximumSize(QtCore.QSize(40, 28))
+        self.conv_pan_up.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.conv_pan_up.setText("↑")
+        self.conv_pan_up.setAutoRepeat(True)
+        self.conv_pan_up.setObjectName("conv_pan_up")
+        self.verticalLayout_52.addWidget(self.conv_pan_up)
+        self.conv_pan_down = QtWidgets.QPushButton(self.conv_preview_buttons)
+        self.conv_pan_down.setMinimumSize(QtCore.QSize(40, 28))
+        self.conv_pan_down.setMaximumSize(QtCore.QSize(40, 28))
+        self.conv_pan_down.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.conv_pan_down.setText("↓")
+        self.conv_pan_down.setAutoRepeat(True)
+        self.conv_pan_down.setObjectName("conv_pan_down")
+        self.verticalLayout_52.addWidget(self.conv_pan_down)
+        self.view_spacer_5 = QtWidgets.QLabel(self.conv_preview_buttons)
+        self.view_spacer_5.setMinimumSize(QtCore.QSize(0, 10))
+        self.view_spacer_5.setMaximumSize(QtCore.QSize(16777215, 10))
+        self.view_spacer_5.setText("")
+        self.view_spacer_5.setObjectName("view_spacer_5")
+        self.verticalLayout_52.addWidget(self.view_spacer_5)
+        self.conv_zoom_in = QtWidgets.QPushButton(self.conv_preview_buttons)
+        self.conv_zoom_in.setMinimumSize(QtCore.QSize(40, 28))
+        self.conv_zoom_in.setMaximumSize(QtCore.QSize(40, 28))
+        self.conv_zoom_in.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.conv_zoom_in.setText("+")
+        self.conv_zoom_in.setAutoRepeat(True)
+        self.conv_zoom_in.setObjectName("conv_zoom_in")
+        self.verticalLayout_52.addWidget(self.conv_zoom_in)
+        self.conv_zoom_out = QtWidgets.QPushButton(self.conv_preview_buttons)
+        self.conv_zoom_out.setMinimumSize(QtCore.QSize(40, 28))
+        self.conv_zoom_out.setMaximumSize(QtCore.QSize(40, 28))
+        self.conv_zoom_out.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.conv_zoom_out.setText("-")
+        self.conv_zoom_out.setAutoRepeat(True)
+        self.conv_zoom_out.setObjectName("conv_zoom_out")
+        self.verticalLayout_52.addWidget(self.conv_zoom_out)
+        self.horizontalLayout_43.addWidget(self.conv_preview_buttons)
         self.horizontalLayout_34.addWidget(self.conv_right)
-        self.horizontalLayout_34.setStretch(1, 1)
         self.verticalLayout_51.addWidget(self.conv_bottom)
         self.verticalLayout_51.setStretch(1, 1)
         self.verticalLayout_50.addWidget(self.conv_main)
@@ -3049,10 +3366,8 @@ def setupUi(self, MainWindow):
         self.param_tab.setObjectName("param_tab")
         self.horizontalLayout_12 = QtWidgets.QHBoxLayout(self.param_tab)
         self.horizontalLayout_12.setContentsMargins(4, 4, 4, 4)
-        self.horizontalLayout_12.setSpacing(4)
+        self.horizontalLayout_12.setSpacing(2)
         self.horizontalLayout_12.setObjectName("horizontalLayout_12")
-        spacerItem21 = QtWidgets.QSpacerItem(10, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_12.addItem(spacerItem21)
         self.config_frame = QtWidgets.QFrame(self.param_tab)
         self.config_frame.setFrameShape(QtWidgets.QFrame.NoFrame)
         self.config_frame.setFrameShadow(QtWidgets.QFrame.Plain)
@@ -3061,18 +3376,40 @@ def setupUi(self, MainWindow):
         self.verticalLayout_48.setContentsMargins(0, 0, 0, 4)
         self.verticalLayout_48.setSpacing(4)
         self.verticalLayout_48.setObjectName("verticalLayout_48")
-        self.config_label = QtWidgets.QLabel(self.config_frame)
+        self.frame_44 = QtWidgets.QFrame(self.config_frame)
+        self.frame_44.setMinimumSize(QtCore.QSize(0, 0))
+        self.frame_44.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.frame_44.setFrameShadow(QtWidgets.QFrame.Plain)
+        self.frame_44.setObjectName("frame_44")
+        self.horizontalLayout_42 = QtWidgets.QHBoxLayout(self.frame_44)
+        self.horizontalLayout_42.setContentsMargins(0, 0, 0, 0)
+        self.horizontalLayout_42.setSpacing(1)
+        self.horizontalLayout_42.setObjectName("horizontalLayout_42")
+        self.save_plasma = PushButton(self.frame_44)
+        self.save_plasma.setMinimumSize(QtCore.QSize(60, 16))
+        self.save_plasma.setMaximumSize(QtCore.QSize(60, 16))
+        self.save_plasma.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.save_plasma.setObjectName("save_plasma")
+        self.horizontalLayout_42.addWidget(self.save_plasma)
+        self.config_label = QtWidgets.QLabel(self.frame_44)
         self.config_label.setMinimumSize(QtCore.QSize(0, 16))
         self.config_label.setMaximumSize(QtCore.QSize(16777215, 16))
         self.config_label.setAlignment(QtCore.Qt.AlignCenter)
         self.config_label.setObjectName("config_label")
-        self.verticalLayout_48.addWidget(self.config_label)
+        self.horizontalLayout_42.addWidget(self.config_label)
+        self.reload_plasma = PushButton(self.frame_44)
+        self.reload_plasma.setMinimumSize(QtCore.QSize(60, 16))
+        self.reload_plasma.setMaximumSize(QtCore.QSize(60, 16))
+        self.reload_plasma.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.reload_plasma.setObjectName("reload_plasma")
+        self.horizontalLayout_42.addWidget(self.reload_plasma)
+        self.verticalLayout_48.addWidget(self.frame_44)
         self.frame_33 = QtWidgets.QFrame(self.config_frame)
         self.frame_33.setFrameShape(QtWidgets.QFrame.NoFrame)
         self.frame_33.setFrameShadow(QtWidgets.QFrame.Plain)
         self.frame_33.setObjectName("frame_33")
         self.horizontalLayout_17 = QtWidgets.QHBoxLayout(self.frame_33)
-        self.horizontalLayout_17.setContentsMargins(4, 0, 4, 4)
+        self.horizontalLayout_17.setContentsMargins(4, 0, 4, 0)
         self.horizontalLayout_17.setSpacing(4)
         self.horizontalLayout_17.setObjectName("horizontalLayout_17")
         self.frame_12 = QtWidgets.QFrame(self.frame_33)
@@ -3104,7 +3441,7 @@ def setupUi(self, MainWindow):
         self.gridLayout_4 = QtWidgets.QGridLayout(self.arc_grid)
         self.gridLayout_4.setContentsMargins(4, 0, 4, 0)
         self.gridLayout_4.setHorizontalSpacing(4)
-        self.gridLayout_4.setVerticalSpacing(8)
+        self.gridLayout_4.setVerticalSpacing(7)
         self.gridLayout_4.setObjectName("gridLayout_4")
         self.arc_fail_delay = DoubleScale(self.arc_grid)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
@@ -3131,7 +3468,7 @@ def setupUi(self, MainWindow):
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.label_19.sizePolicy().hasHeightForWidth())
         self.label_19.setSizePolicy(sizePolicy)
-        self.label_19.setMinimumSize(QtCore.QSize(110, 0))
+        self.label_19.setMinimumSize(QtCore.QSize(116, 0))
         self.label_19.setMaximumSize(QtCore.QSize(150, 16777215))
         self.label_19.setObjectName("label_19")
         self.gridLayout_4.addWidget(self.label_19, 0, 1, 1, 1)
@@ -3356,26 +3693,18 @@ def setupUi(self, MainWindow):
         self.gridLayout_18 = QtWidgets.QGridLayout(self.thc_grid)
         self.gridLayout_18.setContentsMargins(4, 0, 4, 0)
         self.gridLayout_18.setHorizontalSpacing(4)
-        self.gridLayout_18.setVerticalSpacing(8)
+        self.gridLayout_18.setVerticalSpacing(7)
         self.gridLayout_18.setObjectName("gridLayout_18")
-        self.thc_delay = DoubleScale(self.thc_grid)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
+        self.thc_sample_threshold_lbl = QtWidgets.QLabel(self.thc_grid)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.thc_delay.sizePolicy().hasHeightForWidth())
-        self.thc_delay.setSizePolicy(sizePolicy)
-        self.thc_delay.setMinimumSize(QtCore.QSize(136, 0))
-        self.thc_delay.setMaximumSize(QtCore.QSize(176, 16777215))
-        self.thc_delay.setWrapping(True)
-        self.thc_delay.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.thc_delay.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus)
-        self.thc_delay.setAccelerated(True)
-        self.thc_delay.setDecimals(1)
-        self.thc_delay.setMaximum(9.0)
-        self.thc_delay.setSingleStep(0.1)
-        self.thc_delay.setProperty("value", 0.0)
-        self.thc_delay.setObjectName("thc_delay")
-        self.gridLayout_18.addWidget(self.thc_delay, 0, 0, 1, 1)
+        sizePolicy.setHeightForWidth(self.thc_sample_threshold_lbl.sizePolicy().hasHeightForWidth())
+        self.thc_sample_threshold_lbl.setSizePolicy(sizePolicy)
+        self.thc_sample_threshold_lbl.setMinimumSize(QtCore.QSize(110, 0))
+        self.thc_sample_threshold_lbl.setMaximumSize(QtCore.QSize(150, 16777215))
+        self.thc_sample_threshold_lbl.setObjectName("thc_sample_threshold_lbl")
+        self.gridLayout_18.addWidget(self.thc_sample_threshold_lbl, 4, 1, 1, 1)
         self.thc_delay_lbl = QtWidgets.QLabel(self.thc_grid)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
@@ -3385,7 +3714,24 @@ def setupUi(self, MainWindow):
         self.thc_delay_lbl.setMinimumSize(QtCore.QSize(110, 0))
         self.thc_delay_lbl.setMaximumSize(QtCore.QSize(150, 16777215))
         self.thc_delay_lbl.setObjectName("thc_delay_lbl")
-        self.gridLayout_18.addWidget(self.thc_delay_lbl, 0, 1, 1, 1)
+        self.gridLayout_18.addWidget(self.thc_delay_lbl, 2, 1, 1, 1)
+        self.pid_d_gain = DoubleScale(self.thc_grid)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.pid_d_gain.sizePolicy().hasHeightForWidth())
+        self.pid_d_gain.setSizePolicy(sizePolicy)
+        self.pid_d_gain.setMinimumSize(QtCore.QSize(136, 0))
+        self.pid_d_gain.setMaximumSize(QtCore.QSize(176, 16777215))
+        self.pid_d_gain.setWrapping(True)
+        self.pid_d_gain.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.pid_d_gain.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus)
+        self.pid_d_gain.setAccelerated(True)
+        self.pid_d_gain.setDecimals(0)
+        self.pid_d_gain.setMaximum(1000.0)
+        self.pid_d_gain.setProperty("value", 0.0)
+        self.pid_d_gain.setObjectName("pid_d_gain")
+        self.gridLayout_18.addWidget(self.pid_d_gain, 10, 0, 1, 1)
         self.thc_threshold = DoubleScale(self.thc_grid)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
@@ -3404,44 +3750,63 @@ def setupUi(self, MainWindow):
         self.thc_threshold.setSingleStep(0.01)
         self.thc_threshold.setProperty("value", 0.05)
         self.thc_threshold.setObjectName("thc_threshold")
-        self.gridLayout_18.addWidget(self.thc_threshold, 1, 0, 1, 1)
-        self.thc_threshold_lbl = QtWidgets.QLabel(self.thc_grid)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
+        self.gridLayout_18.addWidget(self.thc_threshold, 5, 0, 1, 1)
+        self.voidlock_slope = DoubleScale(self.thc_grid)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.thc_threshold_lbl.sizePolicy().hasHeightForWidth())
-        self.thc_threshold_lbl.setSizePolicy(sizePolicy)
-        self.thc_threshold_lbl.setMinimumSize(QtCore.QSize(110, 0))
-        self.thc_threshold_lbl.setMaximumSize(QtCore.QSize(150, 16777215))
-        self.thc_threshold_lbl.setObjectName("thc_threshold_lbl")
-        self.gridLayout_18.addWidget(self.thc_threshold_lbl, 1, 1, 1, 1)
-        self.pid_p_gain = DoubleScale(self.thc_grid)
+        sizePolicy.setHeightForWidth(self.voidlock_slope.sizePolicy().hasHeightForWidth())
+        self.voidlock_slope.setSizePolicy(sizePolicy)
+        self.voidlock_slope.setMinimumSize(QtCore.QSize(136, 0))
+        self.voidlock_slope.setMaximumSize(QtCore.QSize(176, 16777215))
+        self.voidlock_slope.setWrapping(True)
+        self.voidlock_slope.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.voidlock_slope.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus)
+        self.voidlock_slope.setAccelerated(True)
+        self.voidlock_slope.setSuffix(" V/sec")
+        self.voidlock_slope.setDecimals(0)
+        self.voidlock_slope.setMinimum(1.0)
+        self.voidlock_slope.setMaximum(10000.0)
+        self.voidlock_slope.setObjectName("voidlock_slope")
+        self.gridLayout_18.addWidget(self.voidlock_slope, 8, 0, 1, 1)
+        self.thc_sample_counts = DoubleScale(self.thc_grid)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.pid_p_gain.sizePolicy().hasHeightForWidth())
-        self.pid_p_gain.setSizePolicy(sizePolicy)
-        self.pid_p_gain.setMinimumSize(QtCore.QSize(136, 0))
-        self.pid_p_gain.setMaximumSize(QtCore.QSize(176, 16777215))
-        self.pid_p_gain.setWrapping(True)
-        self.pid_p_gain.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.pid_p_gain.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus)
-        self.pid_p_gain.setAccelerated(True)
-        self.pid_p_gain.setDecimals(0)
-        self.pid_p_gain.setMaximum(1000.0)
-        self.pid_p_gain.setProperty("value", 0.0)
-        self.pid_p_gain.setObjectName("pid_p_gain")
-        self.gridLayout_18.addWidget(self.pid_p_gain, 2, 0, 1, 1)
-        self.pid_p_gain_lbl = QtWidgets.QLabel(self.thc_grid)
+        sizePolicy.setHeightForWidth(self.thc_sample_counts.sizePolicy().hasHeightForWidth())
+        self.thc_sample_counts.setSizePolicy(sizePolicy)
+        self.thc_sample_counts.setMinimumSize(QtCore.QSize(136, 0))
+        self.thc_sample_counts.setMaximumSize(QtCore.QSize(176, 16777215))
+        self.thc_sample_counts.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.thc_sample_counts.setDecimals(0)
+        self.thc_sample_counts.setMaximum(1000.0)
+        self.thc_sample_counts.setProperty("value", 50.0)
+        self.thc_sample_counts.setObjectName("thc_sample_counts")
+        self.gridLayout_18.addWidget(self.thc_sample_counts, 3, 0, 1, 1)
+        self.pid_d_gain_lbl = QtWidgets.QLabel(self.thc_grid)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.pid_p_gain_lbl.sizePolicy().hasHeightForWidth())
-        self.pid_p_gain_lbl.setSizePolicy(sizePolicy)
-        self.pid_p_gain_lbl.setMinimumSize(QtCore.QSize(110, 0))
-        self.pid_p_gain_lbl.setMaximumSize(QtCore.QSize(150, 16777215))
-        self.pid_p_gain_lbl.setObjectName("pid_p_gain_lbl")
-        self.gridLayout_18.addWidget(self.pid_p_gain_lbl, 2, 1, 1, 1)
+        sizePolicy.setHeightForWidth(self.pid_d_gain_lbl.sizePolicy().hasHeightForWidth())
+        self.pid_d_gain_lbl.setSizePolicy(sizePolicy)
+        self.pid_d_gain_lbl.setMinimumSize(QtCore.QSize(110, 0))
+        self.pid_d_gain_lbl.setMaximumSize(QtCore.QSize(150, 16777215))
+        self.pid_d_gain_lbl.setObjectName("pid_d_gain_lbl")
+        self.gridLayout_18.addWidget(self.pid_d_gain_lbl, 10, 1, 1, 1)
+        self.thc_sample_threshold = DoubleScale(self.thc_grid)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.thc_sample_threshold.sizePolicy().hasHeightForWidth())
+        self.thc_sample_threshold.setSizePolicy(sizePolicy)
+        self.thc_sample_threshold.setMinimumSize(QtCore.QSize(136, 0))
+        self.thc_sample_threshold.setMaximumSize(QtCore.QSize(176, 16777215))
+        self.thc_sample_threshold.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.thc_sample_threshold.setAccelerated(True)
+        self.thc_sample_threshold.setMaximum(99.0)
+        self.thc_sample_threshold.setSingleStep(0.01)
+        self.thc_sample_threshold.setObjectName("thc_sample_threshold")
+        self.gridLayout_18.addWidget(self.thc_sample_threshold, 4, 0, 1, 1)
         self.cornerlock_threshold = DoubleScale(self.thc_grid)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
@@ -3460,45 +3825,94 @@ def setupUi(self, MainWindow):
         self.cornerlock_threshold.setMaximum(99.0)
         self.cornerlock_threshold.setProperty("value", 1.0)
         self.cornerlock_threshold.setObjectName("cornerlock_threshold")
-        self.gridLayout_18.addWidget(self.cornerlock_threshold, 3, 0, 1, 1)
+        self.gridLayout_18.addWidget(self.cornerlock_threshold, 7, 0, 1, 1)
+        self.thc_auto_lbl = QtWidgets.QLabel(self.thc_grid)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.thc_auto_lbl.sizePolicy().hasHeightForWidth())
+        self.thc_auto_lbl.setSizePolicy(sizePolicy)
+        self.thc_auto_lbl.setMinimumSize(QtCore.QSize(110, 0))
+        self.thc_auto_lbl.setMaximumSize(QtCore.QSize(150, 16777215))
+        self.thc_auto_lbl.setObjectName("thc_auto_lbl")
+        self.gridLayout_18.addWidget(self.thc_auto_lbl, 1, 1, 1, 1)
+        self.pid_p_gain_lbl = QtWidgets.QLabel(self.thc_grid)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.pid_p_gain_lbl.sizePolicy().hasHeightForWidth())
+        self.pid_p_gain_lbl.setSizePolicy(sizePolicy)
+        self.pid_p_gain_lbl.setMinimumSize(QtCore.QSize(116, 0))
+        self.pid_p_gain_lbl.setMaximumSize(QtCore.QSize(150, 16777215))
+        self.pid_p_gain_lbl.setObjectName("pid_p_gain_lbl")
+        self.gridLayout_18.addWidget(self.pid_p_gain_lbl, 6, 1, 1, 1)
         self.label_41 = QtWidgets.QLabel(self.thc_grid)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.label_41.sizePolicy().hasHeightForWidth())
-        self.label_41.setSizePolicy(sizePolicy)
-        self.label_41.setMinimumSize(QtCore.QSize(110, 0))
-        self.label_41.setMaximumSize(QtCore.QSize(150, 16777215))
-        self.label_41.setObjectName("label_41")
-        self.gridLayout_18.addWidget(self.label_41, 3, 1, 1, 1)
-        self.kerfcross_override = DoubleScale(self.thc_grid)
+        sizePolicy.setHeightForWidth(self.label_41.sizePolicy().hasHeightForWidth())
+        self.label_41.setSizePolicy(sizePolicy)
+        self.label_41.setMinimumSize(QtCore.QSize(110, 0))
+        self.label_41.setMaximumSize(QtCore.QSize(150, 16777215))
+        self.label_41.setObjectName("label_41")
+        self.gridLayout_18.addWidget(self.label_41, 7, 1, 1, 1)
+        self.thc_threshold_lbl = QtWidgets.QLabel(self.thc_grid)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.thc_threshold_lbl.sizePolicy().hasHeightForWidth())
+        self.thc_threshold_lbl.setSizePolicy(sizePolicy)
+        self.thc_threshold_lbl.setMinimumSize(QtCore.QSize(110, 0))
+        self.thc_threshold_lbl.setMaximumSize(QtCore.QSize(150, 16777215))
+        self.thc_threshold_lbl.setObjectName("thc_threshold_lbl")
+        self.gridLayout_18.addWidget(self.thc_threshold_lbl, 5, 1, 1, 1)
+        self.voidlock_slope_lbl = QtWidgets.QLabel(self.thc_grid)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.voidlock_slope_lbl.sizePolicy().hasHeightForWidth())
+        self.voidlock_slope_lbl.setSizePolicy(sizePolicy)
+        self.voidlock_slope_lbl.setMinimumSize(QtCore.QSize(110, 0))
+        self.voidlock_slope_lbl.setMaximumSize(QtCore.QSize(150, 16777215))
+        self.voidlock_slope_lbl.setObjectName("voidlock_slope_lbl")
+        self.gridLayout_18.addWidget(self.voidlock_slope_lbl, 8, 1, 1, 1)
+        self.pid_p_gain = DoubleScale(self.thc_grid)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.kerfcross_override.sizePolicy().hasHeightForWidth())
-        self.kerfcross_override.setSizePolicy(sizePolicy)
-        self.kerfcross_override.setMinimumSize(QtCore.QSize(136, 0))
-        self.kerfcross_override.setMaximumSize(QtCore.QSize(176, 16777215))
-        self.kerfcross_override.setWrapping(True)
-        self.kerfcross_override.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.kerfcross_override.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus)
-        self.kerfcross_override.setAccelerated(True)
-        self.kerfcross_override.setSuffix(" %")
-        self.kerfcross_override.setDecimals(0)
-        self.kerfcross_override.setMinimum(1.0)
-        self.kerfcross_override.setMaximum(1000.0)
-        self.kerfcross_override.setObjectName("kerfcross_override")
-        self.gridLayout_18.addWidget(self.kerfcross_override, 4, 0, 1, 1)
-        self.kerfcross_override_lbl = QtWidgets.QLabel(self.thc_grid)
+        sizePolicy.setHeightForWidth(self.pid_p_gain.sizePolicy().hasHeightForWidth())
+        self.pid_p_gain.setSizePolicy(sizePolicy)
+        self.pid_p_gain.setMinimumSize(QtCore.QSize(136, 0))
+        self.pid_p_gain.setMaximumSize(QtCore.QSize(176, 16777215))
+        self.pid_p_gain.setWrapping(True)
+        self.pid_p_gain.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.pid_p_gain.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus)
+        self.pid_p_gain.setAccelerated(True)
+        self.pid_p_gain.setDecimals(0)
+        self.pid_p_gain.setMaximum(1000.0)
+        self.pid_p_gain.setProperty("value", 0.0)
+        self.pid_p_gain.setObjectName("pid_p_gain")
+        self.gridLayout_18.addWidget(self.pid_p_gain, 6, 0, 1, 1)
+        self.pid_i_gain_lbl = QtWidgets.QLabel(self.thc_grid)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.pid_i_gain_lbl.sizePolicy().hasHeightForWidth())
+        self.pid_i_gain_lbl.setSizePolicy(sizePolicy)
+        self.pid_i_gain_lbl.setMinimumSize(QtCore.QSize(110, 0))
+        self.pid_i_gain_lbl.setMaximumSize(QtCore.QSize(150, 16777215))
+        self.pid_i_gain_lbl.setObjectName("pid_i_gain_lbl")
+        self.gridLayout_18.addWidget(self.pid_i_gain_lbl, 9, 1, 1, 1)
+        self.thc_sample_counts_lbl = QtWidgets.QLabel(self.thc_grid)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.kerfcross_override_lbl.sizePolicy().hasHeightForWidth())
-        self.kerfcross_override_lbl.setSizePolicy(sizePolicy)
-        self.kerfcross_override_lbl.setMinimumSize(QtCore.QSize(110, 0))
-        self.kerfcross_override_lbl.setMaximumSize(QtCore.QSize(150, 16777215))
-        self.kerfcross_override_lbl.setObjectName("kerfcross_override_lbl")
-        self.gridLayout_18.addWidget(self.kerfcross_override_lbl, 4, 1, 1, 1)
+        sizePolicy.setHeightForWidth(self.thc_sample_counts_lbl.sizePolicy().hasHeightForWidth())
+        self.thc_sample_counts_lbl.setSizePolicy(sizePolicy)
+        self.thc_sample_counts_lbl.setMinimumSize(QtCore.QSize(110, 0))
+        self.thc_sample_counts_lbl.setMaximumSize(QtCore.QSize(150, 16777215))
+        self.thc_sample_counts_lbl.setObjectName("thc_sample_counts_lbl")
+        self.gridLayout_18.addWidget(self.thc_sample_counts_lbl, 3, 1, 1, 1)
         self.pid_i_gain = DoubleScale(self.thc_grid)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
@@ -3515,48 +3929,34 @@ def setupUi(self, MainWindow):
         self.pid_i_gain.setMaximum(1000.0)
         self.pid_i_gain.setProperty("value", 0.0)
         self.pid_i_gain.setObjectName("pid_i_gain")
-        self.gridLayout_18.addWidget(self.pid_i_gain, 5, 0, 1, 1)
-        self.pid_i_gain_lbl = QtWidgets.QLabel(self.thc_grid)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.pid_i_gain_lbl.sizePolicy().hasHeightForWidth())
-        self.pid_i_gain_lbl.setSizePolicy(sizePolicy)
-        self.pid_i_gain_lbl.setMinimumSize(QtCore.QSize(110, 0))
-        self.pid_i_gain_lbl.setMaximumSize(QtCore.QSize(150, 16777215))
-        self.pid_i_gain_lbl.setObjectName("pid_i_gain_lbl")
-        self.gridLayout_18.addWidget(self.pid_i_gain_lbl, 5, 1, 1, 1)
-        self.pid_d_gain = DoubleScale(self.thc_grid)
+        self.gridLayout_18.addWidget(self.pid_i_gain, 9, 0, 1, 1)
+        self.thc_delay = DoubleScale(self.thc_grid)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.pid_d_gain.sizePolicy().hasHeightForWidth())
-        self.pid_d_gain.setSizePolicy(sizePolicy)
-        self.pid_d_gain.setMinimumSize(QtCore.QSize(136, 0))
-        self.pid_d_gain.setMaximumSize(QtCore.QSize(176, 16777215))
-        self.pid_d_gain.setWrapping(True)
-        self.pid_d_gain.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.pid_d_gain.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus)
-        self.pid_d_gain.setAccelerated(True)
-        self.pid_d_gain.setDecimals(0)
-        self.pid_d_gain.setMaximum(1000.0)
-        self.pid_d_gain.setProperty("value", 0.0)
-        self.pid_d_gain.setObjectName("pid_d_gain")
-        self.gridLayout_18.addWidget(self.pid_d_gain, 6, 0, 1, 1)
-        self.pid_d_gain_lbl = QtWidgets.QLabel(self.thc_grid)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.pid_d_gain_lbl.sizePolicy().hasHeightForWidth())
-        self.pid_d_gain_lbl.setSizePolicy(sizePolicy)
-        self.pid_d_gain_lbl.setMinimumSize(QtCore.QSize(110, 0))
-        self.pid_d_gain_lbl.setMaximumSize(QtCore.QSize(150, 16777215))
-        self.pid_d_gain_lbl.setObjectName("pid_d_gain_lbl")
-        self.gridLayout_18.addWidget(self.pid_d_gain_lbl, 6, 1, 1, 1)
+        sizePolicy.setHeightForWidth(self.thc_delay.sizePolicy().hasHeightForWidth())
+        self.thc_delay.setSizePolicy(sizePolicy)
+        self.thc_delay.setMinimumSize(QtCore.QSize(136, 0))
+        self.thc_delay.setMaximumSize(QtCore.QSize(176, 16777215))
+        self.thc_delay.setWrapping(True)
+        self.thc_delay.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.thc_delay.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus)
+        self.thc_delay.setAccelerated(True)
+        self.thc_delay.setDecimals(2)
+        self.thc_delay.setMaximum(9.0)
+        self.thc_delay.setSingleStep(0.01)
+        self.thc_delay.setProperty("value", 0.0)
+        self.thc_delay.setObjectName("thc_delay")
+        self.gridLayout_18.addWidget(self.thc_delay, 2, 0, 1, 1)
+        self.thc_auto = CheckBox(self.thc_grid)
+        self.thc_auto.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.thc_auto.setLayoutDirection(QtCore.Qt.RightToLeft)
+        self.thc_auto.setObjectName("thc_auto")
+        self.gridLayout_18.addWidget(self.thc_auto, 1, 0, 1, 1)
         self.verticalLayout_29.addWidget(self.thc_grid)
         self.verticalLayout_46.addWidget(self.thc_config)
-        spacerItem22 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout_46.addItem(spacerItem22)
+        spacerItem23 = QtWidgets.QSpacerItem(20, 5, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout_46.addItem(spacerItem23)
         self.horizontalLayout_17.addWidget(self.frame_12)
         self.frame_32 = QtWidgets.QFrame(self.frame_33)
         self.frame_32.setFrameShape(QtWidgets.QFrame.NoFrame)
@@ -3587,8 +3987,81 @@ def setupUi(self, MainWindow):
         self.gridLayout_19 = QtWidgets.QGridLayout(self.probe_grid)
         self.gridLayout_19.setContentsMargins(4, 0, 4, 0)
         self.gridLayout_19.setHorizontalSpacing(4)
-        self.gridLayout_19.setVerticalSpacing(8)
+        self.gridLayout_19.setVerticalSpacing(7)
         self.gridLayout_19.setObjectName("gridLayout_19")
+        self.skip_ihs_distance = DoubleScale(self.probe_grid)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.skip_ihs_distance.sizePolicy().hasHeightForWidth())
+        self.skip_ihs_distance.setSizePolicy(sizePolicy)
+        self.skip_ihs_distance.setMinimumSize(QtCore.QSize(120, 0))
+        self.skip_ihs_distance.setMaximumSize(QtCore.QSize(160, 16777215))
+        self.skip_ihs_distance.setWrapping(True)
+        self.skip_ihs_distance.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.skip_ihs_distance.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus)
+        self.skip_ihs_distance.setAccelerated(True)
+        self.skip_ihs_distance.setDecimals(0)
+        self.skip_ihs_distance.setMaximum(999.0)
+        self.skip_ihs_distance.setProperty("value", 0.0)
+        self.skip_ihs_distance.setObjectName("skip_ihs_distance")
+        self.gridLayout_19.addWidget(self.skip_ihs_distance, 5, 0, 1, 1)
+        self.probe_feed_rate = DoubleScale(self.probe_grid)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.probe_feed_rate.sizePolicy().hasHeightForWidth())
+        self.probe_feed_rate.setSizePolicy(sizePolicy)
+        self.probe_feed_rate.setMinimumSize(QtCore.QSize(120, 0))
+        self.probe_feed_rate.setMaximumSize(QtCore.QSize(160, 16777215))
+        self.probe_feed_rate.setWrapping(True)
+        self.probe_feed_rate.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.probe_feed_rate.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus)
+        self.probe_feed_rate.setAccelerated(True)
+        self.probe_feed_rate.setDecimals(0)
+        self.probe_feed_rate.setMinimum(100.0)
+        self.probe_feed_rate.setMaximum(100.0)
+        self.probe_feed_rate.setObjectName("probe_feed_rate")
+        self.gridLayout_19.addWidget(self.probe_feed_rate, 1, 0, 1, 1)
+        self.ohmic_probe_offset = DoubleScale(self.probe_grid)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.ohmic_probe_offset.sizePolicy().hasHeightForWidth())
+        self.ohmic_probe_offset.setSizePolicy(sizePolicy)
+        self.ohmic_probe_offset.setMinimumSize(QtCore.QSize(120, 0))
+        self.ohmic_probe_offset.setMaximumSize(QtCore.QSize(160, 16777215))
+        self.ohmic_probe_offset.setWrapping(True)
+        self.ohmic_probe_offset.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.ohmic_probe_offset.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus)
+        self.ohmic_probe_offset.setAccelerated(True)
+        self.ohmic_probe_offset.setDecimals(2)
+        self.ohmic_probe_offset.setMinimum(-25.0)
+        self.ohmic_probe_offset.setMaximum(25.0)
+        self.ohmic_probe_offset.setSingleStep(0.01)
+        self.ohmic_probe_offset.setProperty("value", 0.0)
+        self.ohmic_probe_offset.setObjectName("ohmic_probe_offset")
+        self.gridLayout_19.addWidget(self.ohmic_probe_offset, 3, 0, 1, 1)
+        self.label_16 = QtWidgets.QLabel(self.probe_grid)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.label_16.sizePolicy().hasHeightForWidth())
+        self.label_16.setSizePolicy(sizePolicy)
+        self.label_16.setMinimumSize(QtCore.QSize(90, 0))
+        self.label_16.setMaximumSize(QtCore.QSize(130, 16777215))
+        self.label_16.setObjectName("label_16")
+        self.gridLayout_19.addWidget(self.label_16, 3, 1, 1, 1)
+        self.label_17 = QtWidgets.QLabel(self.probe_grid)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.label_17.sizePolicy().hasHeightForWidth())
+        self.label_17.setSizePolicy(sizePolicy)
+        self.label_17.setMinimumSize(QtCore.QSize(90, 0))
+        self.label_17.setMaximumSize(QtCore.QSize(130, 16777215))
+        self.label_17.setObjectName("label_17")
+        self.gridLayout_19.addWidget(self.label_17, 4, 1, 1, 1)
         self.float_switch_travel = DoubleScale(self.probe_grid)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
@@ -3619,33 +4092,6 @@ def setupUi(self, MainWindow):
         self.label_2.setMaximumSize(QtCore.QSize(130, 16777215))
         self.label_2.setObjectName("label_2")
         self.gridLayout_19.addWidget(self.label_2, 0, 1, 1, 1)
-        self.probe_feed_rate = DoubleScale(self.probe_grid)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.probe_feed_rate.sizePolicy().hasHeightForWidth())
-        self.probe_feed_rate.setSizePolicy(sizePolicy)
-        self.probe_feed_rate.setMinimumSize(QtCore.QSize(120, 0))
-        self.probe_feed_rate.setMaximumSize(QtCore.QSize(160, 16777215))
-        self.probe_feed_rate.setWrapping(True)
-        self.probe_feed_rate.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.probe_feed_rate.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus)
-        self.probe_feed_rate.setAccelerated(True)
-        self.probe_feed_rate.setDecimals(0)
-        self.probe_feed_rate.setMinimum(100.0)
-        self.probe_feed_rate.setMaximum(100.0)
-        self.probe_feed_rate.setObjectName("probe_feed_rate")
-        self.gridLayout_19.addWidget(self.probe_feed_rate, 1, 0, 1, 1)
-        self.label_14 = QtWidgets.QLabel(self.probe_grid)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.label_14.sizePolicy().hasHeightForWidth())
-        self.label_14.setSizePolicy(sizePolicy)
-        self.label_14.setMinimumSize(QtCore.QSize(90, 0))
-        self.label_14.setMaximumSize(QtCore.QSize(130, 16777215))
-        self.label_14.setObjectName("label_14")
-        self.gridLayout_19.addWidget(self.label_14, 1, 1, 1, 1)
         self.probe_start_height = DoubleScale(self.probe_grid)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
@@ -3673,35 +4119,6 @@ def setupUi(self, MainWindow):
         self.label_15.setMaximumSize(QtCore.QSize(130, 16777215))
         self.label_15.setObjectName("label_15")
         self.gridLayout_19.addWidget(self.label_15, 2, 1, 1, 1)
-        self.ohmic_probe_offset = DoubleScale(self.probe_grid)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.ohmic_probe_offset.sizePolicy().hasHeightForWidth())
-        self.ohmic_probe_offset.setSizePolicy(sizePolicy)
-        self.ohmic_probe_offset.setMinimumSize(QtCore.QSize(120, 0))
-        self.ohmic_probe_offset.setMaximumSize(QtCore.QSize(160, 16777215))
-        self.ohmic_probe_offset.setWrapping(True)
-        self.ohmic_probe_offset.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.ohmic_probe_offset.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus)
-        self.ohmic_probe_offset.setAccelerated(True)
-        self.ohmic_probe_offset.setDecimals(2)
-        self.ohmic_probe_offset.setMinimum(-25.0)
-        self.ohmic_probe_offset.setMaximum(25.0)
-        self.ohmic_probe_offset.setSingleStep(0.01)
-        self.ohmic_probe_offset.setProperty("value", 0.0)
-        self.ohmic_probe_offset.setObjectName("ohmic_probe_offset")
-        self.gridLayout_19.addWidget(self.ohmic_probe_offset, 3, 0, 1, 1)
-        self.label_16 = QtWidgets.QLabel(self.probe_grid)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.label_16.sizePolicy().hasHeightForWidth())
-        self.label_16.setSizePolicy(sizePolicy)
-        self.label_16.setMinimumSize(QtCore.QSize(90, 0))
-        self.label_16.setMaximumSize(QtCore.QSize(130, 16777215))
-        self.label_16.setObjectName("label_16")
-        self.gridLayout_19.addWidget(self.label_16, 3, 1, 1, 1)
         self.ohmic_max_attempts = DoubleScale(self.probe_grid)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
@@ -3719,33 +4136,16 @@ def setupUi(self, MainWindow):
         self.ohmic_max_attempts.setProperty("value", 0.0)
         self.ohmic_max_attempts.setObjectName("ohmic_max_attempts")
         self.gridLayout_19.addWidget(self.ohmic_max_attempts, 4, 0, 1, 1)
-        self.label_17 = QtWidgets.QLabel(self.probe_grid)
+        self.label_14 = QtWidgets.QLabel(self.probe_grid)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.label_17.sizePolicy().hasHeightForWidth())
-        self.label_17.setSizePolicy(sizePolicy)
-        self.label_17.setMinimumSize(QtCore.QSize(90, 0))
-        self.label_17.setMaximumSize(QtCore.QSize(130, 16777215))
-        self.label_17.setObjectName("label_17")
-        self.gridLayout_19.addWidget(self.label_17, 4, 1, 1, 1)
-        self.skip_ihs_distance = DoubleScale(self.probe_grid)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.skip_ihs_distance.sizePolicy().hasHeightForWidth())
-        self.skip_ihs_distance.setSizePolicy(sizePolicy)
-        self.skip_ihs_distance.setMinimumSize(QtCore.QSize(120, 0))
-        self.skip_ihs_distance.setMaximumSize(QtCore.QSize(160, 16777215))
-        self.skip_ihs_distance.setWrapping(True)
-        self.skip_ihs_distance.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.skip_ihs_distance.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus)
-        self.skip_ihs_distance.setAccelerated(True)
-        self.skip_ihs_distance.setDecimals(0)
-        self.skip_ihs_distance.setMaximum(999.0)
-        self.skip_ihs_distance.setProperty("value", 0.0)
-        self.skip_ihs_distance.setObjectName("skip_ihs_distance")
-        self.gridLayout_19.addWidget(self.skip_ihs_distance, 5, 0, 1, 1)
+        sizePolicy.setHeightForWidth(self.label_14.sizePolicy().hasHeightForWidth())
+        self.label_14.setSizePolicy(sizePolicy)
+        self.label_14.setMinimumSize(QtCore.QSize(90, 0))
+        self.label_14.setMaximumSize(QtCore.QSize(130, 16777215))
+        self.label_14.setObjectName("label_14")
+        self.gridLayout_19.addWidget(self.label_14, 1, 1, 1, 1)
         self.label_18 = QtWidgets.QLabel(self.probe_grid)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
@@ -3756,6 +4156,32 @@ def setupUi(self, MainWindow):
         self.label_18.setMaximumSize(QtCore.QSize(130, 16777215))
         self.label_18.setObjectName("label_18")
         self.gridLayout_19.addWidget(self.label_18, 5, 1, 1, 1)
+        self.offset_feed_rate = DoubleScale(self.probe_grid)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.offset_feed_rate.sizePolicy().hasHeightForWidth())
+        self.offset_feed_rate.setSizePolicy(sizePolicy)
+        self.offset_feed_rate.setMinimumSize(QtCore.QSize(120, 0))
+        self.offset_feed_rate.setMaximumSize(QtCore.QSize(160, 16777215))
+        self.offset_feed_rate.setWrapping(True)
+        self.offset_feed_rate.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.offset_feed_rate.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus)
+        self.offset_feed_rate.setAccelerated(True)
+        self.offset_feed_rate.setDecimals(0)
+        self.offset_feed_rate.setMinimum(100.0)
+        self.offset_feed_rate.setObjectName("offset_feed_rate")
+        self.gridLayout_19.addWidget(self.offset_feed_rate, 6, 0, 1, 1)
+        self.offset_feed_rate_lbl = QtWidgets.QLabel(self.probe_grid)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.offset_feed_rate_lbl.sizePolicy().hasHeightForWidth())
+        self.offset_feed_rate_lbl.setSizePolicy(sizePolicy)
+        self.offset_feed_rate_lbl.setMinimumSize(QtCore.QSize(90, 0))
+        self.offset_feed_rate_lbl.setMaximumSize(QtCore.QSize(130, 16777215))
+        self.offset_feed_rate_lbl.setObjectName("offset_feed_rate_lbl")
+        self.gridLayout_19.addWidget(self.offset_feed_rate_lbl, 6, 1, 1, 1)
         self.verticalLayout_39.addWidget(self.probe_grid)
         self.verticalLayout_45.addWidget(self.probe_config)
         self.safety_config = QtWidgets.QFrame(self.frame_32)
@@ -3779,7 +4205,7 @@ def setupUi(self, MainWindow):
         self.gridLayout_23 = QtWidgets.QGridLayout(self.safety_grid)
         self.gridLayout_23.setContentsMargins(4, 0, 4, 0)
         self.gridLayout_23.setHorizontalSpacing(4)
-        self.gridLayout_23.setVerticalSpacing(8)
+        self.gridLayout_23.setVerticalSpacing(7)
         self.gridLayout_23.setObjectName("gridLayout_23")
         self.safe_height = DoubleScale(self.safety_grid)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
@@ -3831,7 +4257,7 @@ def setupUi(self, MainWindow):
         self.gridLayout_20 = QtWidgets.QGridLayout(self.scribe_grid)
         self.gridLayout_20.setContentsMargins(4, 0, 4, 0)
         self.gridLayout_20.setHorizontalSpacing(4)
-        self.gridLayout_20.setVerticalSpacing(8)
+        self.gridLayout_20.setVerticalSpacing(7)
         self.gridLayout_20.setObjectName("gridLayout_20")
         self.scribe_arm_delay = DoubleScale(self.scribe_grid)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
@@ -3912,7 +4338,7 @@ def setupUi(self, MainWindow):
         self.gridLayout_21 = QtWidgets.QGridLayout(self.spotting_grid)
         self.gridLayout_21.setContentsMargins(4, 0, 4, 0)
         self.gridLayout_21.setHorizontalSpacing(4)
-        self.gridLayout_21.setVerticalSpacing(8)
+        self.gridLayout_21.setVerticalSpacing(7)
         self.gridLayout_21.setObjectName("gridLayout_21")
         self.spotting_threshold = DoubleScale(self.spotting_grid)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
@@ -3972,6 +4398,89 @@ def setupUi(self, MainWindow):
         self.gridLayout_21.addWidget(self.label_60, 1, 1, 1, 1)
         self.verticalLayout_42.addWidget(self.spotting_grid)
         self.verticalLayout_45.addWidget(self.spotting_config)
+        self.pierce_config = QtWidgets.QFrame(self.frame_32)
+        self.pierce_config.setMinimumSize(QtCore.QSize(0, 0))
+        self.pierce_config.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.pierce_config.setFrameShadow(QtWidgets.QFrame.Raised)
+        self.pierce_config.setObjectName("pierce_config")
+        self.verticalLayout_62 = QtWidgets.QVBoxLayout(self.pierce_config)
+        self.verticalLayout_62.setContentsMargins(0, 0, 0, 4)
+        self.verticalLayout_62.setSpacing(4)
+        self.verticalLayout_62.setObjectName("verticalLayout_62")
+        self.pierce_conf_lbl = QtWidgets.QLabel(self.pierce_config)
+        self.pierce_conf_lbl.setMinimumSize(QtCore.QSize(0, 16))
+        self.pierce_conf_lbl.setMaximumSize(QtCore.QSize(16777215, 16))
+        self.pierce_conf_lbl.setAlignment(QtCore.Qt.AlignCenter)
+        self.pierce_conf_lbl.setObjectName("pierce_conf_lbl")
+        self.verticalLayout_62.addWidget(self.pierce_conf_lbl)
+        self.pierce_grid = QtWidgets.QFrame(self.pierce_config)
+        self.pierce_grid.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.pierce_grid.setFrameShadow(QtWidgets.QFrame.Raised)
+        self.pierce_grid.setObjectName("pierce_grid")
+        self.gridLayout_16 = QtWidgets.QGridLayout(self.pierce_grid)
+        self.gridLayout_16.setContentsMargins(4, 0, 4, 0)
+        self.gridLayout_16.setHorizontalSpacing(4)
+        self.gridLayout_16.setVerticalSpacing(7)
+        self.gridLayout_16.setObjectName("gridLayout_16")
+        self.x_pierce_offset = DoubleScale(self.pierce_grid)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.x_pierce_offset.sizePolicy().hasHeightForWidth())
+        self.x_pierce_offset.setSizePolicy(sizePolicy)
+        self.x_pierce_offset.setMinimumSize(QtCore.QSize(120, 0))
+        self.x_pierce_offset.setMaximumSize(QtCore.QSize(160, 16777215))
+        self.x_pierce_offset.setWrapping(True)
+        self.x_pierce_offset.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.x_pierce_offset.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus)
+        self.x_pierce_offset.setAccelerated(True)
+        self.x_pierce_offset.setDecimals(1)
+        self.x_pierce_offset.setMinimum(-5.0)
+        self.x_pierce_offset.setMaximum(5.0)
+        self.x_pierce_offset.setSingleStep(0.1)
+        self.x_pierce_offset.setProperty("value", 1.6)
+        self.x_pierce_offset.setObjectName("x_pierce_offset")
+        self.gridLayout_16.addWidget(self.x_pierce_offset, 0, 0, 1, 1)
+        self.label_63 = QtWidgets.QLabel(self.pierce_grid)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.label_63.sizePolicy().hasHeightForWidth())
+        self.label_63.setSizePolicy(sizePolicy)
+        self.label_63.setMinimumSize(QtCore.QSize(90, 0))
+        self.label_63.setMaximumSize(QtCore.QSize(130, 16777215))
+        self.label_63.setObjectName("label_63")
+        self.gridLayout_16.addWidget(self.label_63, 0, 1, 1, 1)
+        self.y_pierce_offset = DoubleScale(self.pierce_grid)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.y_pierce_offset.sizePolicy().hasHeightForWidth())
+        self.y_pierce_offset.setSizePolicy(sizePolicy)
+        self.y_pierce_offset.setMinimumSize(QtCore.QSize(120, 0))
+        self.y_pierce_offset.setMaximumSize(QtCore.QSize(160, 16777215))
+        self.y_pierce_offset.setWrapping(True)
+        self.y_pierce_offset.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.y_pierce_offset.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus)
+        self.y_pierce_offset.setDecimals(1)
+        self.y_pierce_offset.setMinimum(-5.0)
+        self.y_pierce_offset.setMaximum(5.0)
+        self.y_pierce_offset.setSingleStep(0.1)
+        self.y_pierce_offset.setProperty("value", 0.0)
+        self.y_pierce_offset.setObjectName("y_pierce_offset")
+        self.gridLayout_16.addWidget(self.y_pierce_offset, 1, 0, 1, 1)
+        self.label_66 = QtWidgets.QLabel(self.pierce_grid)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.label_66.sizePolicy().hasHeightForWidth())
+        self.label_66.setSizePolicy(sizePolicy)
+        self.label_66.setMinimumSize(QtCore.QSize(90, 0))
+        self.label_66.setMaximumSize(QtCore.QSize(130, 16777215))
+        self.label_66.setObjectName("label_66")
+        self.gridLayout_16.addWidget(self.label_66, 1, 1, 1, 1)
+        self.verticalLayout_62.addWidget(self.pierce_grid)
+        self.verticalLayout_45.addWidget(self.pierce_config)
         self.motion_config = QtWidgets.QFrame(self.frame_32)
         self.motion_config.setFrameShape(QtWidgets.QFrame.NoFrame)
         self.motion_config.setFrameShadow(QtWidgets.QFrame.Raised)
@@ -3981,6 +4490,8 @@ def setupUi(self, MainWindow):
         self.verticalLayout_43.setSpacing(4)
         self.verticalLayout_43.setObjectName("verticalLayout_43")
         self.motion_conf_lbl = QtWidgets.QLabel(self.motion_config)
+        self.motion_conf_lbl.setMinimumSize(QtCore.QSize(0, 16))
+        self.motion_conf_lbl.setMaximumSize(QtCore.QSize(16777215, 16))
         self.motion_conf_lbl.setAlignment(QtCore.Qt.AlignCenter)
         self.motion_conf_lbl.setObjectName("motion_conf_lbl")
         self.verticalLayout_43.addWidget(self.motion_conf_lbl)
@@ -3991,25 +4502,8 @@ def setupUi(self, MainWindow):
         self.gridLayout_22 = QtWidgets.QGridLayout(self.motion_grid)
         self.gridLayout_22.setContentsMargins(4, 0, 4, 0)
         self.gridLayout_22.setHorizontalSpacing(4)
-        self.gridLayout_22.setVerticalSpacing(8)
-        self.gridLayout_22.setObjectName("gridLayout_22")
-        self.max_offset_velocity_in = QtWidgets.QLabel(self.motion_grid)
-        self.max_offset_velocity_in.setMinimumSize(QtCore.QSize(120, 0))
-        self.max_offset_velocity_in.setMaximumSize(QtCore.QSize(120, 16777215))
-        self.max_offset_velocity_in.setText("")
-        self.max_offset_velocity_in.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.max_offset_velocity_in.setObjectName("max_offset_velocity_in")
-        self.gridLayout_22.addWidget(self.max_offset_velocity_in, 0, 0, 1, 1)
-        self.label_62 = QtWidgets.QLabel(self.motion_grid)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.label_62.sizePolicy().hasHeightForWidth())
-        self.label_62.setSizePolicy(sizePolicy)
-        self.label_62.setMinimumSize(QtCore.QSize(90, 0))
-        self.label_62.setMaximumSize(QtCore.QSize(130, 16777215))
-        self.label_62.setObjectName("label_62")
-        self.gridLayout_22.addWidget(self.label_62, 0, 1, 1, 1)
+        self.gridLayout_22.setVerticalSpacing(7)
+        self.gridLayout_22.setObjectName("gridLayout_22")
         self.setup_feed_rate = DoubleScale(self.motion_grid)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
@@ -4027,7 +4521,7 @@ def setupUi(self, MainWindow):
         self.setup_feed_rate.setMaximum(100.0)
         self.setup_feed_rate.setProperty("value", 100.0)
         self.setup_feed_rate.setObjectName("setup_feed_rate")
-        self.gridLayout_22.addWidget(self.setup_feed_rate, 1, 0, 1, 1)
+        self.gridLayout_22.addWidget(self.setup_feed_rate, 0, 0, 1, 1)
         self.label_61 = QtWidgets.QLabel(self.motion_grid)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
@@ -4037,44 +4531,18 @@ def setupUi(self, MainWindow):
         self.label_61.setMinimumSize(QtCore.QSize(90, 0))
         self.label_61.setMaximumSize(QtCore.QSize(130, 16777215))
         self.label_61.setObjectName("label_61")
-        self.gridLayout_22.addWidget(self.label_61, 1, 1, 1, 1)
+        self.gridLayout_22.addWidget(self.label_61, 0, 2, 1, 1)
         self.verticalLayout_43.addWidget(self.motion_grid)
         self.verticalLayout_45.addWidget(self.motion_config)
-        spacerItem23 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout_45.addItem(spacerItem23)
+        spacerItem24 = QtWidgets.QSpacerItem(20, 4, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout_45.addItem(spacerItem24)
         self.horizontalLayout_17.addWidget(self.frame_32)
         self.horizontalLayout_17.setStretch(0, 1)
         self.horizontalLayout_17.setStretch(1, 1)
         self.verticalLayout_48.addWidget(self.frame_33)
-        spacerItem24 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout_48.addItem(spacerItem24)
-        self.config_grid = QtWidgets.QFrame(self.config_frame)
-        self.config_grid.setFrameShape(QtWidgets.QFrame.NoFrame)
-        self.config_grid.setFrameShadow(QtWidgets.QFrame.Raised)
-        self.config_grid.setObjectName("config_grid")
-        self.horizontalLayout_10 = QtWidgets.QHBoxLayout(self.config_grid)
-        self.horizontalLayout_10.setContentsMargins(4, 0, 4, 0)
-        self.horizontalLayout_10.setObjectName("horizontalLayout_10")
-        spacerItem25 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_10.addItem(spacerItem25)
-        self.save_plasma = PushButton(self.config_grid)
-        self.save_plasma.setMinimumSize(QtCore.QSize(80, 40))
-        self.save_plasma.setMaximumSize(QtCore.QSize(80, 40))
-        self.save_plasma.setObjectName("save_plasma")
-        self.horizontalLayout_10.addWidget(self.save_plasma)
-        spacerItem26 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_10.addItem(spacerItem26)
-        self.reload_plasma = PushButton(self.config_grid)
-        self.reload_plasma.setMinimumSize(QtCore.QSize(80, 40))
-        self.reload_plasma.setMaximumSize(QtCore.QSize(80, 40))
-        self.reload_plasma.setObjectName("reload_plasma")
-        self.horizontalLayout_10.addWidget(self.reload_plasma)
-        spacerItem27 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_10.addItem(spacerItem27)
-        self.verticalLayout_48.addWidget(self.config_grid)
         self.horizontalLayout_12.addWidget(self.config_frame)
-        spacerItem28 = QtWidgets.QSpacerItem(10, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_12.addItem(spacerItem28)
+        spacerItem25 = QtWidgets.QSpacerItem(10, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_12.addItem(spacerItem25)
         self.materials_frame = QtWidgets.QFrame(self.param_tab)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
@@ -4089,12 +4557,46 @@ def setupUi(self, MainWindow):
         self.verticalLayout_4.setContentsMargins(0, 0, 0, 4)
         self.verticalLayout_4.setSpacing(4)
         self.verticalLayout_4.setObjectName("verticalLayout_4")
-        self.materials_label = QtWidgets.QLabel(self.materials_frame)
+        self.frame_45 = QtWidgets.QFrame(self.materials_frame)
+        self.frame_45.setMinimumSize(QtCore.QSize(0, 0))
+        self.frame_45.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.frame_45.setFrameShadow(QtWidgets.QFrame.Plain)
+        self.frame_45.setObjectName("frame_45")
+        self.horizontalLayout_45 = QtWidgets.QHBoxLayout(self.frame_45)
+        self.horizontalLayout_45.setContentsMargins(0, 0, 0, 0)
+        self.horizontalLayout_45.setSpacing(1)
+        self.horizontalLayout_45.setObjectName("horizontalLayout_45")
+        self.save_material = PushButton(self.frame_45)
+        self.save_material.setMinimumSize(QtCore.QSize(60, 16))
+        self.save_material.setMaximumSize(QtCore.QSize(60, 16))
+        self.save_material.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.save_material.setObjectName("save_material")
+        self.horizontalLayout_45.addWidget(self.save_material)
+        self.new_material = PushButton(self.frame_45)
+        self.new_material.setMinimumSize(QtCore.QSize(60, 16))
+        self.new_material.setMaximumSize(QtCore.QSize(60, 16))
+        self.new_material.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.new_material.setObjectName("new_material")
+        self.horizontalLayout_45.addWidget(self.new_material)
+        self.materials_label = QtWidgets.QLabel(self.frame_45)
         self.materials_label.setMinimumSize(QtCore.QSize(0, 16))
         self.materials_label.setMaximumSize(QtCore.QSize(16777215, 16))
         self.materials_label.setAlignment(QtCore.Qt.AlignCenter)
         self.materials_label.setObjectName("materials_label")
-        self.verticalLayout_4.addWidget(self.materials_label)
+        self.horizontalLayout_45.addWidget(self.materials_label)
+        self.delete_material = PushButton(self.frame_45)
+        self.delete_material.setMinimumSize(QtCore.QSize(60, 16))
+        self.delete_material.setMaximumSize(QtCore.QSize(60, 16))
+        self.delete_material.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.delete_material.setObjectName("delete_material")
+        self.horizontalLayout_45.addWidget(self.delete_material)
+        self.reload_material = PushButton(self.frame_45)
+        self.reload_material.setMinimumSize(QtCore.QSize(60, 16))
+        self.reload_material.setMaximumSize(QtCore.QSize(60, 16))
+        self.reload_material.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.reload_material.setObjectName("reload_material")
+        self.horizontalLayout_45.addWidget(self.reload_material)
+        self.verticalLayout_4.addWidget(self.frame_45)
         self.frame_49 = QtWidgets.QFrame(self.materials_frame)
         self.frame_49.setMinimumSize(QtCore.QSize(0, 247))
         self.frame_49.setFrameShape(QtWidgets.QFrame.NoFrame)
@@ -4438,6 +4940,7 @@ def setupUi(self, MainWindow):
         self.pierce_height.setObjectName("pierce_height")
         self.gridLayout_13.addWidget(self.pierce_height, 2, 0, 1, 1)
         self.materials_box = QtWidgets.QComboBox(self.frame_49)
+        self.materials_box.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.materials_box.setCurrentText("")
         self.materials_box.setObjectName("materials_box")
         self.gridLayout_13.addWidget(self.materials_box, 0, 0, 1, 2)
@@ -4456,52 +4959,28 @@ def setupUi(self, MainWindow):
         self.kerf_width.setAccelerated(True)
         self.kerf_width.setDecimals(2)
         self.kerf_width.setMaximum(5.0)
+        self.kerf_width.setSingleStep(0.01)
         self.kerf_width.setProperty("value", 0.0)
         self.kerf_width.setObjectName("kerf_width")
         self.gridLayout_13.addWidget(self.kerf_width, 1, 0, 1, 1)
         self.verticalLayout_4.addWidget(self.frame_49)
-        spacerItem29 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout_4.addItem(spacerItem29)
-        self.frame_23 = QtWidgets.QFrame(self.materials_frame)
-        self.frame_23.setMinimumSize(QtCore.QSize(0, 0))
-        self.frame_23.setFrameShape(QtWidgets.QFrame.NoFrame)
-        self.frame_23.setFrameShadow(QtWidgets.QFrame.Plain)
-        self.frame_23.setObjectName("frame_23")
-        self.horizontalLayout_43 = QtWidgets.QHBoxLayout(self.frame_23)
-        self.horizontalLayout_43.setContentsMargins(4, 0, 4, 0)
-        self.horizontalLayout_43.setSpacing(4)
-        self.horizontalLayout_43.setObjectName("horizontalLayout_43")
-        self.save_material = PushButton(self.frame_23)
-        self.save_material.setMinimumSize(QtCore.QSize(58, 40))
-        self.save_material.setMaximumSize(QtCore.QSize(58, 16777215))
-        self.save_material.setObjectName("save_material")
-        self.horizontalLayout_43.addWidget(self.save_material)
-        spacerItem30 = QtWidgets.QSpacerItem(2, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_43.addItem(spacerItem30)
-        self.reload_material = PushButton(self.frame_23)
-        self.reload_material.setMinimumSize(QtCore.QSize(58, 40))
-        self.reload_material.setMaximumSize(QtCore.QSize(58, 16777215))
-        self.reload_material.setObjectName("reload_material")
-        self.horizontalLayout_43.addWidget(self.reload_material)
-        spacerItem31 = QtWidgets.QSpacerItem(2, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_43.addItem(spacerItem31)
-        self.new_material = PushButton(self.frame_23)
-        self.new_material.setMinimumSize(QtCore.QSize(58, 40))
-        self.new_material.setMaximumSize(QtCore.QSize(58, 16777215))
-        self.new_material.setObjectName("new_material")
-        self.horizontalLayout_43.addWidget(self.new_material)
-        spacerItem32 = QtWidgets.QSpacerItem(2, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_43.addItem(spacerItem32)
-        self.delete_material = PushButton(self.frame_23)
-        self.delete_material.setMinimumSize(QtCore.QSize(58, 40))
-        self.delete_material.setMaximumSize(QtCore.QSize(58, 16777215))
-        self.delete_material.setObjectName("delete_material")
-        self.horizontalLayout_43.addWidget(self.delete_material)
-        self.verticalLayout_4.addWidget(self.frame_23)
+        spacerItem26 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout_4.addItem(spacerItem26)
         self.horizontalLayout_12.addWidget(self.materials_frame)
-        spacerItem33 = QtWidgets.QSpacerItem(10, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_12.addItem(spacerItem33)
-        self.gui_frame = QtWidgets.QFrame(self.param_tab)
+        self.horizontalLayout_12.setStretch(1, 1)
+        self.main_tab_widget.addTab(self.param_tab, "")
+        self.settings_tab = QtWidgets.QWidget()
+        self.settings_tab.setObjectName("settings_tab")
+        self.horizontalLayout_37 = QtWidgets.QHBoxLayout(self.settings_tab)
+        self.horizontalLayout_37.setContentsMargins(4, 4, 4, 4)
+        self.horizontalLayout_37.setSpacing(2)
+        self.horizontalLayout_37.setObjectName("horizontalLayout_37")
+        self.gui_frame = QtWidgets.QFrame(self.settings_tab)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.gui_frame.sizePolicy().hasHeightForWidth())
+        self.gui_frame.setSizePolicy(sizePolicy)
         self.gui_frame.setFrameShape(QtWidgets.QFrame.NoFrame)
         self.gui_frame.setFrameShadow(QtWidgets.QFrame.Plain)
         self.gui_frame.setObjectName("gui_frame")
@@ -4534,6 +5013,7 @@ def setupUi(self, MainWindow):
         self.color_estop.setSizePolicy(sizePolicy)
         self.color_estop.setMinimumSize(QtCore.QSize(0, 0))
         self.color_estop.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.color_estop.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.color_estop.setObjectName("color_estop")
         self.gridLayout_3.addWidget(self.color_estop, 1, 4, 1, 1)
         self.color_preview_lbl = QtWidgets.QLabel(self.frame_19)
@@ -4548,6 +5028,7 @@ def setupUi(self, MainWindow):
         self.color_led.setSizePolicy(sizePolicy)
         self.color_led.setMinimumSize(QtCore.QSize(0, 0))
         self.color_led.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.color_led.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.color_led.setObjectName("color_led")
         self.gridLayout_3.addWidget(self.color_led, 2, 0, 1, 1)
         self.color_estop_lbl = QtWidgets.QLabel(self.frame_19)
@@ -4580,6 +5061,7 @@ def setupUi(self, MainWindow):
         self.color_disabled.setSizePolicy(sizePolicy)
         self.color_disabled.setMinimumSize(QtCore.QSize(0, 0))
         self.color_disabled.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.color_disabled.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.color_disabled.setObjectName("color_disabled")
         self.gridLayout_3.addWidget(self.color_disabled, 2, 4, 1, 1)
         self.color_backgrnd = PushButton(self.frame_19)
@@ -4590,6 +5072,7 @@ def setupUi(self, MainWindow):
         self.color_backgrnd.setSizePolicy(sizePolicy)
         self.color_backgrnd.setMinimumSize(QtCore.QSize(0, 0))
         self.color_backgrnd.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.color_backgrnd.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.color_backgrnd.setObjectName("color_backgrnd")
         self.gridLayout_3.addWidget(self.color_backgrnd, 3, 0, 1, 1)
         self.color_frams = PushButton(self.frame_19)
@@ -4600,6 +5083,7 @@ def setupUi(self, MainWindow):
         self.color_frams.setSizePolicy(sizePolicy)
         self.color_frams.setMinimumSize(QtCore.QSize(0, 0))
         self.color_frams.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.color_frams.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.color_frams.setObjectName("color_frams")
         self.gridLayout_3.addWidget(self.color_frams, 0, 4, 1, 1)
         self.color_backgalt_lbl = QtWidgets.QLabel(self.frame_19)
@@ -4615,6 +5099,7 @@ def setupUi(self, MainWindow):
         self.color_preview.setSizePolicy(sizePolicy)
         self.color_preview.setMinimumSize(QtCore.QSize(0, 0))
         self.color_preview.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.color_preview.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.color_preview.setObjectName("color_preview")
         self.gridLayout_3.addWidget(self.color_preview, 3, 4, 1, 1)
         self.color_backgalt = PushButton(self.frame_19)
@@ -4625,6 +5110,7 @@ def setupUi(self, MainWindow):
         self.color_backgalt.setSizePolicy(sizePolicy)
         self.color_backgalt.setMinimumSize(QtCore.QSize(0, 0))
         self.color_backgalt.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.color_backgalt.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.color_backgalt.setObjectName("color_backgalt")
         self.gridLayout_3.addWidget(self.color_backgalt, 4, 0, 1, 1)
         self.color_foregalt = PushButton(self.frame_19)
@@ -4635,6 +5121,7 @@ def setupUi(self, MainWindow):
         self.color_foregalt.setSizePolicy(sizePolicy)
         self.color_foregalt.setMinimumSize(QtCore.QSize(0, 0))
         self.color_foregalt.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.color_foregalt.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.color_foregalt.setObjectName("color_foregalt")
         self.gridLayout_3.addWidget(self.color_foregalt, 1, 0, 1, 1)
         self.color_disabled_lbl = QtWidgets.QLabel(self.frame_19)
@@ -4661,13 +5148,14 @@ def setupUi(self, MainWindow):
         self.color_foregrnd.setSizePolicy(sizePolicy)
         self.color_foregrnd.setMinimumSize(QtCore.QSize(0, 0))
         self.color_foregrnd.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.color_foregrnd.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.color_foregrnd.setObjectName("color_foregrnd")
         self.gridLayout_3.addWidget(self.color_foregrnd, 0, 0, 1, 1)
-        spacerItem34 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.gridLayout_3.addItem(spacerItem34, 0, 2, 1, 1)
+        spacerItem27 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.gridLayout_3.addItem(spacerItem27, 0, 2, 1, 1)
         self.verticalLayout_44.addWidget(self.frame_19)
-        spacerItem35 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout_44.addItem(spacerItem35)
+        spacerItem28 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout_44.addItem(spacerItem28)
         self.frame_13 = QtWidgets.QFrame(self.gui_frame)
         self.frame_13.setMinimumSize(QtCore.QSize(0, 0))
         self.frame_13.setFrameShape(QtWidgets.QFrame.NoFrame)
@@ -4678,9 +5166,54 @@ def setupUi(self, MainWindow):
         self.gridLayout_15.setHorizontalSpacing(4)
         self.gridLayout_15.setVerticalSpacing(10)
         self.gridLayout_15.setObjectName("gridLayout_15")
-        self.label_26 = QtWidgets.QLabel(self.frame_13)
-        self.label_26.setObjectName("label_26")
-        self.gridLayout_15.addWidget(self.label_26, 0, 1, 1, 1)
+        self.label_33 = QtWidgets.QLabel(self.frame_13)
+        self.label_33.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_33.setObjectName("label_33")
+        self.gridLayout_15.addWidget(self.label_33, 1, 3, 1, 1)
+        self.opt_stp = ActionButton(self.frame_13)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.opt_stp.sizePolicy().hasHeightForWidth())
+        self.opt_stp.setSizePolicy(sizePolicy)
+        self.opt_stp.setMinimumSize(QtCore.QSize(0, 0))
+        self.opt_stp.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.opt_stp.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.opt_stp.setText("")
+        self.opt_stp.setCheckable(True)
+        self.opt_stp.setProperty("indicator_option", False)
+        self.opt_stp.setProperty("indicator_HAL_pin_option", False)
+        self.opt_stp.setProperty("indicator_status_option", False)
+        self.opt_stp.setProperty("on_color", QtGui.QColor(255, 0, 0))
+        self.opt_stp.setProperty("indicator_size", 0.2)
+        self.opt_stp.setProperty("is_optional_stop_status", False)
+        self.opt_stp.setProperty("optional_stop_action", True)
+        self.opt_stp.setObjectName("opt_stp")
+        self.gridLayout_15.addWidget(self.opt_stp, 7, 0, 1, 1)
+        self.chk_keyboard_shortcuts = QtWidgets.QCheckBox(self.frame_13)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.chk_keyboard_shortcuts.sizePolicy().hasHeightForWidth())
+        self.chk_keyboard_shortcuts.setSizePolicy(sizePolicy)
+        self.chk_keyboard_shortcuts.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.chk_keyboard_shortcuts.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.chk_keyboard_shortcuts.setText("")
+        self.chk_keyboard_shortcuts.setObjectName("chk_keyboard_shortcuts")
+        self.gridLayout_15.addWidget(self.chk_keyboard_shortcuts, 1, 4, 1, 1)
+        spacerItem29 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Minimum)
+        self.gridLayout_15.addItem(spacerItem29, 7, 2, 1, 1)
+        self.label_20 = QtWidgets.QLabel(self.frame_13)
+        self.label_20.setObjectName("label_20")
+        self.gridLayout_15.addWidget(self.label_20, 2, 1, 1, 1)
+        self.chk_overlay = QtWidgets.QCheckBox(self.frame_13)
+        self.chk_overlay.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.chk_overlay.setText("")
+        self.chk_overlay.setObjectName("chk_overlay")
+        self.gridLayout_15.addWidget(self.chk_overlay, 2, 0, 1, 1)
+        self.label_36 = QtWidgets.QLabel(self.frame_13)
+        self.label_36.setObjectName("label_36")
+        self.gridLayout_15.addWidget(self.label_36, 7, 1, 1, 1)
         self.chk_soft_keyboard = QtWidgets.QCheckBox(self.frame_13)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
@@ -4688,31 +5221,19 @@ def setupUi(self, MainWindow):
         sizePolicy.setHeightForWidth(self.chk_soft_keyboard.sizePolicy().hasHeightForWidth())
         self.chk_soft_keyboard.setSizePolicy(sizePolicy)
         self.chk_soft_keyboard.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.chk_soft_keyboard.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.chk_soft_keyboard.setText("")
         self.chk_soft_keyboard.setObjectName("chk_soft_keyboard")
-        self.gridLayout_15.addWidget(self.chk_soft_keyboard, 0, 0, 1, 1)
-        self.chk_override_limits = QtWidgets.QCheckBox(self.frame_13)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.chk_override_limits.sizePolicy().hasHeightForWidth())
-        self.chk_override_limits.setSizePolicy(sizePolicy)
-        self.chk_override_limits.setMinimumSize(QtCore.QSize(0, 0))
-        self.chk_override_limits.setMaximumSize(QtCore.QSize(16777215, 16777215))
-        self.chk_override_limits.setText("")
-        self.chk_override_limits.setObjectName("chk_override_limits")
-        self.gridLayout_15.addWidget(self.chk_override_limits, 1, 4, 1, 1)
-        self.label_33 = QtWidgets.QLabel(self.frame_13)
-        self.label_33.setObjectName("label_33")
-        self.gridLayout_15.addWidget(self.label_33, 1, 1, 1, 1)
+        self.gridLayout_15.addWidget(self.chk_soft_keyboard, 1, 0, 1, 1)
         self.opt_blk = ActionButton(self.frame_13)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.opt_blk.sizePolicy().hasHeightForWidth())
         self.opt_blk.setSizePolicy(sizePolicy)
         self.opt_blk.setMinimumSize(QtCore.QSize(0, 0))
         self.opt_blk.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.opt_blk.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.opt_blk.setText("")
         self.opt_blk.setCheckable(True)
         self.opt_blk.setProperty("indicator_option", False)
@@ -4723,47 +5244,14 @@ def setupUi(self, MainWindow):
         self.opt_blk.setProperty("is_block_delete_status", False)
         self.opt_blk.setProperty("block_delete_action", True)
         self.opt_blk.setObjectName("opt_blk")
-        self.gridLayout_15.addWidget(self.opt_blk, 3, 4, 1, 1)
-        self.label_36 = QtWidgets.QLabel(self.frame_13)
-        self.label_36.setObjectName("label_36")
-        self.gridLayout_15.addWidget(self.label_36, 3, 1, 1, 1)
+        self.gridLayout_15.addWidget(self.opt_blk, 7, 4, 1, 1)
+        self.label_46 = QtWidgets.QLabel(self.frame_13)
+        self.label_46.setObjectName("label_46")
+        self.gridLayout_15.addWidget(self.label_46, 3, 1, 1, 1)
         self.label_37 = QtWidgets.QLabel(self.frame_13)
         self.label_37.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
         self.label_37.setObjectName("label_37")
-        self.gridLayout_15.addWidget(self.label_37, 3, 3, 1, 1)
-        self.chk_keyboard_shortcuts = QtWidgets.QCheckBox(self.frame_13)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.chk_keyboard_shortcuts.sizePolicy().hasHeightForWidth())
-        self.chk_keyboard_shortcuts.setSizePolicy(sizePolicy)
-        self.chk_keyboard_shortcuts.setMaximumSize(QtCore.QSize(16777215, 16777215))
-        self.chk_keyboard_shortcuts.setText("")
-        self.chk_keyboard_shortcuts.setObjectName("chk_keyboard_shortcuts")
-        self.gridLayout_15.addWidget(self.chk_keyboard_shortcuts, 1, 0, 1, 1)
-        self.label_42 = QtWidgets.QLabel(self.frame_13)
-        self.label_42.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.label_42.setObjectName("label_42")
-        self.gridLayout_15.addWidget(self.label_42, 1, 3, 1, 1)
-        self.opt_stp = ActionButton(self.frame_13)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.opt_stp.sizePolicy().hasHeightForWidth())
-        self.opt_stp.setSizePolicy(sizePolicy)
-        self.opt_stp.setMinimumSize(QtCore.QSize(0, 0))
-        self.opt_stp.setMaximumSize(QtCore.QSize(16777215, 16777215))
-        self.opt_stp.setText("")
-        self.opt_stp.setCheckable(True)
-        self.opt_stp.setProperty("indicator_option", False)
-        self.opt_stp.setProperty("indicator_HAL_pin_option", False)
-        self.opt_stp.setProperty("indicator_status_option", False)
-        self.opt_stp.setProperty("on_color", QtGui.QColor(255, 0, 0))
-        self.opt_stp.setProperty("indicator_size", 0.2)
-        self.opt_stp.setProperty("is_optional_stop_status", False)
-        self.opt_stp.setProperty("optional_stop_action", True)
-        self.opt_stp.setObjectName("opt_stp")
-        self.gridLayout_15.addWidget(self.opt_stp, 3, 0, 1, 1)
+        self.gridLayout_15.addWidget(self.label_37, 7, 3, 1, 1)
         self.chk_run_from_line = QtWidgets.QCheckBox(self.frame_13)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
@@ -4771,37 +5259,64 @@ def setupUi(self, MainWindow):
         sizePolicy.setHeightForWidth(self.chk_run_from_line.sizePolicy().hasHeightForWidth())
         self.chk_run_from_line.setSizePolicy(sizePolicy)
         self.chk_run_from_line.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.chk_run_from_line.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.chk_run_from_line.setText("")
         self.chk_run_from_line.setObjectName("chk_run_from_line")
-        self.gridLayout_15.addWidget(self.chk_run_from_line, 0, 4, 1, 1)
-        self.label_39 = QtWidgets.QLabel(self.frame_13)
-        self.label_39.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.label_39.setObjectName("label_39")
-        self.gridLayout_15.addWidget(self.label_39, 0, 3, 1, 1)
-        spacerItem36 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.gridLayout_15.addItem(spacerItem36, 3, 2, 1, 1)
-        self.chk_overlay = QtWidgets.QCheckBox(self.frame_13)
-        self.chk_overlay.setText("")
-        self.chk_overlay.setObjectName("chk_overlay")
-        self.gridLayout_15.addWidget(self.chk_overlay, 2, 0, 1, 1)
-        self.label_20 = QtWidgets.QLabel(self.frame_13)
-        self.label_20.setObjectName("label_20")
-        self.gridLayout_15.addWidget(self.label_20, 2, 1, 1, 1)
+        self.gridLayout_15.addWidget(self.chk_run_from_line, 4, 0, 1, 1)
+        self.label_26 = QtWidgets.QLabel(self.frame_13)
+        self.label_26.setObjectName("label_26")
+        self.gridLayout_15.addWidget(self.label_26, 1, 1, 1, 1)
+        self.chk_exit_warning = QtWidgets.QCheckBox(self.frame_13)
+        self.chk_exit_warning.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.chk_exit_warning.setText("")
+        self.chk_exit_warning.setObjectName("chk_exit_warning")
+        self.gridLayout_15.addWidget(self.chk_exit_warning, 3, 0, 1, 1)
         self.chk_tool_tips = QtWidgets.QCheckBox(self.frame_13)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.chk_tool_tips.sizePolicy().hasHeightForWidth())
         self.chk_tool_tips.setSizePolicy(sizePolicy)
+        self.chk_tool_tips.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.chk_tool_tips.setText("")
         self.chk_tool_tips.setObjectName("chk_tool_tips")
         self.gridLayout_15.addWidget(self.chk_tool_tips, 2, 4, 1, 1)
         self.label_38 = QtWidgets.QLabel(self.frame_13)
+        self.label_38.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
         self.label_38.setObjectName("label_38")
         self.gridLayout_15.addWidget(self.label_38, 2, 3, 1, 1)
+        self.chk_override_limits = QtWidgets.QCheckBox(self.frame_13)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.chk_override_limits.sizePolicy().hasHeightForWidth())
+        self.chk_override_limits.setSizePolicy(sizePolicy)
+        self.chk_override_limits.setMinimumSize(QtCore.QSize(0, 0))
+        self.chk_override_limits.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.chk_override_limits.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.chk_override_limits.setText("")
+        self.chk_override_limits.setObjectName("chk_override_limits")
+        self.gridLayout_15.addWidget(self.chk_override_limits, 3, 4, 1, 1)
+        self.label_42 = QtWidgets.QLabel(self.frame_13)
+        self.label_42.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_42.setObjectName("label_42")
+        self.gridLayout_15.addWidget(self.label_42, 3, 3, 1, 1)
+        self.chk_override_jog = QtWidgets.QCheckBox(self.frame_13)
+        self.chk_override_jog.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.chk_override_jog.setText("")
+        self.chk_override_jog.setObjectName("chk_override_jog")
+        self.gridLayout_15.addWidget(self.chk_override_jog, 4, 4, 1, 1)
+        self.label_48 = QtWidgets.QLabel(self.frame_13)
+        self.label_48.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_48.setObjectName("label_48")
+        self.gridLayout_15.addWidget(self.label_48, 4, 3, 1, 1)
+        self.label_39 = QtWidgets.QLabel(self.frame_13)
+        self.label_39.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_39.setObjectName("label_39")
+        self.gridLayout_15.addWidget(self.label_39, 4, 1, 1, 1)
         self.verticalLayout_44.addWidget(self.frame_13)
-        spacerItem37 = QtWidgets.QSpacerItem(20, 82, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout_44.addItem(spacerItem37)
+        spacerItem30 = QtWidgets.QSpacerItem(20, 82, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout_44.addItem(spacerItem30)
         self.frame_11 = QtWidgets.QFrame(self.gui_frame)
         self.frame_11.setFrameShape(QtWidgets.QFrame.NoFrame)
         self.frame_11.setFrameShadow(QtWidgets.QFrame.Plain)
@@ -4811,6 +5326,12 @@ def setupUi(self, MainWindow):
         self.gridLayout_14.setHorizontalSpacing(4)
         self.gridLayout_14.setVerticalSpacing(10)
         self.gridLayout_14.setObjectName("gridLayout_14")
+        self.label_13 = QtWidgets.QLabel(self.frame_11)
+        self.label_13.setObjectName("label_13")
+        self.gridLayout_14.addWidget(self.label_13, 0, 1, 1, 1)
+        self.label_40 = QtWidgets.QLabel(self.frame_11)
+        self.label_40.setObjectName("label_40")
+        self.gridLayout_14.addWidget(self.label_40, 4, 1, 1, 1)
         self.grid_size = DoubleScale(self.frame_11)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
@@ -4829,39 +5350,689 @@ def setupUi(self, MainWindow):
         self.grid_size.setProperty("value", 0.0)
         self.grid_size.setObjectName("grid_size")
         self.gridLayout_14.addWidget(self.grid_size, 0, 0, 1, 1)
-        self.label_13 = QtWidgets.QLabel(self.frame_11)
-        self.label_13.setObjectName("label_13")
-        self.gridLayout_14.addWidget(self.label_13, 0, 1, 1, 1)
+        self.table_zoom_scale = DoubleScale(self.frame_11)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.table_zoom_scale.sizePolicy().hasHeightForWidth())
+        self.table_zoom_scale.setSizePolicy(sizePolicy)
+        self.table_zoom_scale.setMinimumSize(QtCore.QSize(120, 0))
+        self.table_zoom_scale.setMaximumSize(QtCore.QSize(120, 16777215))
+        self.table_zoom_scale.setWrapping(True)
+        self.table_zoom_scale.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.table_zoom_scale.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus)
+        self.table_zoom_scale.setAccelerated(True)
+        self.table_zoom_scale.setSuffix("")
+        self.table_zoom_scale.setDecimals(2)
+        self.table_zoom_scale.setMinimum(0.1)
+        self.table_zoom_scale.setMaximum(10.0)
+        self.table_zoom_scale.setSingleStep(0.01)
+        self.table_zoom_scale.setProperty("value", 0.5)
+        self.table_zoom_scale.setObjectName("table_zoom_scale")
+        self.gridLayout_14.addWidget(self.table_zoom_scale, 4, 0, 1, 1)
         self.cone_size = DoubleScale(self.frame_11)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.cone_size.sizePolicy().hasHeightForWidth())
-        self.cone_size.setSizePolicy(sizePolicy)
-        self.cone_size.setMinimumSize(QtCore.QSize(120, 0))
-        self.cone_size.setMaximumSize(QtCore.QSize(120, 16777215))
-        self.cone_size.setWrapping(True)
-        self.cone_size.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.cone_size.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus)
-        self.cone_size.setAccelerated(True)
-        self.cone_size.setSuffix("")
-        self.cone_size.setDecimals(2)
-        self.cone_size.setMinimum(0.1)
-        self.cone_size.setMaximum(1.0)
-        self.cone_size.setSingleStep(0.01)
-        self.cone_size.setProperty("value", 0.5)
-        self.cone_size.setObjectName("cone_size")
-        self.gridLayout_14.addWidget(self.cone_size, 1, 0, 1, 1)
-        self.label_10 = QtWidgets.QLabel(self.frame_11)
-        self.label_10.setObjectName("label_10")
-        self.gridLayout_14.addWidget(self.label_10, 1, 1, 1, 1)
-        self.verticalLayout_44.addWidget(self.frame_11)
-        spacerItem38 = QtWidgets.QSpacerItem(20, 82, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout_44.addItem(spacerItem38)
-        self.horizontalLayout_12.addWidget(self.gui_frame)
-        spacerItem39 = QtWidgets.QSpacerItem(10, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_12.addItem(spacerItem39)
-        self.utility_frame = QtWidgets.QFrame(self.param_tab)
+        sizePolicy.setHeightForWidth(self.cone_size.sizePolicy().hasHeightForWidth())
+        self.cone_size.setSizePolicy(sizePolicy)
+        self.cone_size.setMinimumSize(QtCore.QSize(120, 0))
+        self.cone_size.setMaximumSize(QtCore.QSize(120, 16777215))
+        self.cone_size.setWrapping(True)
+        self.cone_size.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.cone_size.setButtonSymbols(QtWidgets.QAbstractSpinBox.PlusMinus)
+        self.cone_size.setAccelerated(True)
+        self.cone_size.setSuffix("")
+        self.cone_size.setDecimals(2)
+        self.cone_size.setMinimum(0.1)
+        self.cone_size.setMaximum(1.0)
+        self.cone_size.setSingleStep(0.01)
+        self.cone_size.setProperty("value", 0.5)
+        self.cone_size.setObjectName("cone_size")
+        self.gridLayout_14.addWidget(self.cone_size, 1, 0, 1, 1)
+        self.label_10 = QtWidgets.QLabel(self.frame_11)
+        self.label_10.setObjectName("label_10")
+        self.gridLayout_14.addWidget(self.label_10, 1, 1, 1, 1)
+        self.default_material = QtWidgets.QComboBox(self.frame_11)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.default_material.sizePolicy().hasHeightForWidth())
+        self.default_material.setSizePolicy(sizePolicy)
+        self.default_material.setMinimumSize(QtCore.QSize(120, 0))
+        self.default_material.setMaximumSize(QtCore.QSize(120, 16777215))
+        self.default_material.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.default_material.setObjectName("default_material")
+        self.gridLayout_14.addWidget(self.default_material, 5, 0, 1, 1)
+        self.label_51 = QtWidgets.QLabel(self.frame_11)
+        self.label_51.setObjectName("label_51")
+        self.gridLayout_14.addWidget(self.label_51, 5, 1, 1, 1)
+        self.verticalLayout_44.addWidget(self.frame_11)
+        spacerItem31 = QtWidgets.QSpacerItem(20, 82, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout_44.addItem(spacerItem31)
+        self.horizontalLayout_37.addWidget(self.gui_frame)
+        spacerItem32 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_37.addItem(spacerItem32)
+        self.entries_frame = QtWidgets.QFrame(self.settings_tab)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.entries_frame.sizePolicy().hasHeightForWidth())
+        self.entries_frame.setSizePolicy(sizePolicy)
+        self.entries_frame.setMinimumSize(QtCore.QSize(0, 0))
+        self.entries_frame.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.entries_frame.setFrameShadow(QtWidgets.QFrame.Plain)
+        self.entries_frame.setObjectName("entries_frame")
+        self.verticalLayout_56 = QtWidgets.QVBoxLayout(self.entries_frame)
+        self.verticalLayout_56.setContentsMargins(0, 0, 0, 0)
+        self.verticalLayout_56.setSpacing(4)
+        self.verticalLayout_56.setObjectName("verticalLayout_56")
+        self.ub_frame = QtWidgets.QFrame(self.entries_frame)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.ub_frame.sizePolicy().hasHeightForWidth())
+        self.ub_frame.setSizePolicy(sizePolicy)
+        self.ub_frame.setMinimumSize(QtCore.QSize(720, 0))
+        self.ub_frame.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.ub_frame.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.ub_frame.setFrameShadow(QtWidgets.QFrame.Plain)
+        self.ub_frame.setObjectName("ub_frame")
+        self.verticalLayout_57 = QtWidgets.QVBoxLayout(self.ub_frame)
+        self.verticalLayout_57.setContentsMargins(0, 0, 0, 4)
+        self.verticalLayout_57.setSpacing(4)
+        self.verticalLayout_57.setObjectName("verticalLayout_57")
+        self.frame_42 = QtWidgets.QFrame(self.ub_frame)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.frame_42.sizePolicy().hasHeightForWidth())
+        self.frame_42.setSizePolicy(sizePolicy)
+        self.frame_42.setMinimumSize(QtCore.QSize(0, 0))
+        self.frame_42.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.frame_42.setFrameShadow(QtWidgets.QFrame.Plain)
+        self.frame_42.setObjectName("frame_42")
+        self.horizontalLayout_38 = QtWidgets.QHBoxLayout(self.frame_42)
+        self.horizontalLayout_38.setContentsMargins(0, 0, 0, 0)
+        self.horizontalLayout_38.setSpacing(1)
+        self.horizontalLayout_38.setObjectName("horizontalLayout_38")
+        self.ub_save = QtWidgets.QPushButton(self.frame_42)
+        self.ub_save.setMinimumSize(QtCore.QSize(60, 16))
+        self.ub_save.setMaximumSize(QtCore.QSize(60, 16))
+        self.ub_save.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.ub_save.setObjectName("ub_save")
+        self.horizontalLayout_38.addWidget(self.ub_save)
+        self.ub_label = QtWidgets.QLabel(self.frame_42)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.ub_label.sizePolicy().hasHeightForWidth())
+        self.ub_label.setSizePolicy(sizePolicy)
+        self.ub_label.setMinimumSize(QtCore.QSize(60, 16))
+        self.ub_label.setMaximumSize(QtCore.QSize(16777215, 16))
+        self.ub_label.setAlignment(QtCore.Qt.AlignCenter)
+        self.ub_label.setObjectName("ub_label")
+        self.horizontalLayout_38.addWidget(self.ub_label)
+        self.ub_reload = QtWidgets.QPushButton(self.frame_42)
+        self.ub_reload.setMinimumSize(QtCore.QSize(60, 16))
+        self.ub_reload.setMaximumSize(QtCore.QSize(60, 16))
+        self.ub_reload.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.ub_reload.setObjectName("ub_reload")
+        self.horizontalLayout_38.addWidget(self.ub_reload)
+        self.verticalLayout_57.addWidget(self.frame_42)
+        self.frame_40 = QtWidgets.QFrame(self.ub_frame)
+        self.frame_40.setMinimumSize(QtCore.QSize(0, 30))
+        self.frame_40.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.frame_40.setFrameShadow(QtWidgets.QFrame.Plain)
+        self.frame_40.setObjectName("frame_40")
+        self.horizontalLayout_41 = QtWidgets.QHBoxLayout(self.frame_40)
+        self.horizontalLayout_41.setContentsMargins(4, 0, 4, 0)
+        self.horizontalLayout_41.setSpacing(8)
+        self.horizontalLayout_41.setObjectName("horizontalLayout_41")
+        self.ub_num = QtWidgets.QLabel(self.frame_40)
+        self.ub_num.setMinimumSize(QtCore.QSize(17, 20))
+        self.ub_num.setMaximumSize(QtCore.QSize(17, 20))
+        self.ub_num.setText("")
+        self.ub_num.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.ub_num.setObjectName("ub_num")
+        self.horizontalLayout_41.addWidget(self.ub_num)
+        self.ub_name = QtWidgets.QLabel(self.frame_40)
+        self.ub_name.setMinimumSize(QtCore.QSize(142, 16))
+        self.ub_name.setMaximumSize(QtCore.QSize(142, 16))
+        self.ub_name.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
+        self.ub_name.setObjectName("ub_name")
+        self.horizontalLayout_41.addWidget(self.ub_name)
+        self.ub_code = QtWidgets.QLabel(self.frame_40)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.ub_code.sizePolicy().hasHeightForWidth())
+        self.ub_code.setSizePolicy(sizePolicy)
+        self.ub_code.setMinimumSize(QtCore.QSize(0, 16))
+        self.ub_code.setMaximumSize(QtCore.QSize(16777215, 16))
+        self.ub_code.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
+        self.ub_code.setObjectName("ub_code")
+        self.horizontalLayout_41.addWidget(self.ub_code)
+        self.horizontalLayout_41.setStretch(2, 1)
+        self.verticalLayout_57.addWidget(self.frame_40)
+        self.scrollArea = QtWidgets.QScrollArea(self.ub_frame)
+        self.scrollArea.setMinimumSize(QtCore.QSize(0, 20))
+        self.scrollArea.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.scrollArea.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.scrollArea.setFrameShadow(QtWidgets.QFrame.Plain)
+        self.scrollArea.setWidgetResizable(True)
+        self.scrollArea.setObjectName("scrollArea")
+        self.scrollAreaWidgetContents = QtWidgets.QWidget()
+        self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 720, 695))
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.scrollAreaWidgetContents.sizePolicy().hasHeightForWidth())
+        self.scrollAreaWidgetContents.setSizePolicy(sizePolicy)
+        self.scrollAreaWidgetContents.setObjectName("scrollAreaWidgetContents")
+        self.gridLayout_17 = QtWidgets.QGridLayout(self.scrollAreaWidgetContents)
+        self.gridLayout_17.setContentsMargins(4, 4, 4, 4)
+        self.gridLayout_17.setHorizontalSpacing(8)
+        self.gridLayout_17.setVerticalSpacing(12)
+        self.gridLayout_17.setObjectName("gridLayout_17")
+        self.ub_name_16 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.ub_name_16.sizePolicy().hasHeightForWidth())
+        self.ub_name_16.setSizePolicy(sizePolicy)
+        self.ub_name_16.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_name_16.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_name_16.setObjectName("ub_name_16")
+        self.gridLayout_17.addWidget(self.ub_name_16, 16, 1, 1, 1)
+        self.ub_name_9 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.ub_name_9.sizePolicy().hasHeightForWidth())
+        self.ub_name_9.setSizePolicy(sizePolicy)
+        self.ub_name_9.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_name_9.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_name_9.setObjectName("ub_name_9")
+        self.gridLayout_17.addWidget(self.ub_name_9, 9, 1, 1, 1)
+        self.ub_num_9 = QtWidgets.QLabel(self.scrollAreaWidgetContents)
+        self.ub_num_9.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_num_9.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_num_9.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.ub_num_9.setObjectName("ub_num_9")
+        self.gridLayout_17.addWidget(self.ub_num_9, 9, 0, 1, 1)
+        self.ub_code_9 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        self.ub_code_9.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_code_9.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_code_9.setObjectName("ub_code_9")
+        self.gridLayout_17.addWidget(self.ub_code_9, 9, 2, 1, 1)
+        self.ub_code_7 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        self.ub_code_7.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_code_7.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_code_7.setObjectName("ub_code_7")
+        self.gridLayout_17.addWidget(self.ub_code_7, 7, 2, 1, 1)
+        self.ub_num_17 = QtWidgets.QLabel(self.scrollAreaWidgetContents)
+        self.ub_num_17.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_num_17.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_num_17.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.ub_num_17.setObjectName("ub_num_17")
+        self.gridLayout_17.addWidget(self.ub_num_17, 17, 0, 1, 1)
+        self.ub_code_2 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        self.ub_code_2.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_code_2.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_code_2.setObjectName("ub_code_2")
+        self.gridLayout_17.addWidget(self.ub_code_2, 2, 2, 1, 1)
+        self.ub_num_14 = QtWidgets.QLabel(self.scrollAreaWidgetContents)
+        self.ub_num_14.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_num_14.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_num_14.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.ub_num_14.setObjectName("ub_num_14")
+        self.gridLayout_17.addWidget(self.ub_num_14, 14, 0, 1, 1)
+        self.ub_code_8 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        self.ub_code_8.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_code_8.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_code_8.setObjectName("ub_code_8")
+        self.gridLayout_17.addWidget(self.ub_code_8, 8, 2, 1, 1)
+        self.ub_name_10 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.ub_name_10.sizePolicy().hasHeightForWidth())
+        self.ub_name_10.setSizePolicy(sizePolicy)
+        self.ub_name_10.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_name_10.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_name_10.setObjectName("ub_name_10")
+        self.gridLayout_17.addWidget(self.ub_name_10, 10, 1, 1, 1)
+        self.ub_code_20 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        self.ub_code_20.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_code_20.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_code_20.setObjectName("ub_code_20")
+        self.gridLayout_17.addWidget(self.ub_code_20, 20, 2, 1, 1)
+        self.ub_code_18 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        self.ub_code_18.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_code_18.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_code_18.setObjectName("ub_code_18")
+        self.gridLayout_17.addWidget(self.ub_code_18, 18, 2, 1, 1)
+        self.ub_name_3 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.ub_name_3.sizePolicy().hasHeightForWidth())
+        self.ub_name_3.setSizePolicy(sizePolicy)
+        self.ub_name_3.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_name_3.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_name_3.setObjectName("ub_name_3")
+        self.gridLayout_17.addWidget(self.ub_name_3, 3, 1, 1, 1)
+        self.ub_name_13 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.ub_name_13.sizePolicy().hasHeightForWidth())
+        self.ub_name_13.setSizePolicy(sizePolicy)
+        self.ub_name_13.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_name_13.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_name_13.setObjectName("ub_name_13")
+        self.gridLayout_17.addWidget(self.ub_name_13, 13, 1, 1, 1)
+        self.ub_num_19 = QtWidgets.QLabel(self.scrollAreaWidgetContents)
+        self.ub_num_19.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_num_19.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_num_19.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.ub_num_19.setObjectName("ub_num_19")
+        self.gridLayout_17.addWidget(self.ub_num_19, 19, 0, 1, 1)
+        self.ub_code_6 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        self.ub_code_6.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_code_6.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_code_6.setObjectName("ub_code_6")
+        self.gridLayout_17.addWidget(self.ub_code_6, 6, 2, 1, 1)
+        self.ub_name_19 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.ub_name_19.sizePolicy().hasHeightForWidth())
+        self.ub_name_19.setSizePolicy(sizePolicy)
+        self.ub_name_19.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_name_19.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_name_19.setObjectName("ub_name_19")
+        self.gridLayout_17.addWidget(self.ub_name_19, 19, 1, 1, 1)
+        self.ub_code_13 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        self.ub_code_13.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_code_13.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_code_13.setObjectName("ub_code_13")
+        self.gridLayout_17.addWidget(self.ub_code_13, 13, 2, 1, 1)
+        self.ub_name_1 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.ub_name_1.sizePolicy().hasHeightForWidth())
+        self.ub_name_1.setSizePolicy(sizePolicy)
+        self.ub_name_1.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_name_1.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_name_1.setObjectName("ub_name_1")
+        self.gridLayout_17.addWidget(self.ub_name_1, 1, 1, 1, 1)
+        self.ub_num_2 = QtWidgets.QLabel(self.scrollAreaWidgetContents)
+        self.ub_num_2.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_num_2.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_num_2.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.ub_num_2.setObjectName("ub_num_2")
+        self.gridLayout_17.addWidget(self.ub_num_2, 2, 0, 1, 1)
+        self.ub_name_7 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.ub_name_7.sizePolicy().hasHeightForWidth())
+        self.ub_name_7.setSizePolicy(sizePolicy)
+        self.ub_name_7.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_name_7.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_name_7.setObjectName("ub_name_7")
+        self.gridLayout_17.addWidget(self.ub_name_7, 7, 1, 1, 1)
+        self.ub_name_5 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.ub_name_5.sizePolicy().hasHeightForWidth())
+        self.ub_name_5.setSizePolicy(sizePolicy)
+        self.ub_name_5.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_name_5.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_name_5.setObjectName("ub_name_5")
+        self.gridLayout_17.addWidget(self.ub_name_5, 5, 1, 1, 1)
+        self.ub_code_3 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        self.ub_code_3.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_code_3.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_code_3.setObjectName("ub_code_3")
+        self.gridLayout_17.addWidget(self.ub_code_3, 3, 2, 1, 1)
+        self.ub_name_4 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.ub_name_4.sizePolicy().hasHeightForWidth())
+        self.ub_name_4.setSizePolicy(sizePolicy)
+        self.ub_name_4.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_name_4.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_name_4.setObjectName("ub_name_4")
+        self.gridLayout_17.addWidget(self.ub_name_4, 4, 1, 1, 1)
+        self.ub_code_19 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        self.ub_code_19.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_code_19.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_code_19.setObjectName("ub_code_19")
+        self.gridLayout_17.addWidget(self.ub_code_19, 19, 2, 1, 1)
+        self.ub_code_1 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        self.ub_code_1.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_code_1.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_code_1.setObjectName("ub_code_1")
+        self.gridLayout_17.addWidget(self.ub_code_1, 1, 2, 1, 1)
+        self.ub_name_17 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.ub_name_17.sizePolicy().hasHeightForWidth())
+        self.ub_name_17.setSizePolicy(sizePolicy)
+        self.ub_name_17.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_name_17.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_name_17.setObjectName("ub_name_17")
+        self.gridLayout_17.addWidget(self.ub_name_17, 17, 1, 1, 1)
+        self.ub_name_20 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.ub_name_20.sizePolicy().hasHeightForWidth())
+        self.ub_name_20.setSizePolicy(sizePolicy)
+        self.ub_name_20.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_name_20.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_name_20.setObjectName("ub_name_20")
+        self.gridLayout_17.addWidget(self.ub_name_20, 20, 1, 1, 1)
+        self.ub_num_6 = QtWidgets.QLabel(self.scrollAreaWidgetContents)
+        self.ub_num_6.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_num_6.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_num_6.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.ub_num_6.setObjectName("ub_num_6")
+        self.gridLayout_17.addWidget(self.ub_num_6, 6, 0, 1, 1)
+        self.ub_num_15 = QtWidgets.QLabel(self.scrollAreaWidgetContents)
+        self.ub_num_15.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_num_15.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_num_15.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.ub_num_15.setObjectName("ub_num_15")
+        self.gridLayout_17.addWidget(self.ub_num_15, 15, 0, 1, 1)
+        self.ub_num_12 = QtWidgets.QLabel(self.scrollAreaWidgetContents)
+        self.ub_num_12.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_num_12.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_num_12.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.ub_num_12.setObjectName("ub_num_12")
+        self.gridLayout_17.addWidget(self.ub_num_12, 12, 0, 1, 1)
+        self.ub_name_15 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.ub_name_15.sizePolicy().hasHeightForWidth())
+        self.ub_name_15.setSizePolicy(sizePolicy)
+        self.ub_name_15.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_name_15.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_name_15.setObjectName("ub_name_15")
+        self.gridLayout_17.addWidget(self.ub_name_15, 15, 1, 1, 1)
+        self.ub_num_11 = QtWidgets.QLabel(self.scrollAreaWidgetContents)
+        self.ub_num_11.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_num_11.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_num_11.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.ub_num_11.setObjectName("ub_num_11")
+        self.gridLayout_17.addWidget(self.ub_num_11, 11, 0, 1, 1)
+        self.ub_num_1 = QtWidgets.QLabel(self.scrollAreaWidgetContents)
+        self.ub_num_1.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_num_1.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_num_1.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.ub_num_1.setObjectName("ub_num_1")
+        self.gridLayout_17.addWidget(self.ub_num_1, 1, 0, 1, 1)
+        self.ub_code_17 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        self.ub_code_17.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_code_17.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_code_17.setObjectName("ub_code_17")
+        self.gridLayout_17.addWidget(self.ub_code_17, 17, 2, 1, 1)
+        self.ub_code_4 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        self.ub_code_4.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_code_4.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_code_4.setObjectName("ub_code_4")
+        self.gridLayout_17.addWidget(self.ub_code_4, 4, 2, 1, 1)
+        self.ub_num_20 = QtWidgets.QLabel(self.scrollAreaWidgetContents)
+        self.ub_num_20.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_num_20.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_num_20.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.ub_num_20.setObjectName("ub_num_20")
+        self.gridLayout_17.addWidget(self.ub_num_20, 20, 0, 1, 1)
+        self.ub_code_15 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        self.ub_code_15.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_code_15.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_code_15.setObjectName("ub_code_15")
+        self.gridLayout_17.addWidget(self.ub_code_15, 15, 2, 1, 1)
+        self.ub_code_16 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        self.ub_code_16.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_code_16.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_code_16.setObjectName("ub_code_16")
+        self.gridLayout_17.addWidget(self.ub_code_16, 16, 2, 1, 1)
+        self.ub_num_16 = QtWidgets.QLabel(self.scrollAreaWidgetContents)
+        self.ub_num_16.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_num_16.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_num_16.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.ub_num_16.setObjectName("ub_num_16")
+        self.gridLayout_17.addWidget(self.ub_num_16, 16, 0, 1, 1)
+        self.ub_num_10 = QtWidgets.QLabel(self.scrollAreaWidgetContents)
+        self.ub_num_10.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_num_10.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_num_10.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.ub_num_10.setObjectName("ub_num_10")
+        self.gridLayout_17.addWidget(self.ub_num_10, 10, 0, 1, 1)
+        self.ub_num_18 = QtWidgets.QLabel(self.scrollAreaWidgetContents)
+        self.ub_num_18.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_num_18.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_num_18.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.ub_num_18.setObjectName("ub_num_18")
+        self.gridLayout_17.addWidget(self.ub_num_18, 18, 0, 1, 1)
+        self.ub_num_3 = QtWidgets.QLabel(self.scrollAreaWidgetContents)
+        self.ub_num_3.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_num_3.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_num_3.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.ub_num_3.setObjectName("ub_num_3")
+        self.gridLayout_17.addWidget(self.ub_num_3, 3, 0, 1, 1)
+        self.ub_num_13 = QtWidgets.QLabel(self.scrollAreaWidgetContents)
+        self.ub_num_13.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_num_13.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_num_13.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.ub_num_13.setObjectName("ub_num_13")
+        self.gridLayout_17.addWidget(self.ub_num_13, 13, 0, 1, 1)
+        self.ub_name_2 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.ub_name_2.sizePolicy().hasHeightForWidth())
+        self.ub_name_2.setSizePolicy(sizePolicy)
+        self.ub_name_2.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_name_2.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_name_2.setObjectName("ub_name_2")
+        self.gridLayout_17.addWidget(self.ub_name_2, 2, 1, 1, 1)
+        self.ub_name_8 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.ub_name_8.sizePolicy().hasHeightForWidth())
+        self.ub_name_8.setSizePolicy(sizePolicy)
+        self.ub_name_8.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_name_8.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_name_8.setObjectName("ub_name_8")
+        self.gridLayout_17.addWidget(self.ub_name_8, 8, 1, 1, 1)
+        self.ub_code_14 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        self.ub_code_14.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_code_14.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_code_14.setObjectName("ub_code_14")
+        self.gridLayout_17.addWidget(self.ub_code_14, 14, 2, 1, 1)
+        self.ub_num_7 = QtWidgets.QLabel(self.scrollAreaWidgetContents)
+        self.ub_num_7.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_num_7.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_num_7.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.ub_num_7.setObjectName("ub_num_7")
+        self.gridLayout_17.addWidget(self.ub_num_7, 7, 0, 1, 1)
+        self.ub_code_5 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        self.ub_code_5.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_code_5.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_code_5.setObjectName("ub_code_5")
+        self.gridLayout_17.addWidget(self.ub_code_5, 5, 2, 1, 1)
+        self.ub_name_18 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.ub_name_18.sizePolicy().hasHeightForWidth())
+        self.ub_name_18.setSizePolicy(sizePolicy)
+        self.ub_name_18.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_name_18.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_name_18.setObjectName("ub_name_18")
+        self.gridLayout_17.addWidget(self.ub_name_18, 18, 1, 1, 1)
+        self.ub_code_12 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        self.ub_code_12.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_code_12.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_code_12.setObjectName("ub_code_12")
+        self.gridLayout_17.addWidget(self.ub_code_12, 12, 2, 1, 1)
+        self.ub_name_6 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.ub_name_6.sizePolicy().hasHeightForWidth())
+        self.ub_name_6.setSizePolicy(sizePolicy)
+        self.ub_name_6.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_name_6.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_name_6.setObjectName("ub_name_6")
+        self.gridLayout_17.addWidget(self.ub_name_6, 6, 1, 1, 1)
+        self.ub_code_11 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        self.ub_code_11.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_code_11.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_code_11.setObjectName("ub_code_11")
+        self.gridLayout_17.addWidget(self.ub_code_11, 11, 2, 1, 1)
+        self.ub_code_10 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        self.ub_code_10.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_code_10.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_code_10.setObjectName("ub_code_10")
+        self.gridLayout_17.addWidget(self.ub_code_10, 10, 2, 1, 1)
+        self.ub_num_8 = QtWidgets.QLabel(self.scrollAreaWidgetContents)
+        self.ub_num_8.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_num_8.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_num_8.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.ub_num_8.setObjectName("ub_num_8")
+        self.gridLayout_17.addWidget(self.ub_num_8, 8, 0, 1, 1)
+        self.ub_num_5 = QtWidgets.QLabel(self.scrollAreaWidgetContents)
+        self.ub_num_5.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_num_5.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_num_5.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.ub_num_5.setObjectName("ub_num_5")
+        self.gridLayout_17.addWidget(self.ub_num_5, 5, 0, 1, 1)
+        self.ub_name_14 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.ub_name_14.sizePolicy().hasHeightForWidth())
+        self.ub_name_14.setSizePolicy(sizePolicy)
+        self.ub_name_14.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_name_14.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_name_14.setObjectName("ub_name_14")
+        self.gridLayout_17.addWidget(self.ub_name_14, 14, 1, 1, 1)
+        self.ub_name_12 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.ub_name_12.sizePolicy().hasHeightForWidth())
+        self.ub_name_12.setSizePolicy(sizePolicy)
+        self.ub_name_12.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_name_12.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_name_12.setObjectName("ub_name_12")
+        self.gridLayout_17.addWidget(self.ub_name_12, 12, 1, 1, 1)
+        self.ub_name_11 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.ub_name_11.sizePolicy().hasHeightForWidth())
+        self.ub_name_11.setSizePolicy(sizePolicy)
+        self.ub_name_11.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_name_11.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_name_11.setObjectName("ub_name_11")
+        self.gridLayout_17.addWidget(self.ub_name_11, 11, 1, 1, 1)
+        self.ub_num_4 = QtWidgets.QLabel(self.scrollAreaWidgetContents)
+        self.ub_num_4.setMinimumSize(QtCore.QSize(0, 20))
+        self.ub_num_4.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.ub_num_4.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.ub_num_4.setObjectName("ub_num_4")
+        self.gridLayout_17.addWidget(self.ub_num_4, 4, 0, 1, 1)
+        self.scrollArea.setWidget(self.scrollAreaWidgetContents)
+        self.verticalLayout_57.addWidget(self.scrollArea)
+        self.verticalLayout_56.addWidget(self.ub_frame)
+        self.sd_frame = QtWidgets.QFrame(self.entries_frame)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.sd_frame.sizePolicy().hasHeightForWidth())
+        self.sd_frame.setSizePolicy(sizePolicy)
+        self.sd_frame.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.sd_frame.setFrameShadow(QtWidgets.QFrame.Plain)
+        self.sd_frame.setObjectName("sd_frame")
+        self.verticalLayout_58 = QtWidgets.QVBoxLayout(self.sd_frame)
+        self.verticalLayout_58.setContentsMargins(0, 0, 0, 4)
+        self.verticalLayout_58.setSpacing(4)
+        self.verticalLayout_58.setObjectName("verticalLayout_58")
+        self.frame_43 = QtWidgets.QFrame(self.sd_frame)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.frame_43.sizePolicy().hasHeightForWidth())
+        self.frame_43.setSizePolicy(sizePolicy)
+        self.frame_43.setMinimumSize(QtCore.QSize(0, 0))
+        self.frame_43.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.frame_43.setFrameShadow(QtWidgets.QFrame.Raised)
+        self.frame_43.setObjectName("frame_43")
+        self.horizontalLayout_39 = QtWidgets.QHBoxLayout(self.frame_43)
+        self.horizontalLayout_39.setContentsMargins(0, 0, 0, 0)
+        self.horizontalLayout_39.setSpacing(1)
+        self.horizontalLayout_39.setObjectName("horizontalLayout_39")
+        self.sd_save = QtWidgets.QPushButton(self.frame_43)
+        self.sd_save.setMinimumSize(QtCore.QSize(60, 16))
+        self.sd_save.setMaximumSize(QtCore.QSize(60, 16))
+        self.sd_save.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.sd_save.setObjectName("sd_save")
+        self.horizontalLayout_39.addWidget(self.sd_save)
+        self.sd_label = QtWidgets.QLabel(self.frame_43)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.sd_label.sizePolicy().hasHeightForWidth())
+        self.sd_label.setSizePolicy(sizePolicy)
+        self.sd_label.setMinimumSize(QtCore.QSize(60, 16))
+        self.sd_label.setMaximumSize(QtCore.QSize(16777215, 16))
+        self.sd_label.setAlignment(QtCore.Qt.AlignCenter)
+        self.sd_label.setObjectName("sd_label")
+        self.horizontalLayout_39.addWidget(self.sd_label)
+        self.sd_reload = QtWidgets.QPushButton(self.frame_43)
+        self.sd_reload.setMinimumSize(QtCore.QSize(60, 16))
+        self.sd_reload.setMaximumSize(QtCore.QSize(60, 16))
+        self.sd_reload.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.sd_reload.setObjectName("sd_reload")
+        self.horizontalLayout_39.addWidget(self.sd_reload)
+        self.verticalLayout_58.addWidget(self.frame_43)
+        self.frame_41 = QtWidgets.QFrame(self.sd_frame)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.frame_41.sizePolicy().hasHeightForWidth())
+        self.frame_41.setSizePolicy(sizePolicy)
+        self.frame_41.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.frame_41.setFrameShadow(QtWidgets.QFrame.Plain)
+        self.frame_41.setObjectName("frame_41")
+        self.verticalLayout_59 = QtWidgets.QVBoxLayout(self.frame_41)
+        self.verticalLayout_59.setContentsMargins(4, 4, 4, 0)
+        self.verticalLayout_59.setSpacing(4)
+        self.verticalLayout_59.setObjectName("verticalLayout_59")
+        self.sd_text = QtWidgets.QLineEdit(self.frame_41)
+        self.sd_text.setMinimumSize(QtCore.QSize(0, 20))
+        self.sd_text.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.sd_text.setObjectName("sd_text")
+        self.verticalLayout_59.addWidget(self.sd_text)
+        self.verticalLayout_58.addWidget(self.frame_41)
+        self.verticalLayout_56.addWidget(self.sd_frame)
+        self.horizontalLayout_37.addWidget(self.entries_frame)
+        spacerItem33 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_37.addItem(spacerItem33)
+        self.utility_frame = QtWidgets.QFrame(self.settings_tab)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -4893,6 +6064,7 @@ def setupUi(self, MainWindow):
         self.actionbutton_halshow.setSizePolicy(sizePolicy)
         self.actionbutton_halshow.setMinimumSize(QtCore.QSize(90, 50))
         self.actionbutton_halshow.setMaximumSize(QtCore.QSize(90, 50))
+        self.actionbutton_halshow.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.actionbutton_halshow.setProperty("launch_halshow_action", True)
         self.actionbutton_halshow.setProperty("template_label_option", False)
         self.actionbutton_halshow.setProperty("joint_number", 0)
@@ -4918,6 +6090,7 @@ def setupUi(self, MainWindow):
         self.actionbutton_halscope.setSizePolicy(sizePolicy)
         self.actionbutton_halscope.setMinimumSize(QtCore.QSize(90, 50))
         self.actionbutton_halscope.setMaximumSize(QtCore.QSize(90, 50))
+        self.actionbutton_halscope.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.actionbutton_halscope.setProperty("launch_halscope_action", True)
         self.actionbutton_halscope.setProperty("template_label_option", False)
         self.actionbutton_halscope.setProperty("joint_number", 0)
@@ -4943,6 +6116,7 @@ def setupUi(self, MainWindow):
         self.actionbutton_halmeter.setSizePolicy(sizePolicy)
         self.actionbutton_halmeter.setMinimumSize(QtCore.QSize(90, 50))
         self.actionbutton_halmeter.setMaximumSize(QtCore.QSize(90, 50))
+        self.actionbutton_halmeter.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.actionbutton_halmeter.setProperty("launch_halmeter_action", True)
         self.actionbutton_halmeter.setProperty("template_label_option", False)
         self.actionbutton_halmeter.setProperty("joint_number", 0)
@@ -4968,39 +6142,52 @@ def setupUi(self, MainWindow):
         self.actionbutton_calibration.setSizePolicy(sizePolicy)
         self.actionbutton_calibration.setMinimumSize(QtCore.QSize(90, 50))
         self.actionbutton_calibration.setMaximumSize(QtCore.QSize(90, 50))
+        self.actionbutton_calibration.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.actionbutton_calibration.setProperty("launch_calibration_action", True)
         self.actionbutton_calibration.setProperty("view_type_string", "p")
         self.actionbutton_calibration.setProperty("textTemplate", "%1.3f in")
         self.actionbutton_calibration.setProperty("alt_textTemplate", "%1.2f mm")
         self.actionbutton_calibration.setObjectName("actionbutton_calibration")
         self.verticalLayout_5.addWidget(self.actionbutton_calibration)
-        self.actionbutton_lcnc_status_2 = ActionButton(self.frame_48)
+        self.actionbutton_lcnc_status = ActionButton(self.frame_48)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.actionbutton_lcnc_status_2.sizePolicy().hasHeightForWidth())
-        self.actionbutton_lcnc_status_2.setSizePolicy(sizePolicy)
-        self.actionbutton_lcnc_status_2.setMinimumSize(QtCore.QSize(90, 50))
-        self.actionbutton_lcnc_status_2.setMaximumSize(QtCore.QSize(90, 50))
-        self.actionbutton_lcnc_status_2.setProperty("launch_status_action", True)
-        self.actionbutton_lcnc_status_2.setProperty("template_label_option", False)
-        self.actionbutton_lcnc_status_2.setProperty("joint_number", 0)
-        self.actionbutton_lcnc_status_2.setProperty("incr_imperial_number", 0.01)
-        self.actionbutton_lcnc_status_2.setProperty("incr_mm_number", 0.025)
-        self.actionbutton_lcnc_status_2.setProperty("incr_angular_number", -1.0)
-        self.actionbutton_lcnc_status_2.setProperty("toggle_float_option", False)
-        self.actionbutton_lcnc_status_2.setProperty("float_num", 100.0)
-        self.actionbutton_lcnc_status_2.setProperty("float_alt_num", 50.0)
-        self.actionbutton_lcnc_status_2.setProperty("view_type_string", "P")
-        self.actionbutton_lcnc_status_2.setProperty("command_text_string", "")
-        self.actionbutton_lcnc_status_2.setProperty("ini_mdi_number", 0)
-        self.actionbutton_lcnc_status_2.setProperty("textTemplate", "%1.3f in")
-        self.actionbutton_lcnc_status_2.setProperty("alt_textTemplate", "%1.2f mm")
-        self.actionbutton_lcnc_status_2.setProperty("actionName", "tool.status")
-        self.actionbutton_lcnc_status_2.setObjectName("actionbutton_lcnc_status_2")
-        self.verticalLayout_5.addWidget(self.actionbutton_lcnc_status_2)
-        spacerItem40 = QtWidgets.QSpacerItem(20, 286, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout_5.addItem(spacerItem40)
+        sizePolicy.setHeightForWidth(self.actionbutton_lcnc_status.sizePolicy().hasHeightForWidth())
+        self.actionbutton_lcnc_status.setSizePolicy(sizePolicy)
+        self.actionbutton_lcnc_status.setMinimumSize(QtCore.QSize(90, 50))
+        self.actionbutton_lcnc_status.setMaximumSize(QtCore.QSize(90, 50))
+        self.actionbutton_lcnc_status.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.actionbutton_lcnc_status.setProperty("launch_status_action", True)
+        self.actionbutton_lcnc_status.setProperty("template_label_option", False)
+        self.actionbutton_lcnc_status.setProperty("joint_number", 0)
+        self.actionbutton_lcnc_status.setProperty("incr_imperial_number", 0.01)
+        self.actionbutton_lcnc_status.setProperty("incr_mm_number", 0.025)
+        self.actionbutton_lcnc_status.setProperty("incr_angular_number", -1.0)
+        self.actionbutton_lcnc_status.setProperty("toggle_float_option", False)
+        self.actionbutton_lcnc_status.setProperty("float_num", 100.0)
+        self.actionbutton_lcnc_status.setProperty("float_alt_num", 50.0)
+        self.actionbutton_lcnc_status.setProperty("view_type_string", "P")
+        self.actionbutton_lcnc_status.setProperty("command_text_string", "")
+        self.actionbutton_lcnc_status.setProperty("ini_mdi_number", 0)
+        self.actionbutton_lcnc_status.setProperty("textTemplate", "%1.3f in")
+        self.actionbutton_lcnc_status.setProperty("alt_textTemplate", "%1.2f mm")
+        self.actionbutton_lcnc_status.setProperty("actionName", "tool.status")
+        self.actionbutton_lcnc_status.setObjectName("actionbutton_lcnc_status")
+        self.verticalLayout_5.addWidget(self.actionbutton_lcnc_status)
+        spacerItem34 = QtWidgets.QSpacerItem(20, 286, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout_5.addItem(spacerItem34)
+        self.set_offsets = QtWidgets.QPushButton(self.frame_48)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.set_offsets.sizePolicy().hasHeightForWidth())
+        self.set_offsets.setSizePolicy(sizePolicy)
+        self.set_offsets.setMinimumSize(QtCore.QSize(90, 50))
+        self.set_offsets.setMaximumSize(QtCore.QSize(90, 50))
+        self.set_offsets.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.set_offsets.setObjectName("set_offsets")
+        self.verticalLayout_5.addWidget(self.set_offsets)
         self.backup = QtWidgets.QPushButton(self.frame_48)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
@@ -5009,15 +6196,13 @@ def setupUi(self, MainWindow):
         self.backup.setSizePolicy(sizePolicy)
         self.backup.setMinimumSize(QtCore.QSize(90, 50))
         self.backup.setMaximumSize(QtCore.QSize(90, 50))
+        self.backup.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.backup.setObjectName("backup")
         self.verticalLayout_5.addWidget(self.backup)
         self.verticalLayout_37.addWidget(self.frame_48)
-        self.horizontalLayout_12.addWidget(self.utility_frame)
-        spacerItem41 = QtWidgets.QSpacerItem(10, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_12.addItem(spacerItem41)
-        self.main_tab_widget.addTab(self.param_tab, "")
-        self.settings_tab = QtWidgets.QWidget()
-        self.settings_tab.setObjectName("settings_tab")
+        self.horizontalLayout_37.addWidget(self.utility_frame)
+        self.horizontalLayout_37.setStretch(1, 1)
+        self.horizontalLayout_37.setStretch(3, 1)
         self.main_tab_widget.addTab(self.settings_tab, "")
         self.stats_tab = QtWidgets.QWidget()
         self.stats_tab.setObjectName("stats_tab")
@@ -5026,7 +6211,7 @@ def setupUi(self, MainWindow):
         self.horizontalLayout_19.setSpacing(4)
         self.horizontalLayout_19.setObjectName("horizontalLayout_19")
         self.stats_frame = QtWidgets.QFrame(self.stats_tab)
-        self.stats_frame.setMinimumSize(QtCore.QSize(100, 0))
+        self.stats_frame.setMinimumSize(QtCore.QSize(480, 0))
         self.stats_frame.setFrameShape(QtWidgets.QFrame.NoFrame)
         self.stats_frame.setFrameShadow(QtWidgets.QFrame.Plain)
         self.stats_frame.setObjectName("stats_frame")
@@ -5048,154 +6233,229 @@ def setupUi(self, MainWindow):
         self.gridLayout_5.setHorizontalSpacing(10)
         self.gridLayout_5.setVerticalSpacing(16)
         self.gridLayout_5.setObjectName("gridLayout_5")
-        self.rapid_time_t = QtWidgets.QLabel(self.frame_36)
-        self.rapid_time_t.setText("0.00")
-        self.rapid_time_t.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.rapid_time_t.setObjectName("rapid_time_t")
-        self.gridLayout_5.addWidget(self.rapid_time_t, 7, 3, 1, 1)
-        self.probe_time_t = QtWidgets.QLabel(self.frame_36)
-        self.probe_time_t.setText("0.00")
-        self.probe_time_t.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.probe_time_t.setObjectName("probe_time_t")
-        self.gridLayout_5.addWidget(self.probe_time_t, 8, 3, 1, 1)
-        self.all_reset = QtWidgets.QPushButton(self.frame_36)
-        self.all_reset.setObjectName("all_reset")
-        self.gridLayout_5.addWidget(self.all_reset, 10, 0, 1, 1)
+        self.cut_length_reset = QtWidgets.QPushButton(self.frame_36)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.cut_length_reset.sizePolicy().hasHeightForWidth())
+        self.cut_length_reset.setSizePolicy(sizePolicy)
+        self.cut_length_reset.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.cut_length_reset.setObjectName("cut_length_reset")
+        self.gridLayout_5.addWidget(self.cut_length_reset, 2, 0, 1, 1)
         self.torch_time_t = QtWidgets.QLabel(self.frame_36)
-        self.torch_time_t.setText("0.00")
+        self.torch_time_t.setText("0:00:00")
         self.torch_time_t.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
         self.torch_time_t.setObjectName("torch_time_t")
-        self.gridLayout_5.addWidget(self.torch_time_t, 5, 3, 1, 1)
-        self.run_time_reset = QtWidgets.QPushButton(self.frame_36)
-        self.run_time_reset.setObjectName("run_time_reset")
-        self.gridLayout_5.addWidget(self.run_time_reset, 6, 0, 1, 1)
-        self.label_32 = QtWidgets.QLabel(self.frame_36)
-        self.label_32.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.label_32.setObjectName("label_32")
-        self.gridLayout_5.addWidget(self.label_32, 6, 1, 1, 1)
-        self.run_time = QtWidgets.QLabel(self.frame_36)
-        self.run_time.setText("0.00")
-        self.run_time.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.run_time.setObjectName("run_time")
-        self.gridLayout_5.addWidget(self.run_time, 6, 2, 1, 1)
-        self.run_time_t = QtWidgets.QLabel(self.frame_36)
-        self.run_time_t.setText("0.00")
-        self.run_time_t.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.run_time_t.setObjectName("run_time_t")
-        self.gridLayout_5.addWidget(self.run_time_t, 6, 3, 1, 1)
-        self.cut_length_label = QtWidgets.QLabel(self.frame_36)
-        self.cut_length_label.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.cut_length_label.setObjectName("cut_length_label")
-        self.gridLayout_5.addWidget(self.cut_length_label, 3, 1, 1, 1)
+        self.gridLayout_5.addWidget(self.torch_time_t, 6, 3, 1, 1)
+        self.pierce_count_t = QtWidgets.QLabel(self.frame_36)
+        self.pierce_count_t.setText("0")
+        self.pierce_count_t.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.pierce_count_t.setObjectName("pierce_count_t")
+        self.gridLayout_5.addWidget(self.pierce_count_t, 3, 3, 1, 1)
         self.cut_length = QtWidgets.QLabel(self.frame_36)
         self.cut_length.setText("0.00")
         self.cut_length.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
         self.cut_length.setObjectName("cut_length")
-        self.gridLayout_5.addWidget(self.cut_length, 3, 2, 1, 1)
-        self.label_25 = QtWidgets.QLabel(self.frame_36)
-        self.label_25.setMinimumSize(QtCore.QSize(80, 0))
-        self.label_25.setMaximumSize(QtCore.QSize(80, 16777215))
-        self.label_25.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.label_25.setObjectName("label_25")
-        self.gridLayout_5.addWidget(self.label_25, 1, 3, 1, 1)
-        self.pierce_reset = QtWidgets.QPushButton(self.frame_36)
-        self.pierce_reset.setObjectName("pierce_reset")
-        self.gridLayout_5.addWidget(self.pierce_reset, 2, 0, 1, 1)
-        self.label_28 = QtWidgets.QLabel(self.frame_36)
-        self.label_28.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.label_28.setObjectName("label_28")
-        self.gridLayout_5.addWidget(self.label_28, 2, 1, 1, 1)
-        self.pierce_count = QtWidgets.QLabel(self.frame_36)
-        self.pierce_count.setText("0.00")
-        self.pierce_count.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.pierce_count.setObjectName("pierce_count")
-        self.gridLayout_5.addWidget(self.pierce_count, 2, 2, 1, 1)
-        self.cut_length_t = QtWidgets.QLabel(self.frame_36)
-        self.cut_length_t.setText("0.00")
-        self.cut_length_t.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.cut_length_t.setObjectName("cut_length_t")
-        self.gridLayout_5.addWidget(self.cut_length_t, 3, 3, 1, 1)
+        self.gridLayout_5.addWidget(self.cut_length, 2, 2, 1, 1)
         self.cut_time_reset = QtWidgets.QPushButton(self.frame_36)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.cut_time_reset.sizePolicy().hasHeightForWidth())
+        self.cut_time_reset.setSizePolicy(sizePolicy)
+        self.cut_time_reset.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.cut_time_reset.setObjectName("cut_time_reset")
-        self.gridLayout_5.addWidget(self.cut_time_reset, 4, 0, 1, 1)
-        self.label_30 = QtWidgets.QLabel(self.frame_36)
-        self.label_30.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.label_30.setObjectName("label_30")
-        self.gridLayout_5.addWidget(self.label_30, 4, 1, 1, 1)
-        self.cut_time = QtWidgets.QLabel(self.frame_36)
-        self.cut_time.setText("0.00")
-        self.cut_time.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.cut_time.setObjectName("cut_time")
-        self.gridLayout_5.addWidget(self.cut_time, 4, 2, 1, 1)
+        self.gridLayout_5.addWidget(self.cut_time_reset, 7, 0, 1, 1)
         self.torch_time = QtWidgets.QLabel(self.frame_36)
-        self.torch_time.setText("0.00")
+        self.torch_time.setText("0:00:00")
         self.torch_time.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
         self.torch_time.setObjectName("torch_time")
-        self.gridLayout_5.addWidget(self.torch_time, 5, 2, 1, 1)
-        self.pierce_count_t = QtWidgets.QLabel(self.frame_36)
-        self.pierce_count_t.setText("0.00")
-        self.pierce_count_t.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.pierce_count_t.setObjectName("pierce_count_t")
-        self.gridLayout_5.addWidget(self.pierce_count_t, 2, 3, 1, 1)
-        self.cut_length_reset = QtWidgets.QPushButton(self.frame_36)
-        self.cut_length_reset.setObjectName("cut_length_reset")
-        self.gridLayout_5.addWidget(self.cut_length_reset, 3, 0, 1, 1)
+        self.gridLayout_5.addWidget(self.torch_time, 6, 2, 1, 1)
+        self.label_30 = QtWidgets.QLabel(self.frame_36)
+        self.label_30.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_30.setObjectName("label_30")
+        self.gridLayout_5.addWidget(self.label_30, 7, 1, 1, 1)
         self.label_23 = QtWidgets.QLabel(self.frame_36)
         self.label_23.setMinimumSize(QtCore.QSize(80, 0))
         self.label_23.setMaximumSize(QtCore.QSize(80, 16777215))
         self.label_23.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
         self.label_23.setObjectName("label_23")
         self.gridLayout_5.addWidget(self.label_23, 1, 2, 1, 1)
+        self.run_time_reset = QtWidgets.QPushButton(self.frame_36)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.run_time_reset.sizePolicy().hasHeightForWidth())
+        self.run_time_reset.setSizePolicy(sizePolicy)
+        self.run_time_reset.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.run_time_reset.setObjectName("run_time_reset")
+        self.gridLayout_5.addWidget(self.run_time_reset, 9, 0, 1, 1)
+        self.rapid_time_reset = QtWidgets.QPushButton(self.frame_36)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.rapid_time_reset.sizePolicy().hasHeightForWidth())
+        self.rapid_time_reset.setSizePolicy(sizePolicy)
+        self.rapid_time_reset.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.rapid_time_reset.setObjectName("rapid_time_reset")
+        self.gridLayout_5.addWidget(self.rapid_time_reset, 4, 0, 1, 1)
+        self.label_34 = QtWidgets.QLabel(self.frame_36)
+        self.label_34.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_34.setObjectName("label_34")
+        self.gridLayout_5.addWidget(self.label_34, 4, 1, 1, 1)
+        self.label_25 = QtWidgets.QLabel(self.frame_36)
+        self.label_25.setMinimumSize(QtCore.QSize(80, 0))
+        self.label_25.setMaximumSize(QtCore.QSize(80, 16777215))
+        self.label_25.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_25.setObjectName("label_25")
+        self.gridLayout_5.addWidget(self.label_25, 1, 3, 1, 1)
+        self.run_time_t = QtWidgets.QLabel(self.frame_36)
+        self.run_time_t.setText("0:00:00")
+        self.run_time_t.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.run_time_t.setObjectName("run_time_t")
+        self.gridLayout_5.addWidget(self.run_time_t, 9, 3, 1, 1)
+        self.torch_time_reset = QtWidgets.QPushButton(self.frame_36)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.torch_time_reset.sizePolicy().hasHeightForWidth())
+        self.torch_time_reset.setSizePolicy(sizePolicy)
+        self.torch_time_reset.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.torch_time_reset.setObjectName("torch_time_reset")
+        self.gridLayout_5.addWidget(self.torch_time_reset, 6, 0, 1, 1)
         self.cut_time_t = QtWidgets.QLabel(self.frame_36)
-        self.cut_time_t.setText("0.00")
+        self.cut_time_t.setText("0:00:00")
         self.cut_time_t.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
         self.cut_time_t.setObjectName("cut_time_t")
-        self.gridLayout_5.addWidget(self.cut_time_t, 4, 3, 1, 1)
-        self.torch_time_reset = QtWidgets.QPushButton(self.frame_36)
-        self.torch_time_reset.setObjectName("torch_time_reset")
-        self.gridLayout_5.addWidget(self.torch_time_reset, 5, 0, 1, 1)
-        self.label_31 = QtWidgets.QLabel(self.frame_36)
-        self.label_31.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.label_31.setObjectName("label_31")
-        self.gridLayout_5.addWidget(self.label_31, 5, 1, 1, 1)
+        self.gridLayout_5.addWidget(self.cut_time_t, 7, 3, 1, 1)
+        self.cut_length_t = QtWidgets.QLabel(self.frame_36)
+        self.cut_length_t.setText("0.00")
+        self.cut_length_t.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.cut_length_t.setObjectName("cut_length_t")
+        self.gridLayout_5.addWidget(self.cut_length_t, 2, 3, 1, 1)
+        self.pierce_count = QtWidgets.QLabel(self.frame_36)
+        self.pierce_count.setText("0")
+        self.pierce_count.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.pierce_count.setObjectName("pierce_count")
+        self.gridLayout_5.addWidget(self.pierce_count, 3, 2, 1, 1)
+        self.label_32 = QtWidgets.QLabel(self.frame_36)
+        self.label_32.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_32.setObjectName("label_32")
+        self.gridLayout_5.addWidget(self.label_32, 9, 1, 1, 1)
+        self.rapid_time = QtWidgets.QLabel(self.frame_36)
+        self.rapid_time.setText("0:00:00")
+        self.rapid_time.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.rapid_time.setObjectName("rapid_time")
+        self.gridLayout_5.addWidget(self.rapid_time, 4, 2, 1, 1)
+        self.cut_time = QtWidgets.QLabel(self.frame_36)
+        self.cut_time.setText("0:00:00")
+        self.cut_time.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.cut_time.setObjectName("cut_time")
+        self.gridLayout_5.addWidget(self.cut_time, 7, 2, 1, 1)
+        self.cut_length_label = QtWidgets.QLabel(self.frame_36)
+        self.cut_length_label.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.cut_length_label.setObjectName("cut_length_label")
+        self.gridLayout_5.addWidget(self.cut_length_label, 2, 1, 1, 1)
+        self.rapid_time_t = QtWidgets.QLabel(self.frame_36)
+        self.rapid_time_t.setText("0:00:00")
+        self.rapid_time_t.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.rapid_time_t.setObjectName("rapid_time_t")
+        self.gridLayout_5.addWidget(self.rapid_time_t, 4, 3, 1, 1)
+        self.run_time = QtWidgets.QLabel(self.frame_36)
+        self.run_time.setText("0:00:00")
+        self.run_time.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.run_time.setObjectName("run_time")
+        self.gridLayout_5.addWidget(self.run_time, 9, 2, 1, 1)
+        self.all_reset = QtWidgets.QPushButton(self.frame_36)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.all_reset.sizePolicy().hasHeightForWidth())
+        self.all_reset.setSizePolicy(sizePolicy)
+        self.all_reset.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.all_reset.setObjectName("all_reset")
+        self.gridLayout_5.addWidget(self.all_reset, 13, 0, 1, 1)
+        self.label_28 = QtWidgets.QLabel(self.frame_36)
+        self.label_28.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_28.setObjectName("label_28")
+        self.gridLayout_5.addWidget(self.label_28, 3, 1, 1, 1)
         self.label_22 = QtWidgets.QLabel(self.frame_36)
         self.label_22.setMinimumSize(QtCore.QSize(180, 0))
         self.label_22.setMaximumSize(QtCore.QSize(180, 16777215))
         self.label_22.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
         self.label_22.setObjectName("label_22")
         self.gridLayout_5.addWidget(self.label_22, 1, 1, 1, 1)
-        self.rapid_time_reset = QtWidgets.QPushButton(self.frame_36)
-        self.rapid_time_reset.setObjectName("rapid_time_reset")
-        self.gridLayout_5.addWidget(self.rapid_time_reset, 7, 0, 1, 1)
-        self.label_34 = QtWidgets.QLabel(self.frame_36)
-        self.label_34.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.label_34.setObjectName("label_34")
-        self.gridLayout_5.addWidget(self.label_34, 7, 1, 1, 1)
-        self.rapid_time = QtWidgets.QLabel(self.frame_36)
-        self.rapid_time.setText("0.00")
-        self.rapid_time.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.rapid_time.setObjectName("rapid_time")
-        self.gridLayout_5.addWidget(self.rapid_time, 7, 2, 1, 1)
+        self.label_27 = QtWidgets.QLabel(self.frame_36)
+        self.label_27.setText("")
+        self.label_27.setObjectName("label_27")
+        self.gridLayout_5.addWidget(self.label_27, 12, 0, 1, 1)
+        self.pierce_reset = QtWidgets.QPushButton(self.frame_36)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.pierce_reset.sizePolicy().hasHeightForWidth())
+        self.pierce_reset.setSizePolicy(sizePolicy)
+        self.pierce_reset.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.pierce_reset.setObjectName("pierce_reset")
+        self.gridLayout_5.addWidget(self.pierce_reset, 3, 0, 1, 1)
+        self.label_31 = QtWidgets.QLabel(self.frame_36)
+        self.label_31.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_31.setObjectName("label_31")
+        self.gridLayout_5.addWidget(self.label_31, 6, 1, 1, 1)
         self.probe_time_reset = QtWidgets.QPushButton(self.frame_36)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.probe_time_reset.sizePolicy().hasHeightForWidth())
+        self.probe_time_reset.setSizePolicy(sizePolicy)
+        self.probe_time_reset.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.probe_time_reset.setObjectName("probe_time_reset")
-        self.gridLayout_5.addWidget(self.probe_time_reset, 8, 0, 1, 1)
+        self.gridLayout_5.addWidget(self.probe_time_reset, 5, 0, 1, 1)
         self.label_35 = QtWidgets.QLabel(self.frame_36)
         self.label_35.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
         self.label_35.setObjectName("label_35")
-        self.gridLayout_5.addWidget(self.label_35, 8, 1, 1, 1)
+        self.gridLayout_5.addWidget(self.label_35, 5, 1, 1, 1)
         self.probe_time = QtWidgets.QLabel(self.frame_36)
-        self.probe_time.setText("0.00")
+        self.probe_time.setText("0:00:00")
         self.probe_time.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
         self.probe_time.setObjectName("probe_time")
-        self.gridLayout_5.addWidget(self.probe_time, 8, 2, 1, 1)
-        self.label_27 = QtWidgets.QLabel(self.frame_36)
-        self.label_27.setText("")
-        self.label_27.setObjectName("label_27")
-        self.gridLayout_5.addWidget(self.label_27, 9, 0, 1, 1)
+        self.gridLayout_5.addWidget(self.probe_time, 5, 2, 1, 1)
+        self.probe_time_t = QtWidgets.QLabel(self.frame_36)
+        self.probe_time_t.setText("0:00:00")
+        self.probe_time_t.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.probe_time_t.setObjectName("probe_time_t")
+        self.gridLayout_5.addWidget(self.probe_time_t, 5, 3, 1, 1)
+        self.paused_time_reset = QtWidgets.QPushButton(self.frame_36)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.paused_time_reset.sizePolicy().hasHeightForWidth())
+        self.paused_time_reset.setSizePolicy(sizePolicy)
+        self.paused_time_reset.setFocusPolicy(QtCore.Qt.ClickFocus)
+        self.paused_time_reset.setObjectName("paused_time_reset")
+        self.gridLayout_5.addWidget(self.paused_time_reset, 8, 0, 1, 1)
+        self.label_50 = QtWidgets.QLabel(self.frame_36)
+        self.label_50.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_50.setObjectName("label_50")
+        self.gridLayout_5.addWidget(self.label_50, 8, 1, 1, 1)
+        self.paused_time = QtWidgets.QLabel(self.frame_36)
+        self.paused_time.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.paused_time.setObjectName("paused_time")
+        self.gridLayout_5.addWidget(self.paused_time, 8, 2, 1, 1)
+        self.paused_time_t = QtWidgets.QLabel(self.frame_36)
+        self.paused_time_t.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.paused_time_t.setObjectName("paused_time_t")
+        self.gridLayout_5.addWidget(self.paused_time_t, 8, 3, 1, 1)
+        self.gridLayout_5.setColumnStretch(0, 1)
+        self.gridLayout_5.setColumnStretch(1, 1)
+        self.gridLayout_5.setColumnStretch(2, 1)
+        self.gridLayout_5.setColumnStretch(3, 1)
         self.verticalLayout_26.addWidget(self.frame_36)
-        spacerItem42 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout_26.addItem(spacerItem42)
+        spacerItem35 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout_26.addItem(spacerItem35)
         self.horizontalLayout_19.addWidget(self.stats_frame)
+        spacerItem36 = QtWidgets.QSpacerItem(10, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_19.addItem(spacerItem36)
         self.pmx_stats_frame = QtWidgets.QFrame(self.stats_tab)
         self.pmx_stats_frame.setMinimumSize(QtCore.QSize(100, 0))
         self.pmx_stats_frame.setFrameShape(QtWidgets.QFrame.NoFrame)
@@ -5241,11 +6501,13 @@ def setupUi(self, MainWindow):
         self.pmx_arc_time_t.setObjectName("pmx_arc_time_t")
         self.gridLayout_6.addWidget(self.pmx_arc_time_t, 1, 1, 1, 1)
         self.verticalLayout_27.addWidget(self.frame_35)
-        spacerItem43 = QtWidgets.QSpacerItem(20, 701, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout_27.addItem(spacerItem43)
+        spacerItem37 = QtWidgets.QSpacerItem(20, 701, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout_27.addItem(spacerItem37)
         self.horizontalLayout_19.addWidget(self.pmx_stats_frame)
+        spacerItem38 = QtWidgets.QSpacerItem(10, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_19.addItem(spacerItem38)
         self.machinelog_frame = QtWidgets.QFrame(self.stats_tab)
-        self.machinelog_frame.setMinimumSize(QtCore.QSize(200, 0))
+        self.machinelog_frame.setMinimumSize(QtCore.QSize(480, 0))
         self.machinelog_frame.setFrameShape(QtWidgets.QFrame.NoFrame)
         self.machinelog_frame.setFrameShadow(QtWidgets.QFrame.Plain)
         self.machinelog_frame.setObjectName("machinelog_frame")
@@ -5269,14 +6531,15 @@ def setupUi(self, MainWindow):
         self.verticalLayout_55.setSpacing(4)
         self.verticalLayout_55.setObjectName("verticalLayout_55")
         self.machinelog = MachineLog(self.frame_39)
+        self.machinelog.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.machinelog.setFrameShape(QtWidgets.QFrame.NoFrame)
         self.machinelog.setFrameShadow(QtWidgets.QFrame.Plain)
         self.machinelog.setObjectName("machinelog")
         self.verticalLayout_55.addWidget(self.machinelog)
         self.verticalLayout_23.addWidget(self.frame_39)
         self.horizontalLayout_19.addWidget(self.machinelog_frame)
-        spacerItem44 = QtWidgets.QSpacerItem(10, 17, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_19.addItem(spacerItem44)
+        self.horizontalLayout_19.setStretch(1, 1)
+        self.horizontalLayout_19.setStretch(3, 1)
         self.main_tab_widget.addTab(self.stats_tab, "")
         self.verticalLayout_16.addWidget(self.main_tab_widget)
         self.verticalLayout.addWidget(self.screen_options)
@@ -5300,11 +6563,13 @@ def setupUi(self, MainWindow):
         MainWindow.setTabOrder(self.height_per_volt, self.arc_ok_high)
         MainWindow.setTabOrder(self.arc_ok_high, self.arc_ok_low)
         MainWindow.setTabOrder(self.arc_ok_low, self.thc_delay)
-        MainWindow.setTabOrder(self.thc_delay, self.thc_threshold)
+        MainWindow.setTabOrder(self.thc_delay, self.thc_sample_counts)
+        MainWindow.setTabOrder(self.thc_sample_counts, self.thc_sample_threshold)
+        MainWindow.setTabOrder(self.thc_sample_threshold, self.thc_threshold)
         MainWindow.setTabOrder(self.thc_threshold, self.pid_p_gain)
         MainWindow.setTabOrder(self.pid_p_gain, self.cornerlock_threshold)
-        MainWindow.setTabOrder(self.cornerlock_threshold, self.kerfcross_override)
-        MainWindow.setTabOrder(self.kerfcross_override, self.pid_i_gain)
+        MainWindow.setTabOrder(self.cornerlock_threshold, self.voidlock_slope)
+        MainWindow.setTabOrder(self.voidlock_slope, self.pid_i_gain)
         MainWindow.setTabOrder(self.pid_i_gain, self.pid_d_gain)
         MainWindow.setTabOrder(self.pid_d_gain, self.float_switch_travel)
         MainWindow.setTabOrder(self.float_switch_travel, self.probe_feed_rate)
@@ -5312,16 +6577,16 @@ def setupUi(self, MainWindow):
         MainWindow.setTabOrder(self.probe_start_height, self.ohmic_probe_offset)
         MainWindow.setTabOrder(self.ohmic_probe_offset, self.ohmic_max_attempts)
         MainWindow.setTabOrder(self.ohmic_max_attempts, self.skip_ihs_distance)
-        MainWindow.setTabOrder(self.skip_ihs_distance, self.safe_height)
+        MainWindow.setTabOrder(self.skip_ihs_distance, self.offset_feed_rate)
+        MainWindow.setTabOrder(self.offset_feed_rate, self.safe_height)
         MainWindow.setTabOrder(self.safe_height, self.scribe_arm_delay)
         MainWindow.setTabOrder(self.scribe_arm_delay, self.scribe_on_delay)
         MainWindow.setTabOrder(self.scribe_on_delay, self.spotting_threshold)
         MainWindow.setTabOrder(self.spotting_threshold, self.spotting_time)
-        MainWindow.setTabOrder(self.spotting_time, self.setup_feed_rate)
-        MainWindow.setTabOrder(self.setup_feed_rate, self.save_plasma)
-        MainWindow.setTabOrder(self.save_plasma, self.reload_plasma)
-        MainWindow.setTabOrder(self.reload_plasma, self.materials_box)
-        MainWindow.setTabOrder(self.materials_box, self.kerf_width)
+        MainWindow.setTabOrder(self.spotting_time, self.x_pierce_offset)
+        MainWindow.setTabOrder(self.x_pierce_offset, self.y_pierce_offset)
+        MainWindow.setTabOrder(self.y_pierce_offset, self.setup_feed_rate)
+        MainWindow.setTabOrder(self.setup_feed_rate, self.kerf_width)
         MainWindow.setTabOrder(self.kerf_width, self.pierce_height)
         MainWindow.setTabOrder(self.pierce_height, self.pierce_delay)
         MainWindow.setTabOrder(self.pierce_delay, self.cut_height)
@@ -5333,128 +6598,63 @@ def setupUi(self, MainWindow):
         MainWindow.setTabOrder(self.puddle_jump_delay, self.pause_at_end)
         MainWindow.setTabOrder(self.pause_at_end, self.gas_pressure)
         MainWindow.setTabOrder(self.gas_pressure, self.cut_mode)
-        MainWindow.setTabOrder(self.cut_mode, self.save_material)
-        MainWindow.setTabOrder(self.save_material, self.reload_material)
-        MainWindow.setTabOrder(self.reload_material, self.new_material)
-        MainWindow.setTabOrder(self.new_material, self.delete_material)
-        MainWindow.setTabOrder(self.delete_material, self.color_foregrnd)
-        MainWindow.setTabOrder(self.color_foregrnd, self.color_foregalt)
-        MainWindow.setTabOrder(self.color_foregalt, self.color_led)
-        MainWindow.setTabOrder(self.color_led, self.color_backgrnd)
-        MainWindow.setTabOrder(self.color_backgrnd, self.color_backgalt)
-        MainWindow.setTabOrder(self.color_backgalt, self.color_frams)
-        MainWindow.setTabOrder(self.color_frams, self.color_estop)
-        MainWindow.setTabOrder(self.color_estop, self.color_disabled)
-        MainWindow.setTabOrder(self.color_disabled, self.color_preview)
-        MainWindow.setTabOrder(self.color_preview, self.chk_soft_keyboard)
-        MainWindow.setTabOrder(self.chk_soft_keyboard, self.chk_keyboard_shortcuts)
-        MainWindow.setTabOrder(self.chk_keyboard_shortcuts, self.opt_stp)
-        MainWindow.setTabOrder(self.opt_stp, self.chk_run_from_line)
-        MainWindow.setTabOrder(self.chk_run_from_line, self.chk_override_limits)
-        MainWindow.setTabOrder(self.chk_override_limits, self.opt_blk)
-        MainWindow.setTabOrder(self.opt_blk, self.grid_size)
+        MainWindow.setTabOrder(self.cut_mode, self.grid_size)
         MainWindow.setTabOrder(self.grid_size, self.cone_size)
-        MainWindow.setTabOrder(self.cone_size, self.actionbutton_halshow)
-        MainWindow.setTabOrder(self.actionbutton_halshow, self.actionbutton_halscope)
-        MainWindow.setTabOrder(self.actionbutton_halscope, self.actionbutton_halmeter)
-        MainWindow.setTabOrder(self.actionbutton_halmeter, self.actionbutton_calibration)
-        MainWindow.setTabOrder(self.actionbutton_calibration, self.conv_line)
-        MainWindow.setTabOrder(self.conv_line, self.conv_circle)
-        MainWindow.setTabOrder(self.conv_circle, self.conv_triangle)
-        MainWindow.setTabOrder(self.conv_triangle, self.conv_rectangle)
-        MainWindow.setTabOrder(self.conv_rectangle, self.conv_polygon)
-        MainWindow.setTabOrder(self.conv_polygon, self.conv_bolt)
-        MainWindow.setTabOrder(self.conv_bolt, self.conv_slot)
-        MainWindow.setTabOrder(self.conv_slot, self.conv_star)
-        MainWindow.setTabOrder(self.conv_star, self.conv_gusset)
-        MainWindow.setTabOrder(self.conv_gusset, self.conv_sector)
-        MainWindow.setTabOrder(self.conv_sector, self.conv_rotate)
-        MainWindow.setTabOrder(self.conv_rotate, self.conv_array)
-        MainWindow.setTabOrder(self.conv_array, self.conv_material)
-        MainWindow.setTabOrder(self.conv_material, self.conv_new)
-        MainWindow.setTabOrder(self.conv_new, self.conv_save)
-        MainWindow.setTabOrder(self.conv_save, self.conv_settings)
-        MainWindow.setTabOrder(self.conv_settings, self.conv_send)
-        MainWindow.setTabOrder(self.conv_send, self.laser)
-        MainWindow.setTabOrder(self.laser, self.touch_xy)
-        MainWindow.setTabOrder(self.touch_xy, self.cut_rec_w)
-        MainWindow.setTabOrder(self.cut_rec_w, self.cut_rec_n)
-        MainWindow.setTabOrder(self.cut_rec_n, self.cut_rec_ne)
-        MainWindow.setTabOrder(self.cut_rec_ne, self.file_open)
-        MainWindow.setTabOrder(self.file_open, self.file_reload)
-        MainWindow.setTabOrder(self.file_reload, self.gcode_display)
-        MainWindow.setTabOrder(self.gcode_display, self.touch_y)
-        MainWindow.setTabOrder(self.touch_y, self.home_x)
-        MainWindow.setTabOrder(self.home_x, self.home_z)
-        MainWindow.setTabOrder(self.home_z, self.touch_z)
-        MainWindow.setTabOrder(self.touch_z, self.touch_a)
-        MainWindow.setTabOrder(self.touch_a, self.home_y)
-        MainWindow.setTabOrder(self.home_y, self.touch_x)
-        MainWindow.setTabOrder(self.touch_x, self.home_a)
-        MainWindow.setTabOrder(self.home_a, self.home_all)
-        MainWindow.setTabOrder(self.home_all, self.wcs_button)
-        MainWindow.setTabOrder(self.wcs_button, self.camera)
-        MainWindow.setTabOrder(self.camera, self.material_selector)
-        MainWindow.setTabOrder(self.material_selector, self.view_p)
-        MainWindow.setTabOrder(self.view_p, self.view_z)
-        MainWindow.setTabOrder(self.view_z, self.pan_right)
-        MainWindow.setTabOrder(self.pan_right, self.pan_left)
-        MainWindow.setTabOrder(self.pan_left, self.pan_down)
-        MainWindow.setTabOrder(self.pan_down, self.zoom_out)
-        MainWindow.setTabOrder(self.zoom_out, self.view_clear)
-        MainWindow.setTabOrder(self.view_clear, self.file_select)
-        MainWindow.setTabOrder(self.file_select, self.file_next)
-        MainWindow.setTabOrder(self.file_next, self.file_prev)
-        MainWindow.setTabOrder(self.file_prev, self.file_cancel)
-        MainWindow.setTabOrder(self.file_cancel, self.cam_dia_plus)
-        MainWindow.setTabOrder(self.cam_dia_plus, self.cam_dia_minus)
-        MainWindow.setTabOrder(self.cam_dia_minus, self.cam_zoom_plus)
-        MainWindow.setTabOrder(self.cam_zoom_plus, self.cam_zoom_minus)
-        MainWindow.setTabOrder(self.cam_zoom_minus, self.cam_goto)
-        MainWindow.setTabOrder(self.cam_goto, self.cam_mark)
-        MainWindow.setTabOrder(self.cam_mark, self.run)
-        MainWindow.setTabOrder(self.run, self.pause)
-        MainWindow.setTabOrder(self.pause, self.feed_slider)
-        MainWindow.setTabOrder(self.feed_slider, self.rapid_slider)
-        MainWindow.setTabOrder(self.rapid_slider, self.jog_slider)
-        MainWindow.setTabOrder(self.jog_slider, self.height_lower)
-        MainWindow.setTabOrder(self.height_lower, self.height_raise)
-        MainWindow.setTabOrder(self.height_raise, self.ignore_arc_ok)
-        MainWindow.setTabOrder(self.ignore_arc_ok, self.ohmic_probe_enable)
-        MainWindow.setTabOrder(self.ohmic_probe_enable, self.torch_enable)
-        MainWindow.setTabOrder(self.torch_enable, self.mesh_enable)
-        MainWindow.setTabOrder(self.mesh_enable, self.use_auto_volts)
-        MainWindow.setTabOrder(self.use_auto_volts, self.kerfcross_enable)
-        MainWindow.setTabOrder(self.kerfcross_enable, self.jogincrements)
-        MainWindow.setTabOrder(self.jogincrements, self.jog_slow)
-        MainWindow.setTabOrder(self.jog_slow, self.jog_a_minus)
-        MainWindow.setTabOrder(self.jog_a_minus, self.jog_y_plus)
-        MainWindow.setTabOrder(self.jog_y_plus, self.cornerlock_enable)
-        MainWindow.setTabOrder(self.cornerlock_enable, self.jog_a_plus)
-        MainWindow.setTabOrder(self.jog_a_plus, self.jog_z_minus)
-        MainWindow.setTabOrder(self.jog_z_minus, self.thc_enable)
-        MainWindow.setTabOrder(self.thc_enable, self.pmx485_enable)
-        MainWindow.setTabOrder(self.pmx485_enable, self.jog_x_minus)
-        MainWindow.setTabOrder(self.jog_x_minus, self.jog_x_plus)
-        MainWindow.setTabOrder(self.jog_x_plus, self.cut_rec_rev)
-        MainWindow.setTabOrder(self.cut_rec_rev, self.jog_y_minus)
-        MainWindow.setTabOrder(self.jog_y_minus, self.jog_z_plus)
-        MainWindow.setTabOrder(self.jog_z_plus, self.cut_rec_cancel)
-        MainWindow.setTabOrder(self.cut_rec_cancel, self.cut_rec_speed)
-        MainWindow.setTabOrder(self.cut_rec_speed, self.cut_rec_fwd)
-        MainWindow.setTabOrder(self.cut_rec_fwd, self.cut_rec_se)
-        MainWindow.setTabOrder(self.cut_rec_se, self.cut_rec_s)
-        MainWindow.setTabOrder(self.cut_rec_s, self.cut_rec_nw)
-        MainWindow.setTabOrder(self.cut_rec_nw, self.cut_rec_e)
-        MainWindow.setTabOrder(self.cut_rec_e, self.cut_rec_sw)
+        MainWindow.setTabOrder(self.cone_size, self.table_zoom_scale)
+        MainWindow.setTabOrder(self.table_zoom_scale, self.ub_name_1)
+        MainWindow.setTabOrder(self.ub_name_1, self.ub_code_1)
+        MainWindow.setTabOrder(self.ub_code_1, self.ub_name_2)
+        MainWindow.setTabOrder(self.ub_name_2, self.ub_code_2)
+        MainWindow.setTabOrder(self.ub_code_2, self.ub_name_3)
+        MainWindow.setTabOrder(self.ub_name_3, self.ub_code_3)
+        MainWindow.setTabOrder(self.ub_code_3, self.ub_name_4)
+        MainWindow.setTabOrder(self.ub_name_4, self.ub_code_4)
+        MainWindow.setTabOrder(self.ub_code_4, self.ub_name_5)
+        MainWindow.setTabOrder(self.ub_name_5, self.ub_code_5)
+        MainWindow.setTabOrder(self.ub_code_5, self.ub_name_6)
+        MainWindow.setTabOrder(self.ub_name_6, self.ub_code_6)
+        MainWindow.setTabOrder(self.ub_code_6, self.ub_name_7)
+        MainWindow.setTabOrder(self.ub_name_7, self.ub_code_7)
+        MainWindow.setTabOrder(self.ub_code_7, self.ub_name_8)
+        MainWindow.setTabOrder(self.ub_name_8, self.ub_code_8)
+        MainWindow.setTabOrder(self.ub_code_8, self.ub_name_9)
+        MainWindow.setTabOrder(self.ub_name_9, self.ub_code_9)
+        MainWindow.setTabOrder(self.ub_code_9, self.ub_name_10)
+        MainWindow.setTabOrder(self.ub_name_10, self.ub_code_10)
+        MainWindow.setTabOrder(self.ub_code_10, self.ub_name_11)
+        MainWindow.setTabOrder(self.ub_name_11, self.ub_code_11)
+        MainWindow.setTabOrder(self.ub_code_11, self.ub_name_12)
+        MainWindow.setTabOrder(self.ub_name_12, self.ub_code_12)
+        MainWindow.setTabOrder(self.ub_code_12, self.ub_name_13)
+        MainWindow.setTabOrder(self.ub_name_13, self.ub_code_13)
+        MainWindow.setTabOrder(self.ub_code_13, self.ub_name_14)
+        MainWindow.setTabOrder(self.ub_name_14, self.ub_code_14)
+        MainWindow.setTabOrder(self.ub_code_14, self.ub_name_15)
+        MainWindow.setTabOrder(self.ub_name_15, self.ub_code_15)
+        MainWindow.setTabOrder(self.ub_code_15, self.ub_name_16)
+        MainWindow.setTabOrder(self.ub_name_16, self.ub_code_16)
+        MainWindow.setTabOrder(self.ub_code_16, self.ub_name_17)
+        MainWindow.setTabOrder(self.ub_name_17, self.ub_code_17)
+        MainWindow.setTabOrder(self.ub_code_17, self.ub_name_18)
+        MainWindow.setTabOrder(self.ub_name_18, self.ub_code_18)
+        MainWindow.setTabOrder(self.ub_code_18, self.ub_name_19)
+        MainWindow.setTabOrder(self.ub_name_19, self.ub_code_19)
+        MainWindow.setTabOrder(self.ub_code_19, self.ub_name_20)
+        MainWindow.setTabOrder(self.ub_name_20, self.ub_code_20)
+        MainWindow.setTabOrder(self.ub_code_20, self.sd_text)
 
     def retranslateUi(self, MainWindow):
         _translate = QtCore.QCoreApplication.translate
+        self.screen_options.setProperty("pref_filename_string", _translate("MainWindow", "CONFIGFOLDER/qtvcp.prefs"))
+        self.material_label.setText(_translate("MainWindow", "MATERIAL ="))
         self.velocity_label.setText(_translate("MainWindow", "VEL:"))
         self.open_label.setText(_translate("MainWindow", "OPEN FILE"))
         self.file_select.setText(_translate("MainWindow", "SELECT"))
+        self.file_select.setProperty("true_python_cmd_string", _translate("MainWindow", "INSTANCE.filemanager.load()"))
         self.file_next.setText(_translate("MainWindow", "NEXT"))
+        self.file_next.setProperty("true_python_cmd_string", _translate("MainWindow", "INSTANCE.filemanager.down()"))
         self.file_prev.setText(_translate("MainWindow", "PREV"))
+        self.file_prev.setProperty("true_python_cmd_string", _translate("MainWindow", "INSTANCE.filemanager.up()"))
         self.file_cancel.setText(_translate("MainWindow", "CANCEL"))
         self.edit_label.setText(_translate("MainWindow", "EDIT"))
         self.camview_label.setText(_translate("MainWindow", "CAMVIEW"))
@@ -5470,11 +6670,14 @@ def retranslateUi(self, MainWindow):
 "ORIGIN"))
         self.cam_mark.setText(_translate("MainWindow", "MARK\n"
 "EDGE"))
+        self.webview_back.setText(_translate("MainWindow", "BACK"))
+        self.webview_reload.setText(_translate("MainWindow", "RELOAD"))
+        self.webview_forward.setText(_translate("MainWindow", "FORWARD"))
         self.machine_label.setText(_translate("MainWindow", "MACHINE"))
         self.estop.setText(_translate("MainWindow", "ESTOP"))
         self.power.setText(_translate("MainWindow", "POWER"))
         self.run.setText(_translate("MainWindow", "CYCLE START"))
-        self.pause.setText(_translate("MainWindow", "CYCLE PAUSE"))
+        self.pause_resume.setText(_translate("MainWindow", "CYCLE PAUSE"))
         self.abort.setText(_translate("MainWindow", "CYCLE STOP"))
         self.feed_label.setText(_translate("MainWindow", "FEED"))
         self.rapid_label.setText(_translate("MainWindow", "RAPID"))
@@ -5492,7 +6695,7 @@ def retranslateUi(self, MainWindow):
         self.label_69.setText(_translate("MainWindow", "ENABLE"))
         self.label_59.setText(_translate("MainWindow", "MESH MODE"))
         self.use_auto_volts_lbl.setText(_translate("MainWindow", "AUTO VOLTS"))
-        self.label_72.setText(_translate("MainWindow", "VOID A/DIVE"))
+        self.label_72.setText(_translate("MainWindow", "VOID ANTI DIVE"))
         self.label_73.setText(_translate("MainWindow", "ENABLE"))
         self.label_70.setText(_translate("MainWindow", "VELOCITY ANTI DIVE"))
         self.label_71.setText(_translate("MainWindow", "ENABLE"))
@@ -5509,42 +6712,47 @@ def retranslateUi(self, MainWindow):
         self.jog_label.setText(_translate("MainWindow", "JOGGING"))
         self.jog_slow.setText(_translate("MainWindow", "FAST"))
         self.cut_rec_label.setText(_translate("MainWindow", "CUT RECOVERY"))
-        self.cut_rec_cancel.setText(_translate("MainWindow", "CANCEL"))
+        self.cut_rec_cancel.setText(_translate("MainWindow", "CANCEL\n"
+"MOVE"))
         self.cut_rec_rev.setText(_translate("MainWindow", "REV"))
         self.cut_rec_fwd.setText(_translate("MainWindow", "FWD"))
         self.cut_rec_move_label.setText(_translate("MainWindow", "MOVE"))
+        self.file_clear.setText(_translate("MainWindow", "CLEAR"))
         self.file_open.setText(_translate("MainWindow", "OPEN"))
         self.file_reload.setText(_translate("MainWindow", "RELOAD"))
-        self.gcode_progress.setFormat(_translate("MainWindow", "PROGRESS %p%"))
         self.mdi_label.setText(_translate("MainWindow", "MDI HISTORY"))
         self.dro_label.setText(_translate("MainWindow", "DRO"))
+        self.camera.setText(_translate("MainWindow", "CAMERA"))
+        self.laser.setText(_translate("MainWindow", "LASER"))
+        self.home_b.setText(_translate("MainWindow", "HOME"))
+        self.home_b.setProperty("true_state_string", _translate("MainWindow", "HOME"))
+        self.home_b.setProperty("false_state_string", _translate("MainWindow", "HOME"))
+        self.touch_x.setProperty("dialog_code_string", _translate("MainWindow", "ENTRY"))
         self.touch_y.setProperty("dialog_code_string", _translate("MainWindow", "ENTRY"))
         self.touch_z.setProperty("dialog_code_string", _translate("MainWindow", "ENTRY"))
+        self.home_a.setText(_translate("MainWindow", "HOME"))
+        self.home_a.setProperty("true_state_string", _translate("MainWindow", "HOME"))
+        self.home_a.setProperty("false_state_string", _translate("MainWindow", "HOME"))
         self.home_y.setText(_translate("MainWindow", "HOME"))
-        self.home_y.setProperty("true_state_string", _translate("MainWindow", "UN\n"
-"HOME"))
+        self.home_y.setProperty("true_state_string", _translate("MainWindow", "HOME"))
         self.home_y.setProperty("false_state_string", _translate("MainWindow", "HOME"))
         self.home_x.setText(_translate("MainWindow", "HOME"))
-        self.home_x.setProperty("true_state_string", _translate("MainWindow", "UN\n"
-"HOME"))
+        self.home_x.setProperty("true_state_string", _translate("MainWindow", "HOME"))
         self.home_x.setProperty("false_state_string", _translate("MainWindow", "HOME"))
         self.home_z.setText(_translate("MainWindow", "HOME"))
-        self.home_z.setProperty("true_state_string", _translate("MainWindow", "UN\n"
-"HOME"))
+        self.home_z.setProperty("true_state_string", _translate("MainWindow", "HOME"))
         self.home_z.setProperty("false_state_string", _translate("MainWindow", "HOME"))
-        self.home_a.setText(_translate("MainWindow", "HOME"))
-        self.home_a.setProperty("true_state_string", _translate("MainWindow", "HOME"))
-        self.home_a.setProperty("false_state_string", _translate("MainWindow", "HOME"))
-        self.touch_x.setProperty("dialog_code_string", _translate("MainWindow", "ENTRY"))
         self.home_all.setText(_translate("MainWindow", "HOME ALL"))
         self.home_all.setProperty("true_state_string", _translate("MainWindow", "UN\n"
 "HOME ALL"))
         self.home_all.setProperty("false_state_string", _translate("MainWindow", "HOME ALL"))
-        self.camera.setText(_translate("MainWindow", "CAMERA"))
-        self.laser.setText(_translate("MainWindow", "LASER"))
-        self.home_b.setText(_translate("MainWindow", "HOME"))
-        self.home_b.setProperty("true_state_string", _translate("MainWindow", "HOME"))
-        self.home_b.setProperty("false_state_string", _translate("MainWindow", "HOME"))
+        self.home_c.setText(_translate("MainWindow", "HOME"))
+        self.home_c.setProperty("true_state_string", _translate("MainWindow", "HOME"))
+        self.home_c.setProperty("false_state_string", _translate("MainWindow", "HOME"))
+        self.home_c.setProperty("view_type_string", _translate("MainWindow", "P"))
+        self.dro_label_c.setText(_translate("MainWindow", "C"))
+        self.touch_c.setText(_translate("MainWindow", "0"))
+        self.touch_c.setProperty("axis_letter", _translate("MainWindow", "C"))
         self.main_tab_widget.setTabText(self.main_tab_widget.indexOf(self.main_tab), _translate("MainWindow", "MAIN"))
         self.conv_label.setText(_translate("MainWindow", "CONVERSATIONAL"))
         self.conv_new.setText(_translate("MainWindow", "NEW"))
@@ -5552,7 +6760,9 @@ def retranslateUi(self, MainWindow):
         self.conv_settings.setText(_translate("MainWindow", "SETTINGS"))
         self.conv_send.setText(_translate("MainWindow", "SEND"))
         self.main_tab_widget.setTabText(self.main_tab_widget.indexOf(self.conv_tab), _translate("MainWindow", "CONVERSATIONAL"))
+        self.save_plasma.setText(_translate("MainWindow", "SAVE"))
         self.config_label.setText(_translate("MainWindow", "CONFIGURATION"))
+        self.reload_plasma.setText(_translate("MainWindow", "RELOAD"))
         self.arc_conf_lbl.setText(_translate("MainWindow", "ARC"))
         self.label_19.setText(_translate("MainWindow", "Start Fail Timer"))
         self.label_21.setText(_translate("MainWindow", "Max Starts"))
@@ -5563,20 +6773,25 @@ def retranslateUi(self, MainWindow):
         self.arc_ok_high_lbl.setText(_translate("MainWindow", "OK High Volts"))
         self.arc_ok_low_lbl.setText(_translate("MainWindow", "OK Low Volts"))
         self.thc_conf_lbl.setText(_translate("MainWindow", "THC"))
+        self.thc_sample_threshold_lbl.setText(_translate("MainWindow", "Sample Threshold"))
         self.thc_delay_lbl.setText(_translate("MainWindow", "Delay"))
-        self.thc_threshold_lbl.setText(_translate("MainWindow", "Threshold"))
+        self.pid_d_gain_lbl.setText(_translate("MainWindow", "PID-D"))
+        self.thc_sample_threshold.setSuffix(_translate("MainWindow", " V"))
+        self.thc_auto_lbl.setText(_translate("MainWindow", "Auto Activate"))
         self.pid_p_gain_lbl.setText(_translate("MainWindow", "Speed (PID-P)"))
         self.label_41.setText(_translate("MainWindow", "VAD Threshold"))
-        self.kerfcross_override_lbl.setText(_translate("MainWindow", "Void Override"))
+        self.thc_threshold_lbl.setText(_translate("MainWindow", "Threshold"))
+        self.voidlock_slope_lbl.setText(_translate("MainWindow", "Void Slope"))
         self.pid_i_gain_lbl.setText(_translate("MainWindow", "PID-I"))
-        self.pid_d_gain_lbl.setText(_translate("MainWindow", "PID-D"))
+        self.thc_sample_counts_lbl.setText(_translate("MainWindow", "Sample Counts"))
         self.probe_conf_lbl.setText(_translate("MainWindow", "PROBING"))
-        self.label_2.setText(_translate("MainWindow", "Float Travel"))
-        self.label_14.setText(_translate("MainWindow", "Probe Speed"))
-        self.label_15.setText(_translate("MainWindow", "Probe Height"))
         self.label_16.setText(_translate("MainWindow", "Ohmic Offset"))
         self.label_17.setText(_translate("MainWindow", "Ohmic Retries"))
+        self.label_2.setText(_translate("MainWindow", "Float Travel"))
+        self.label_15.setText(_translate("MainWindow", "Probe Height"))
+        self.label_14.setText(_translate("MainWindow", "Probe Speed"))
         self.label_18.setText(_translate("MainWindow", "Skip IHS"))
+        self.offset_feed_rate_lbl.setText(_translate("MainWindow", "Offset Speed"))
         self.safety_conf_lbl.setText(_translate("MainWindow", "SAFETY"))
         self.label_54.setText(_translate("MainWindow", "Safe Height"))
         self.scribe_conf_lbl.setText(_translate("MainWindow", "SCRIBING"))
@@ -5585,12 +6800,16 @@ def retranslateUi(self, MainWindow):
         self.spotting_conf_lbl.setText(_translate("MainWindow", "SPOTTING"))
         self.label_58.setText(_translate("MainWindow", "Threshold"))
         self.label_60.setText(_translate("MainWindow", "Time On"))
+        self.pierce_conf_lbl.setText(_translate("MainWindow", "PIERCE ONLY"))
+        self.label_63.setText(_translate("MainWindow", "X Offset"))
+        self.label_66.setText(_translate("MainWindow", "Y Offset"))
         self.motion_conf_lbl.setText(_translate("MainWindow", "MOTION"))
-        self.label_62.setText(_translate("MainWindow", "Max. Speed"))
         self.label_61.setText(_translate("MainWindow", "Setup Speed"))
-        self.save_plasma.setText(_translate("MainWindow", "SAVE"))
-        self.reload_plasma.setText(_translate("MainWindow", "RELOAD"))
+        self.save_material.setText(_translate("MainWindow", "SAVE"))
+        self.new_material.setText(_translate("MainWindow", "NEW"))
         self.materials_label.setText(_translate("MainWindow", "MATERIAL"))
+        self.delete_material.setText(_translate("MainWindow", "DELETE"))
+        self.reload_material.setText(_translate("MainWindow", "RELOAD"))
         self.label_9.setText(_translate("MainWindow", "Cut Feed Rate"))
         self.label_65.setText(_translate("MainWindow", "Cut Amps"))
         self.label_5.setText(_translate("MainWindow", "Pierce Height"))
@@ -5603,10 +6822,7 @@ def retranslateUi(self, MainWindow):
         self.cut_mode_label.setText(_translate("MainWindow", "Cut Mode"))
         self.gas_pressure_label.setText(_translate("MainWindow", "Gas Pressure"))
         self.label_74.setText(_translate("MainWindow", "Cut Volts"))
-        self.save_material.setText(_translate("MainWindow", "SAVE"))
-        self.reload_material.setText(_translate("MainWindow", "RELOAD"))
-        self.new_material.setText(_translate("MainWindow", "NEW"))
-        self.delete_material.setText(_translate("MainWindow", "DELETE"))
+        self.main_tab_widget.setTabText(self.main_tab_widget.indexOf(self.param_tab), _translate("MainWindow", "PARAMETERS"))
         self.gui_label.setText(_translate("MainWindow", "GUI SETTINGS"))
         self.color_preview_lbl.setText(_translate("MainWindow", "Preview"))
         self.color_estop_lbl.setText(_translate("MainWindow", "Estop"))
@@ -5617,52 +6833,88 @@ def retranslateUi(self, MainWindow):
         self.color_disabled_lbl.setText(_translate("MainWindow", "Disabled"))
         self.color_foregalt_lbl.setText(_translate("MainWindow", "Highlight"))
         self.color_foregrnd_lbl.setText(_translate("MainWindow", "Foreground"))
-        self.label_26.setText(_translate("MainWindow", "Soft Keyboard"))
         self.label_33.setText(_translate("MainWindow", "KB Shortcuts"))
+        self.label_20.setText(_translate("MainWindow", "View Material"))
         self.label_36.setText(_translate("MainWindow", "Optional Stop"))
+        self.label_46.setText(_translate("MainWindow", "Exit Warning"))
         self.label_37.setText(_translate("MainWindow", "Optional Block"))
+        self.label_26.setText(_translate("MainWindow", "Soft Keyboard"))
+        self.label_38.setText(_translate("MainWindow", "Tool Tips"))
         self.label_42.setText(_translate("MainWindow", "Override Limits"))
+        self.label_48.setText(_translate("MainWindow", "Override Jog"))
         self.label_39.setText(_translate("MainWindow", "Run From Line"))
-        self.label_20.setText(_translate("MainWindow", "View Material"))
-        self.label_38.setText(_translate("MainWindow", "Tool Tips"))
         self.label_13.setText(_translate("MainWindow", "Grid Size"))
+        self.label_40.setText(_translate("MainWindow", "Table Zoom"))
         self.label_10.setText(_translate("MainWindow", "Cone Size"))
+        self.label_51.setText(_translate("MainWindow", "Default Material"))
+        self.ub_save.setText(_translate("MainWindow", "SAVE"))
+        self.ub_label.setText(_translate("MainWindow", "USER BUTTON ENTRIES"))
+        self.ub_reload.setText(_translate("MainWindow", "RELOAD"))
+        self.ub_name.setText(_translate("MainWindow", "Name"))
+        self.ub_code.setText(_translate("MainWindow", "Code"))
+        self.ub_num_9.setText(_translate("MainWindow", "9"))
+        self.ub_num_17.setText(_translate("MainWindow", "17"))
+        self.ub_num_14.setText(_translate("MainWindow", "14"))
+        self.ub_num_19.setText(_translate("MainWindow", "19"))
+        self.ub_num_2.setText(_translate("MainWindow", "2"))
+        self.ub_num_6.setText(_translate("MainWindow", "6"))
+        self.ub_num_15.setText(_translate("MainWindow", "15"))
+        self.ub_num_12.setText(_translate("MainWindow", "12"))
+        self.ub_num_11.setText(_translate("MainWindow", "11"))
+        self.ub_num_1.setText(_translate("MainWindow", "1"))
+        self.ub_num_20.setText(_translate("MainWindow", "20"))
+        self.ub_num_16.setText(_translate("MainWindow", "16"))
+        self.ub_num_10.setText(_translate("MainWindow", "10"))
+        self.ub_num_18.setText(_translate("MainWindow", "18"))
+        self.ub_num_3.setText(_translate("MainWindow", "3"))
+        self.ub_num_13.setText(_translate("MainWindow", "13"))
+        self.ub_num_7.setText(_translate("MainWindow", "7"))
+        self.ub_num_8.setText(_translate("MainWindow", "8"))
+        self.ub_num_5.setText(_translate("MainWindow", "5"))
+        self.ub_num_4.setText(_translate("MainWindow", "4"))
+        self.sd_save.setText(_translate("MainWindow", "SAVE"))
+        self.sd_label.setText(_translate("MainWindow", "SHUTDOWN MESSAGE"))
+        self.sd_reload.setText(_translate("MainWindow", "RELOAD"))
         self.utility_label.setText(_translate("MainWindow", "UTILITIES"))
         self.actionbutton_halshow.setText(_translate("MainWindow", "HAL SHOW"))
         self.actionbutton_halscope.setText(_translate("MainWindow", "HAL SCOPE"))
         self.actionbutton_halmeter.setText(_translate("MainWindow", "HAL METER"))
         self.actionbutton_calibration.setText(_translate("MainWindow", "CALIBRATION"))
-        self.actionbutton_lcnc_status_2.setText(_translate("MainWindow", "STATUS"))
+        self.actionbutton_lcnc_status.setText(_translate("MainWindow", "STATUS"))
+        self.set_offsets.setText(_translate("MainWindow", "SET\n"
+"OFFSETS"))
         self.backup.setText(_translate("MainWindow", "BACKUP\n"
 "CONFIG"))
-        self.main_tab_widget.setTabText(self.main_tab_widget.indexOf(self.param_tab), _translate("MainWindow", "PARAMETERS"))
         self.main_tab_widget.setTabText(self.main_tab_widget.indexOf(self.settings_tab), _translate("MainWindow", "SETTINGS"))
         self.stats_label.setText(_translate("MainWindow", "STATISTICS"))
-        self.all_reset.setText(_translate("MainWindow", "RESET ALL"))
-        self.run_time_reset.setText(_translate("MainWindow", "RESET"))
-        self.label_32.setText(_translate("MainWindow", "PROGRAM RUN TIME"))
-        self.cut_length_label.setText(_translate("MainWindow", "CUT LENGTH"))
-        self.label_25.setText(_translate("MainWindow", "TOTAL"))
-        self.pierce_reset.setText(_translate("MainWindow", "RESET"))
-        self.label_28.setText(_translate("MainWindow", "PIERCE COUNT"))
-        self.cut_time_reset.setText(_translate("MainWindow", "RESET"))
-        self.label_30.setText(_translate("MainWindow", "CUT TIME"))
         self.cut_length_reset.setText(_translate("MainWindow", "RESET"))
+        self.cut_time_reset.setText(_translate("MainWindow", "RESET"))
+        self.label_30.setText(_translate("MainWindow", "CUTTING TIME"))
         self.label_23.setText(_translate("MainWindow", "JOB"))
-        self.torch_time_reset.setText(_translate("MainWindow", "RESET"))
-        self.label_31.setText(_translate("MainWindow", "TORCH ON TIME"))
-        self.label_22.setText(_translate("MainWindow", "ITEM"))
+        self.run_time_reset.setText(_translate("MainWindow", "RESET"))
         self.rapid_time_reset.setText(_translate("MainWindow", "RESET"))
         self.label_34.setText(_translate("MainWindow", "RAPID TIME"))
+        self.label_25.setText(_translate("MainWindow", "TOTAL"))
+        self.torch_time_reset.setText(_translate("MainWindow", "RESET"))
+        self.label_32.setText(_translate("MainWindow", "TOTAL RUN TIME"))
+        self.cut_length_label.setText(_translate("MainWindow", "CUT LENGTH"))
+        self.all_reset.setText(_translate("MainWindow", "RESET ALL"))
+        self.label_28.setText(_translate("MainWindow", "TORCH STARTS"))
+        self.label_22.setText(_translate("MainWindow", "ITEM"))
+        self.pierce_reset.setText(_translate("MainWindow", "RESET"))
+        self.label_31.setText(_translate("MainWindow", "TORCH ON TIME"))
         self.probe_time_reset.setText(_translate("MainWindow", "RESET"))
         self.label_35.setText(_translate("MainWindow", "PROBE TIME"))
+        self.paused_time_reset.setText(_translate("MainWindow", "RESET"))
+        self.label_50.setText(_translate("MainWindow", "PAUSED TIME"))
+        self.paused_time.setText(_translate("MainWindow", "0:00:00"))
+        self.paused_time_t.setText(_translate("MainWindow", "0:00:00"))
         self.pmx_stats_label.setText(_translate("MainWindow", "RS485 PMX STATISTICS"))
         self.label_29.setText(_translate("MainWindow", "TOTAL"))
         self.pmx_arc_time_label.setText(_translate("MainWindow", "ARC ON TIME"))
         self.label_8.setText(_translate("MainWindow", "ITEM"))
         self.machinelog_label.setText(_translate("MainWindow", "MACHINE LOG"))
         self.main_tab_widget.setTabText(self.main_tab_widget.indexOf(self.stats_tab), _translate("MainWindow", "STATISTICS"))
-
 from qtvcp.widgets.action_button import ActionButton
 from qtvcp.widgets.axis_tool_button import AxisToolButton
 from qtvcp.widgets.camview_widget import CamView
@@ -5675,8 +6927,10 @@ def retranslateUi(self, MainWindow):
 from qtvcp.widgets.led_widget import LED
 from qtvcp.widgets.machine_log import MachineLog
 from qtvcp.widgets.mdi_history import MDIHistory
+from qtvcp.widgets.origin_offsetview import OriginOffsetView
 from qtvcp.widgets.screen_options import ScreenOptions
-from qtvcp.widgets.simple_widgets import CheckBox, DoubleScale, PushButton
+from qtvcp.widgets.simple_widgets import CheckBox, DoubleScale, IndicatedPushButton, PushButton
 from qtvcp.widgets.status_label import StatusLabel
 from qtvcp.widgets.status_slider import StatusSlider
 from qtvcp.widgets.system_tool_button import SystemToolButton
+from qtvcp.widgets.web_widget import WebWidget
diff --git a/share/qtvcp/screens/qtplasmac/qtplasmac_handler.py b/share/qtvcp/screens/qtplasmac/qtplasmac_handler.py
index 6cc266837a0..8ad08289388 100644
--- a/share/qtvcp/screens/qtplasmac/qtplasmac_handler.py
+++ b/share/qtvcp/screens/qtplasmac/qtplasmac_handler.py
@@ -1,4 +1,4 @@
-VERSION = '008.054'
+VERSION = '008.055'
 LCNCVER = '2.10'
 DOCSVER = LCNCVER
 
diff --git a/share/qtvcp/screens/qtplasmac/versions.html b/share/qtvcp/screens/qtplasmac/versions.html
index 9345edaea94..f9fd9f9e98a 100644
--- a/share/qtvcp/screens/qtplasmac/versions.html
+++ b/share/qtvcp/screens/qtplasmac/versions.html
@@ -26,6 +26,11 @@ <h2>QtPlasmaC Version History - LinuxCNC 2.10</h2>
 </table>
 <br>
 <!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
+<br><b><u>008.055 2024 Nov 26</u></b>
+<ul style="margin:0;">
+  <li>fix linking and documentation for internationalization</li>
+</ul>
+
 <br><b><u>008.054 2024 Nov 5</u></b>
 <ul style="margin:0;">
   <li>fix tooltip variable name missed in 008.053 (commit bb07323)</li>