diff --git a/Bookmark.py b/Bookmark.py
index 6ba11648..796c1105 100644
--- a/Bookmark.py
+++ b/Bookmark.py
@@ -1,5 +1,5 @@
 from PyQt6 import QtGui, QtCore, QtWidgets
-from appGUI.GUIElements import FCTable, FCEntry, FCButton, FCFileSaveDialog, FCGridLayout, FCLabel
+from appGUI.GUIElements import FCTable, FCEntry, FCButton, FCFileSaveDialog, GLay, FCLabel
 
 import sys
 import webbrowser
@@ -78,7 +78,7 @@ class BookmarkManager(QtWidgets.QWidget):
         new_title_lbl = FCLabel('<b>%s</b>' % _("New Bookmark"))
         new_vlay.addWidget(new_title_lbl)
 
-        grid0 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid0 = GLay(v_spacing=5, h_spacing=3)
         new_vlay.addLayout(grid0)
 
         title_lbl = FCLabel('%s:' % _("Title"))
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 43ee0876..4d168fd6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@ CHANGELOG for FlatCAM Evo beta
 3.04.2022
 
 - in Cutout Plugin exposed the any_cutout_handler() method and made sure that the `gaps` parameter case does not matter
+- some reformatting and class rename
+- when clicking the coordinates toolbars in the status bar now the Distance Plugin is shown and if already displayed, it is closed (toggle action)
 
 2.04.2022
 
@@ -802,7 +804,7 @@ CHANGELOG for FlatCAM Evo beta
 10.09.2021
 
 - minor changes in Film Plugin
-- fixed the FCGridLayout (in GUI elements) method that synchronize the column width for multiple grid layouts when the item on column is spanning multiple columns
+- fixed the GLay (in GUI elements) method that synchronize the column width for multiple grid layouts when the item on column is spanning multiple columns
 - updated the Turkish translation by Mehmet Kaya
 
 9.09.2021
@@ -818,7 +820,7 @@ CHANGELOG for FlatCAM Evo beta
 - on Coppper Thieving Plugin some UI updates
 - updated the GCGridLayout GUi element to automatically stretch the first column but offered also configuration; updated the use throughout the app
 - in Copper Thieving Plugin more UI changes
-- in GUI Elements the FCGridLayout has now a class method that allow adjusting column size in multiple grid layouts to the highest on that column; still work to do to take care of the situation when widgets are spanning multiple cells
+- in GUI Elements the GLay has now a class method that allow adjusting column size in multiple grid layouts to the highest on that column; still work to do to take care of the situation when widgets are spanning multiple cells
 - in Fiducials Plugin added the support for ESCAPE key from manual mode and also exit by right clicking
 - in Fiducials Plugin addressed the situation when no object is selected but there are available
 - in Fiducials Plugin when adding manual fiducials now panning is allowed without cancelling the process of adding
diff --git a/appDatabase.py b/appDatabase.py
index 45fd484b..f2fddc2e 100644
--- a/appDatabase.py
+++ b/appDatabase.py
@@ -1,6 +1,6 @@
 from PyQt6 import QtGui, QtCore, QtWidgets
 from appGUI.GUIElements import FCEntry, FCButton, FCDoubleSpinner, FCComboBox, FCCheckBox, FCSpinner, \
-    FCTree, RadioSet, FCFileSaveDialog, FCLabel, FCComboBox2, FCGridLayout
+    FCTree, RadioSet, FCFileSaveDialog, FCLabel, FCComboBox2, GLay
 from camlib import to_dict
 
 import sys
@@ -195,7 +195,7 @@ class ToolsDB2UI:
         # ###########################################################################
         # ################ Tool UI form #############################################
         # ###########################################################################
-        self.grid_tool = FCGridLayout(v_spacing=5, h_spacing=3)
+        self.grid_tool = GLay(v_spacing=5, h_spacing=3)
         self.description_vlay.addLayout(self.grid_tool)
         self.description_vlay.addStretch()
 
@@ -277,7 +277,7 @@ class ToolsDB2UI:
         # ###########################################################################
         # ############### MILLING UI form ###########################################
         # ###########################################################################
-        self.grid0 = FCGridLayout(v_spacing=5, h_spacing=3)
+        self.grid0 = GLay(v_spacing=5, h_spacing=3)
         self.milling_vlay.addLayout(self.grid0)
         self.milling_vlay.addStretch()
 
@@ -575,7 +575,7 @@ class ToolsDB2UI:
         # ############### NCC UI form ###############################################
         # ###########################################################################
 
-        self.grid2 = FCGridLayout(v_spacing=5, h_spacing=3)
+        self.grid2 = GLay(v_spacing=5, h_spacing=3)
         self.ncc_vlay.addLayout(self.grid2)
         self.ncc_vlay.addStretch()
 
@@ -719,7 +719,7 @@ class ToolsDB2UI:
         # ############### Paint UI form #############################################
         # ###########################################################################
 
-        self.grid3 = FCGridLayout(v_spacing=5, h_spacing=3)
+        self.grid3 = GLay(v_spacing=5, h_spacing=3)
         self.paint_vlay.addLayout(self.grid3)
         self.paint_vlay.addStretch()
 
@@ -806,7 +806,7 @@ class ToolsDB2UI:
         # ############### Isolation UI form #########################################
         # ###########################################################################
 
-        self.grid4 = FCGridLayout(v_spacing=5, h_spacing=3)
+        self.grid4 = GLay(v_spacing=5, h_spacing=3)
         self.iso_vlay.addLayout(self.grid4)
         self.iso_vlay.addStretch()
 
@@ -881,7 +881,7 @@ class ToolsDB2UI:
         # ###########################################################################
         # ################ DRILLING UI form #########################################
         # ###########################################################################
-        self.grid5 = FCGridLayout(v_spacing=5, h_spacing=3)
+        self.grid5 = GLay(v_spacing=5, h_spacing=3)
         self.drill_vlay.addLayout(self.grid5)
         self.drill_vlay.addStretch()
 
@@ -1104,7 +1104,7 @@ class ToolsDB2UI:
         # ###########################################################################
         # ################### Cutout UI form ########################################
         # ###########################################################################
-        self.grid6 = FCGridLayout(v_spacing=5, h_spacing=3)
+        self.grid6 = GLay(v_spacing=5, h_spacing=3)
         self.cutout_vlay.addLayout(self.grid6)
         self.cutout_vlay.addStretch()
 
@@ -1386,7 +1386,7 @@ class ToolsDB2(QtWidgets.QWidget):
         # TOOLS DATABASE UI
         # ##############################################################################
         # ##############################################################################
-        layout = FCGridLayout(v_spacing=5, h_spacing=3)
+        layout = GLay(v_spacing=5, h_spacing=3)
         self.setLayout(layout)
         self.ui = ToolsDB2UI(app=self.app, grid_layout=layout)
 
diff --git a/appEditors/AppExcEditor.py b/appEditors/AppExcEditor.py
index c10a2f8e..e818d20a 100644
--- a/appEditors/AppExcEditor.py
+++ b/appEditors/AppExcEditor.py
@@ -9,7 +9,7 @@ from PyQt6 import QtGui, QtCore, QtWidgets
 from PyQt6.QtCore import Qt
 
 from camlib import distance, arc, AppRTreeStorage
-from appGUI.GUIElements import FCEntry, FCTable, FCDoubleSpinner, RadioSet, FCSpinner, FCButton, FCLabel, FCGridLayout
+from appGUI.GUIElements import FCEntry, FCTable, FCDoubleSpinner, RadioSet, FCSpinner, FCButton, FCLabel, GLay
 from appEditors.AppGeoEditor import FCShapeTool, DrawTool, DrawToolShape, DrawToolUtilityShape, AppGeoEditor
 
 from shapely.geometry import LineString, LinearRing, MultiLineString, Polygon, MultiPolygon, Point
@@ -4093,7 +4093,7 @@ class AppExcEditorUI:
         # #############################################################################################################
         # ######################## ADD New Tool Grid ##################################################################
         # #############################################################################################################
-        grid1 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid1 = GLay(v_spacing=5, h_spacing=3)
         self.ui_vertical_lay.addLayout(grid1)
 
         # Tool Diameter Label
@@ -4145,7 +4145,7 @@ class AppExcEditorUI:
         self.resize_frame.setContentsMargins(0, 0, 0, 0)
         self.ui_vertical_lay.addWidget(self.resize_frame)
 
-        self.resize_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        self.resize_grid = GLay(v_spacing=5, h_spacing=3)
         self.resize_grid.setContentsMargins(0, 0, 0, 0)
         self.resize_frame.setLayout(self.resize_grid)
 
@@ -4199,7 +4199,7 @@ class AppExcEditorUI:
         self.array_frame.setContentsMargins(0, 0, 0, 0)
         self.ui_vertical_lay.addWidget(self.array_frame)
 
-        self.array_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        self.array_grid = GLay(v_spacing=5, h_spacing=3)
         self.array_grid.setContentsMargins(0, 0, 0, 0)
         self.array_frame.setLayout(self.array_grid)
 
@@ -4240,7 +4240,7 @@ class AppExcEditorUI:
         self.array_linear_frame = QtWidgets.QFrame()
         self.array_linear_frame.setContentsMargins(0, 0, 0, 0)
         self.array_grid.addWidget(self.array_linear_frame, 6, 0, 1, 2)
-        self.lin_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        self.lin_grid = GLay(v_spacing=5, h_spacing=3)
         self.lin_grid.setContentsMargins(0, 0, 0, 0)
         self.array_linear_frame.setLayout(self.lin_grid)
 
@@ -4297,7 +4297,7 @@ class AppExcEditorUI:
         self.array_circular_frame.setContentsMargins(0, 0, 0, 0)
         self.array_grid.addWidget(self.array_circular_frame, 8, 0, 1, 2)
 
-        self.circ_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        self.circ_grid = GLay(v_spacing=5, h_spacing=3)
         self.circ_grid.setContentsMargins(0, 0, 0, 0)
         self.array_circular_frame.setLayout(self.circ_grid)
 
@@ -4339,7 +4339,7 @@ class AppExcEditorUI:
         self.slot_frame.setContentsMargins(0, 0, 0, 0)
         self.ui_vertical_lay.addWidget(self.slot_frame)
 
-        self.slot_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        self.slot_grid = GLay(v_spacing=5, h_spacing=3)
         self.slot_grid.setContentsMargins(0, 0, 0, 0)
         self.slot_frame.setLayout(self.slot_grid)
 
@@ -4411,7 +4411,7 @@ class AppExcEditorUI:
         self.slot_array_frame.setContentsMargins(0, 0, 0, 0)
         self.ui_vertical_lay.addWidget(self.slot_array_frame)
 
-        self.slot_array_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        self.slot_array_grid = GLay(v_spacing=5, h_spacing=3)
         self.slot_array_grid.setContentsMargins(0, 0, 0, 0)
         self.slot_array_frame.setLayout(self.slot_array_grid)
 
@@ -4453,7 +4453,7 @@ class AppExcEditorUI:
         self.slot_array_linear_frame.setContentsMargins(0, 0, 0, 0)
         self.slot_array_grid.addWidget(self.slot_array_linear_frame, 6, 0, 1, 2)
 
-        self.slot_array_lin_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        self.slot_array_lin_grid = GLay(v_spacing=5, h_spacing=3)
         self.slot_array_lin_grid.setContentsMargins(0, 0, 0, 0)
         self.slot_array_linear_frame.setLayout(self.slot_array_lin_grid)
 
@@ -4511,7 +4511,7 @@ class AppExcEditorUI:
         self.slot_array_circular_frame.setContentsMargins(0, 0, 0, 0)
         self.slot_array_grid.addWidget(self.slot_array_circular_frame, 8, 0, 1, 2)
 
-        self.slot_array_circ_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        self.slot_array_circ_grid = GLay(v_spacing=5, h_spacing=3)
         self.slot_array_circ_grid.setContentsMargins(0, 0, 0, 0)
         self.slot_array_circular_frame.setLayout(self.slot_array_circ_grid)
 
diff --git a/appEditors/AppGeoEditor.py b/appEditors/AppGeoEditor.py
index 4bac22b8..9de3f550 100644
--- a/appEditors/AppGeoEditor.py
+++ b/appEditors/AppGeoEditor.py
@@ -20,7 +20,7 @@ from camlib import distance, arc, three_point_circle, Geometry, AppRTreeStorage,
 from appTool import AppTool
 from appGUI.GUIElements import OptionalInputSection, FCCheckBox, FCLabel, FCComboBox, FCTextAreaRich, \
     FCDoubleSpinner, FCButton, FCInputDoubleSpinner, FCTree, NumericalEvalTupleEntry, FCEntry, FCTextEdit, \
-    VerticalScrollArea, FCGridLayout
+    VerticalScrollArea, GLay
 from appParsers.ParseFont import *
 
 from vispy.geometry import Rect
@@ -83,7 +83,7 @@ class BufferSelectionTool(AppTool):
         self.buffer_tool_frame.setLayout(self.buffer_tools_box)
 
         # Grid Layout
-        grid_buffer = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid_buffer = GLay(v_spacing=5, h_spacing=3)
         self.buffer_tools_box.addLayout(grid_buffer)
 
         # Buffer distance
@@ -265,7 +265,7 @@ class TextInputTool(AppTool):
         self.text_tools_box.addWidget(title_label)
 
         # Grid Layout
-        self.grid_text = FCGridLayout(v_spacing=5, h_spacing=3)
+        self.grid_text = GLay(v_spacing=5, h_spacing=3)
         self.text_tools_box.addLayout(self.grid_text)
 
         # Font type
@@ -501,7 +501,7 @@ class PaintOptionsTool(AppTool):
                         """)
         self.layout.addWidget(title_label)
 
-        grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid = GLay(v_spacing=5, h_spacing=3)
         self.layout.addLayout(grid)
 
         # Tool dia
@@ -729,7 +729,7 @@ class TransformEditorTool(AppTool):
         self.layout.addWidget(FCLabel(''))
 
         # ## Layout
-        grid0 = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0, 1, 0])
+        grid0 = GLay(v_spacing=5, h_spacing=3, c_stretch=[0, 1, 0])
         self.layout.addLayout(grid0)
 
         grid0.addWidget(FCLabel(''))
@@ -3452,7 +3452,7 @@ class AppGeoEditor(QtCore.QObject):
         self.level.setCheckable(True)
         self.title_box.addWidget(self.level)
 
-        self.grid_d = FCGridLayout(v_spacing=5, h_spacing=3)
+        self.grid_d = GLay(v_spacing=5, h_spacing=3)
         self.tools_box.addLayout(self.grid_d)
 
         # Tool diameter
@@ -3494,7 +3494,7 @@ class AppGeoEditor(QtCore.QObject):
         self.adv_frame.setContentsMargins(0, 0, 0, 0)
         self.tools_box.addWidget(self.adv_frame)
 
-        grid0 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid0 = GLay(v_spacing=5, h_spacing=3)
         grid0.setContentsMargins(0, 0, 0, 0)
         self.adv_frame.setLayout(grid0)
 
diff --git a/appEditors/AppGerberEditor.py b/appEditors/AppGerberEditor.py
index 7b9994fc..ff69093a 100644
--- a/appEditors/AppGerberEditor.py
+++ b/appEditors/AppGerberEditor.py
@@ -20,7 +20,7 @@ import logging
 from camlib import distance, arc, three_point_circle, flatten_shapely_geometry
 from appGUI.GUIElements import FCEntry, FCComboBox, FCTable, FCDoubleSpinner, FCSpinner, RadioSet, EvalEntry2, \
     FCInputDoubleSpinner, FCButton, OptionalInputSection, FCCheckBox, NumericalEvalTupleEntry, FCLabel, FCTextEdit, \
-    VerticalScrollArea, FCGridLayout
+    VerticalScrollArea, GLay
 from appTool import AppTool
 
 import numpy as np
@@ -6213,7 +6213,7 @@ class AppGerberEditorUI:
         # #############################################################################################################
         # ############################ Add/Delete an new Aperture #####################################################
         # #############################################################################################################
-        grid1 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid1 = GLay(v_spacing=5, h_spacing=3)
         self.apertures_box.addLayout(grid1)
 
         # Title
@@ -6312,7 +6312,7 @@ class AppGerberEditorUI:
         self.shape_frame.setContentsMargins(0, 0, 0, 0)
         self.custom_box.addWidget(self.shape_frame)
 
-        self.shape_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        self.shape_grid = GLay(v_spacing=5, h_spacing=3)
         self.shape_grid.setContentsMargins(0, 0, 0, 0)
         self.shape_frame.setLayout(self.shape_grid)
 
@@ -6332,7 +6332,7 @@ class AppGerberEditorUI:
         )
         self.shape_grid.addWidget(param_title, 4, 0, 1, 3)
 
-        p_grid = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0, 0, 0, 1, 0])
+        p_grid = GLay(v_spacing=5, h_spacing=3, c_stretch=[0, 0, 0, 1, 0])
 
         # Is Valid
         valid_lbl = FCLabel('<b>%s</b>:' % _("Valid"))
@@ -6444,7 +6444,7 @@ class AppGerberEditorUI:
         self.buffer_tools_box.addWidget(buf_title_lbl)
 
         # Grid Layout
-        buff_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        buff_grid = GLay(v_spacing=5, h_spacing=3)
         self.buffer_tools_box.addLayout(buff_grid)
 
         # Buffer distance
@@ -6502,7 +6502,7 @@ class AppGerberEditorUI:
         self.scale_tools_box.addWidget(scale_title_lbl)
 
         # Grid Layout
-        scale_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        scale_grid = GLay(v_spacing=5, h_spacing=3)
         self.scale_tools_box.addLayout(scale_grid)
 
         self.scale_factor_lbl = FCLabel('%s:' % _("Scale factor"))
@@ -6551,7 +6551,7 @@ class AppGerberEditorUI:
         self.ma_tools_box.addWidget(ma_title_lbl)
 
         # Form Layout
-        mark_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        mark_grid = GLay(v_spacing=5, h_spacing=3)
         self.ma_tools_box.addLayout(mark_grid)
 
         # Upper Threshold
@@ -6620,7 +6620,7 @@ class AppGerberEditorUI:
         separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
         self.array_box.addWidget(separator_line)
 
-        array_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        array_grid = GLay(v_spacing=5, h_spacing=3)
         self.array_box.addLayout(array_grid)
 
         # Title
@@ -6795,7 +6795,7 @@ class TransformEditorTool(AppTool):
         self.layout.addWidget(FCLabel(''))
 
         # ## Layout
-        grid0 = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0, 1, 0])
+        grid0 = GLay(v_spacing=5, h_spacing=3, c_stretch=[0, 1, 0])
         self.layout.addLayout(grid0)
 
         grid0.addWidget(FCLabel(''))
diff --git a/appEditors/appGCodeEditor.py b/appEditors/appGCodeEditor.py
index 4370a544..d1728191 100644
--- a/appEditors/appGCodeEditor.py
+++ b/appEditors/appGCodeEditor.py
@@ -7,7 +7,7 @@
 
 from appEditors.AppTextEditor import AppTextEditor
 from appObjects.CNCJobObject import CNCJobObject
-from appGUI.GUIElements import FCTextArea, FCEntry, FCButton, FCTable, FCGridLayout, FCLabel
+from appGUI.GUIElements import FCTextArea, FCEntry, FCButton, FCTable, GLay, FCLabel
 from PyQt6 import QtWidgets, QtCore, QtGui
 
 # from io import StringIO
@@ -835,7 +835,7 @@ class AppGCodeEditorUI:
         self.snippet_frame.setContentsMargins(0, 0, 0, 0)
         self.edit_box.addWidget(self.snippet_frame)
 
-        self.snippet_grid = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0, 0])
+        self.snippet_grid = GLay(v_spacing=5, h_spacing=3, c_stretch=[0, 0])
         self.snippet_grid.setContentsMargins(0, 0, 0, 0)
         self.snippet_frame.setLayout(self.snippet_grid)
 
diff --git a/appGUI/GUIElements.py b/appGUI/GUIElements.py
index 0847cee6..1ef72cc8 100644
--- a/appGUI/GUIElements.py
+++ b/appGUI/GUIElements.py
@@ -2585,7 +2585,7 @@ class DialogBoxChoice(QtWidgets.QDialog):
         self.setWindowTitle(str(title))
         self.setWindowFlags(self.windowFlags() | Qt.WindowType.FramelessWindowHint | Qt.WindowType.WindowSystemMenuHint)
 
-        grid0 = FCGridLayout(parent=self, h_spacing=5, v_spacing=5)
+        grid0 = GLay(parent=self, h_spacing=5, v_spacing=5)
         main_label = FCLabel(str(title))
         grid0.addWidget(main_label, 0, 0)
 
@@ -4262,7 +4262,7 @@ class DialogBoxRadio(QtWidgets.QDialog):
         self.setWindowIcon(icon)
         self.setWindowTitle(str(title))
 
-        grid0 = FCGridLayout(parent=self, h_spacing=5, v_spacing=5)
+        grid0 = GLay(parent=self, h_spacing=5, v_spacing=5)
 
         self.ref_label = FCLabel('%s:' % _("Reference"))
         self.ref_label.setToolTip(
@@ -5119,7 +5119,7 @@ class FCJog(QtWidgets.QFrame):
         self.setLineWidth(1)
 
         # JOG axes
-        grbl_jog_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        grbl_jog_grid = GLay(v_spacing=5, h_spacing=3)
         grbl_jog_grid.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
         grbl_jog_grid.setSizeConstraint(QtWidgets.QLayout.SizeConstraint.SetMinimumSize)
         grbl_jog_grid.setContentsMargins(2, 4, 2, 4)
@@ -5198,7 +5198,7 @@ class FCZeroAxes(QtWidgets.QFrame):
         self.setLineWidth(1)
 
         # Zero the axes
-        grbl_zero_grid = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0, 0])
+        grbl_zero_grid = GLay(v_spacing=5, h_spacing=3, c_stretch=[0, 0])
         grbl_zero_grid.setContentsMargins(2, 4, 2, 4)
         # grbl_zero_grid.setRowStretch(4, 1)
         self.setLayout(grbl_zero_grid)
@@ -5412,14 +5412,14 @@ class FlatCAMActivityView(QtWidgets.QWidget):
         self.text.setText(msg)
 
 
-class FlatCAMInfoBar(QtWidgets.QWidget):
+class AppInfoBar(QtWidgets.QWidget):
     """
     This class create a place to display the App messages in the Status Bar
     """
     clicked = QtCore.pyqtSignal(bool)
 
     def __init__(self, parent=None, app=None):
-        super(FlatCAMInfoBar, self).__init__(parent=parent)
+        super(AppInfoBar, self).__init__(parent=parent)
 
         self.app = app
 
@@ -5481,15 +5481,58 @@ class FlatCAMInfoBar(QtWidgets.QWidget):
                 else:
                     self.icon.setPixmap(self.gray_pmap)
             except Exception as e:
-                self.app.log.error("FlatCAMInfoBar.set_status() set Icon --> %s" % str(e))
+                self.app.log.error("AppInfoBar.set_status() set Icon --> %s" % str(e))
 
         try:
             self.set_text_(text)
         except Exception as e:
-            self.app.log.error("FlatCAMInfoBar.set_status() set Text --> %s" % str(e))
+            self.app.log.error("AppInfoBar.set_status() set Text --> %s" % str(e))
 
 
-class FlatCAMSystemTray(QtWidgets.QSystemTrayIcon):
+class CoordsToolbar(QtWidgets.QToolBar):
+    """
+        This class create a place to display the coordinates
+        """
+    clicked = QtCore.pyqtSignal(bool)
+
+    def __init__(self, title: str, parent=None, app=None):
+        super(CoordsToolbar, self).__init__(title, parent=parent)
+
+        self.app = app
+
+        # for the usage of this label as a clickable label, to know that current state
+        self.clicked_state = False
+
+    def mousePressEvent(self, event):
+        if event.button() == Qt.MouseButton.LeftButton:
+            self.clicked_state = not self.clicked_state
+            self.clicked.emit(self.clicked_state)
+
+    def addWidget(self, widget: QtWidgets.QWidget) -> QtGui.QAction:
+        try:
+            widget.clicked.connect(lambda x: self.clicked.emit(x))
+        except AttributeError:
+            pass
+        return super().addWidget(widget)
+
+    def set_text(self, text):
+        self.setWindowTitle(text)
+        self.setToolTip(text)
+
+    def set_font(self, bold=None, size=None):
+        f = QtGui.QFont()
+        if bold:
+            f.setBold(bold)
+        if size:
+            f.setPointSize(size)
+        self.setFont(f)
+
+    def set_color(self, color):
+        if color:
+            self.setStyleSheet('QtWidgets.QToolBar {color: %s}' % str(color))
+
+
+class AppSystemTray(QtWidgets.QSystemTrayIcon):
     """
     This class create the Sys Tray icon for the app
     """
@@ -5572,7 +5615,7 @@ class FlatCAMSystemTray(QtWidgets.QSystemTrayIcon):
         exitAction.triggered.connect(self.app.final_save)
 
 
-class FCGridLayout(QtWidgets.QGridLayout):
+class GLay(QtWidgets.QGridLayout):
 
     def __init__(self, *args, v_spacing=None, h_spacing=None, c_stretch=None, margins=None, parent=None):
         """
@@ -5614,7 +5657,7 @@ class FCGridLayout(QtWidgets.QGridLayout):
     def set_common_column_size(grid_layout_list, column):
         """
 
-        :param grid_layout_list:    list of FCGridLayout
+        :param grid_layout_list:    list of GLay
         :type grid_layout_list      list
         :param column:              the column for which to make the size the same in all grid_grid_layout_list; int
 
diff --git a/appGUI/MainGUI.py b/appGUI/MainGUI.py
index 2f3e71a2..653ce1b9 100644
--- a/appGUI/MainGUI.py
+++ b/appGUI/MainGUI.py
@@ -983,11 +983,11 @@ class MainGUI(QtWidgets.QMainWindow):
         self.addToolBar(self.grb_edit_toolbar)
 
         # ### INFOBAR TOOLBARS ###################################################
-        self.delta_coords_toolbar = QtWidgets.QToolBar(_('Delta Coordinates Toolbar'))
+        self.delta_coords_toolbar = CoordsToolbar(_('Delta Coordinates Toolbar'))
         self.delta_coords_toolbar.setObjectName('Delta_Coords_TB')
         self.delta_coords_toolbar.setStyleSheet("QToolBar{spacing:0px;}")
 
-        self.coords_toolbar = QtWidgets.QToolBar(_('Coordinates Toolbar'))
+        self.coords_toolbar = CoordsToolbar(_('Coordinates Toolbar'))
         self.coords_toolbar.setObjectName('Coords_TB')
         self.coords_toolbar.setStyleSheet("QToolBar{spacing:0px;}")
 
@@ -1876,7 +1876,8 @@ class MainGUI(QtWidgets.QMainWindow):
         # ########################## INFO BAR # ##################################
         # ########################################################################
         self.infobar = self.statusBar()
-        self.fcinfo = FlatCAMInfoBar(app=self.app)
+        self.fcinfo = AppInfoBar(app=self.app)
+
         self.infobar.addWidget(self.fcinfo, stretch=1)
 
         self.infobar.addWidget(self.delta_coords_toolbar)
@@ -2024,6 +2025,8 @@ class MainGUI(QtWidgets.QMainWindow):
 
         self.wplace_label.clicked.connect(self.app.on_workspace_toggle)
         self.fcinfo.clicked.connect(self.toggle_shell_ui)
+        self.coords_toolbar.clicked.connect(self.app.on_gui_coords_clicked)
+        self.delta_coords_toolbar.clicked.connect(self.app.on_gui_coords_clicked)
 
         # to be used in the future
         # self.plot_tab_area.tab_attached.connect(lambda x: print(x))
@@ -2780,7 +2783,8 @@ class MainGUI(QtWidgets.QMainWindow):
 
             # hide all Toolbars
             for tb in self.findChildren(QtWidgets.QToolBar):
-                tb.setVisible(False)
+                if isinstance(tb, QtWidgets.QToolBar):
+                    tb.setVisible(False)
 
             self.coords_toolbar.setVisible(self.app.defaults["global_coordsbar_show"])
             self.delta_coords_toolbar.setVisible(self.app.defaults["global_delta_coordsbar_show"])
diff --git a/appGUI/ObjectUI.py b/appGUI/ObjectUI.py
index 9544a207..3f162c48 100644
--- a/appGUI/ObjectUI.py
+++ b/appGUI/ObjectUI.py
@@ -99,7 +99,7 @@ class ObjectUI(QtWidgets.QWidget):
             trans_frame = FCFrame()
             layout.addWidget(trans_frame)
 
-            self.common_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+            self.common_grid = GLay(v_spacing=5, h_spacing=3)
             self.common_grid.setColumnStretch(0, 1)
             self.common_grid.setColumnStretch(1, 0)
             trans_frame.setLayout(self.common_grid)
@@ -193,7 +193,7 @@ class GerberObjectUI(ObjectUI):
         self.custom_box.addWidget(gen_frame)
 
         # Plot options
-        plot_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        plot_grid = GLay(v_spacing=5, h_spacing=3)
         plot_grid.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeft | QtCore.Qt.AlignmentFlag.AlignVCenter)
         gen_frame.setLayout(plot_grid)
 
@@ -292,7 +292,7 @@ class GerberObjectUI(ObjectUI):
         self.custom_box.addWidget(self.tt_frame)
 
         # Grid Layout
-        tt_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        tt_grid = GLay(v_spacing=5, h_spacing=3)
         self.tt_frame.setLayout(tt_grid)
 
         # ### Gerber Apertures ####
@@ -378,7 +378,7 @@ class GerberObjectUI(ObjectUI):
         self.custom_box.addWidget(plugins_frame)
 
         # Grid Layout
-        plugins_grid = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0, 0])
+        plugins_grid = GLay(v_spacing=5, h_spacing=3, c_stretch=[0, 0])
         plugins_frame.setLayout(plugins_grid)
 
         # Isolation Tool - will create isolation paths around the copper features
@@ -495,7 +495,7 @@ class GerberObjectUI(ObjectUI):
         ncc_frame = FCFrame()
         self.util_box.addWidget(ncc_frame)
 
-        grid_ncc = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid_ncc = GLay(v_spacing=5, h_spacing=3)
         ncc_frame.setLayout(grid_ncc)
 
         # Margin
@@ -542,7 +542,7 @@ class GerberObjectUI(ObjectUI):
         self.util_box.addWidget(bb_frame)
 
         # Grid Layout
-        grid_bb = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid_bb = GLay(v_spacing=5, h_spacing=3)
         bb_frame.setLayout(grid_bb)
 
         bbmargin = FCLabel('%s:' % _('Boundary Margin'))
@@ -612,7 +612,7 @@ class ExcellonObjectUI(ObjectUI):
         self.custom_box.addWidget(gen_frame)
 
         # Plot options
-        plot_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        plot_grid = GLay(v_spacing=5, h_spacing=3)
         plot_grid.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeft | QtCore.Qt.AlignmentFlag.AlignVCenter)
         gen_frame.setLayout(plot_grid)
 
@@ -695,7 +695,7 @@ class ExcellonObjectUI(ObjectUI):
         self.tools_table_label.setToolTip(_("Tools/apertures in the loaded object."))
         self.custom_box.addWidget(self.tools_table_label)
 
-        tt_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        tt_grid = GLay(v_spacing=5, h_spacing=3)
         tt_grid.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeft | QtCore.Qt.AlignmentFlag.AlignVCenter)
         self.custom_box.addLayout(tt_grid)
 
@@ -783,7 +783,7 @@ class ExcellonObjectUI(ObjectUI):
         plugins_frame = FCFrame()
         self.custom_box.addWidget(plugins_frame)
 
-        plugins_grid = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0, 0])
+        plugins_grid = GLay(v_spacing=5, h_spacing=3, c_stretch=[0, 0])
         plugins_frame.setLayout(plugins_grid)
 
         # Drilling Tool - will create GCode for drill holes
@@ -855,7 +855,7 @@ class ExcellonObjectUI(ObjectUI):
         mill_frame = FCFrame()
         self.util_box.addWidget(mill_frame)
 
-        grid_mill = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid_mill = GLay(v_spacing=5, h_spacing=3)
         mill_frame.setLayout(grid_mill)
 
         self.tdlabel = FCLabel('%s:' % _('Milling Diameter'))
@@ -949,7 +949,7 @@ class GeometryObjectUI(ObjectUI):
         self.custom_box.addWidget(gen_frame)
 
         # Plot options
-        plot_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        plot_grid = GLay(v_spacing=5, h_spacing=3)
         plot_grid.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeft | QtCore.Qt.AlignmentFlag.AlignVCenter)
         gen_frame.setLayout(plot_grid)
 
@@ -1029,7 +1029,7 @@ class GeometryObjectUI(ObjectUI):
         self.custom_box.addWidget(self.tt_frame)
 
         # Grid Layout
-        tt_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        tt_grid = GLay(v_spacing=5, h_spacing=3)
         self.tt_frame.setLayout(tt_grid)
 
         # ### Tools ####
@@ -1109,7 +1109,7 @@ class GeometryObjectUI(ObjectUI):
         plugins_frame = FCFrame()
         self.custom_box.addWidget(plugins_frame)
 
-        plugins_grid = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0, 0])
+        plugins_grid = GLay(v_spacing=5, h_spacing=3, c_stretch=[0, 0])
         plugins_frame.setLayout(plugins_grid)
 
         # Milling Tool - will create GCode for slot holes
@@ -1191,7 +1191,7 @@ class GeometryObjectUI(ObjectUI):
         sim_frame = FCFrame()
         self.util_box.addWidget(sim_frame)
 
-        grid_sim = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid_sim = GLay(v_spacing=5, h_spacing=3)
         sim_frame.setLayout(grid_sim)
 
         # Vertex Points
@@ -1291,7 +1291,7 @@ class CNCObjectUI(ObjectUI):
         self.custom_box.addWidget(gen_frame)
 
         # Plot options
-        grid0 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid0 = GLay(v_spacing=5, h_spacing=3)
         grid0.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeft | QtCore.Qt.AlignmentFlag.AlignVCenter)
         gen_frame.setLayout(grid0)
 
@@ -1376,12 +1376,12 @@ class CNCObjectUI(ObjectUI):
         self.gp_frame.setSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Minimum)
         self.custom_box.addWidget(self.gp_frame)
 
-        grid_par = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid_par = GLay(v_spacing=5, h_spacing=3)
         self.gp_frame.setLayout(grid_par)
 
         self.estimated_frame = QtWidgets.QFrame()
         self.estimated_frame.setContentsMargins(0, 0, 0, 0)
-        estimated_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        estimated_grid = GLay(v_spacing=5, h_spacing=3)
         estimated_grid.setContentsMargins(0, 0, 0, 0)
         self.estimated_frame.setLayout(estimated_grid)
         grid_par.addWidget(self.estimated_frame, 4, 0, 1, 3)
@@ -1449,7 +1449,7 @@ class CNCObjectUI(ObjectUI):
         self.custom_box.addWidget(self.tt_frame)
 
         # Grid Layout
-        grid1 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid1 = GLay(v_spacing=5, h_spacing=3)
         self.tt_frame.setLayout(grid1)
 
         hlay = QtWidgets.QHBoxLayout()
@@ -1702,7 +1702,7 @@ class DocumentObjectUI(ObjectUI):
         # ############ Grid LAYOUT #####################################
         # ##############################################################
 
-        self.grid0 = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0, 1, 0])
+        self.grid0 = GLay(v_spacing=5, h_spacing=3, c_stretch=[0, 1, 0])
         self.custom_box.addLayout(self.grid0)
 
         # Font
diff --git a/appGUI/preferences/OptionUI.py b/appGUI/preferences/OptionUI.py
index c83dacae..fd645a14 100644
--- a/appGUI/preferences/OptionUI.py
+++ b/appGUI/preferences/OptionUI.py
@@ -4,7 +4,7 @@ from PyQt6 import QtWidgets, QtGui
 from PyQt6.QtCore import QSettings
 
 from appGUI.GUIElements import RadioSet, FCCheckBox, FCButton, FCComboBox, FCEntry, FCSpinner, FCColorEntry, \
-    FCSliderWithSpinner, FCDoubleSpinner, FloatEntry, FCTextArea, FCLabel, FCGridLayout
+    FCSliderWithSpinner, FCDoubleSpinner, FloatEntry, FCTextArea, FCLabel, GLay
 
 import gettext
 import appTranslation as fcTranslate
diff --git a/appGUI/preferences/OptionsGroupUI.py b/appGUI/preferences/OptionsGroupUI.py
index 51ffbc12..0502e47a 100644
--- a/appGUI/preferences/OptionsGroupUI.py
+++ b/appGUI/preferences/OptionsGroupUI.py
@@ -14,7 +14,7 @@ import appTranslation as fcTranslate
 import builtins
 
 from appGUI.preferences.OptionUI import OptionUI
-from appGUI.GUIElements import FCGridLayout
+from appGUI.GUIElements import GLay
 
 fcTranslate.apply_language('strings')
 if '_' not in builtins.__dict__:
@@ -48,7 +48,7 @@ class OptionsGroupUI2(OptionsGroupUI):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
-        self.grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        self.grid = GLay(v_spacing=5, h_spacing=3)
         self.layout.addLayout(self.grid)
 
         self.options = self.build_options()
diff --git a/appGUI/preferences/cncjob/CNCJobAdvOptPrefGroupUI.py b/appGUI/preferences/cncjob/CNCJobAdvOptPrefGroupUI.py
index 40e96081..217ffbcd 100644
--- a/appGUI/preferences/cncjob/CNCJobAdvOptPrefGroupUI.py
+++ b/appGUI/preferences/cncjob/CNCJobAdvOptPrefGroupUI.py
@@ -1,6 +1,6 @@
 from PyQt6 import QtGui
 
-from appGUI.GUIElements import FCSpinner, FCColorEntry, FCLabel, FCGridLayout, FCFrame
+from appGUI.GUIElements import FCSpinner, FCColorEntry, FCLabel, GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 import gettext
 import appTranslation as fcTranslate
@@ -33,7 +33,7 @@ class CNCJobAdvOptPrefGroupUI(OptionsGroupUI):
         param_frame = FCFrame()
         self.layout.addWidget(param_frame)
 
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         param_frame.setLayout(param_grid)
 
         # Annotation Font Size
diff --git a/appGUI/preferences/cncjob/CNCJobGenPrefGroupUI.py b/appGUI/preferences/cncjob/CNCJobGenPrefGroupUI.py
index 5e36c1b9..57ddd6fb 100644
--- a/appGUI/preferences/cncjob/CNCJobGenPrefGroupUI.py
+++ b/appGUI/preferences/cncjob/CNCJobGenPrefGroupUI.py
@@ -1,7 +1,7 @@
 from PyQt6 import QtGui
 
 from appGUI.GUIElements import FCCheckBox, RadioSet, FCSpinner, FCDoubleSpinner, FCSliderWithSpinner, FCColorEntry, \
-    FCLabel, FCGridLayout, FCFrame
+    FCLabel, GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 import gettext
 import appTranslation as fcTranslate
@@ -30,7 +30,7 @@ class CNCJobGenPrefGroupUI(OptionsGroupUI):
         plot_frame = FCFrame()
         self.layout.addWidget(plot_frame)
 
-        plot_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        plot_grid = GLay(v_spacing=5, h_spacing=3)
         plot_frame.setLayout(plot_grid)
 
         # Plot CB
@@ -76,7 +76,7 @@ class CNCJobGenPrefGroupUI(OptionsGroupUI):
         dec_frame = FCFrame()
         self.layout.addWidget(dec_frame)
 
-        dec_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        dec_grid = GLay(v_spacing=5, h_spacing=3)
         dec_frame.setLayout(dec_grid)
 
         # Number of decimals to use in GCODE coordinates
@@ -147,7 +147,7 @@ class CNCJobGenPrefGroupUI(OptionsGroupUI):
         travel_frame = FCFrame()
         self.layout.addWidget(travel_frame)
 
-        travel_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        travel_grid = GLay(v_spacing=5, h_spacing=3)
         travel_frame.setLayout(travel_grid)
 
         # Plot Line Color
@@ -196,7 +196,7 @@ class CNCJobGenPrefGroupUI(OptionsGroupUI):
         obj_frame = FCFrame()
         self.layout.addWidget(obj_frame)
 
-        obj_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        obj_grid = GLay(v_spacing=5, h_spacing=3)
         obj_frame.setLayout(obj_grid)
 
         # Plot Line Color
@@ -221,7 +221,7 @@ class CNCJobGenPrefGroupUI(OptionsGroupUI):
         obj_grid.addWidget(self.fill_color_label, 2, 0)
         obj_grid.addWidget(self.fill_color_entry, 2, 1)
 
-        FCGridLayout.set_common_column_size([plot_grid, dec_grid, travel_grid, obj_grid], 0)
+        GLay.set_common_column_size([plot_grid, dec_grid, travel_grid, obj_grid], 0)
 
         self.layout.addStretch()
 
diff --git a/appGUI/preferences/cncjob/CNCJobOptPrefGroupUI.py b/appGUI/preferences/cncjob/CNCJobOptPrefGroupUI.py
index f2a83337..e3a222e1 100644
--- a/appGUI/preferences/cncjob/CNCJobOptPrefGroupUI.py
+++ b/appGUI/preferences/cncjob/CNCJobOptPrefGroupUI.py
@@ -1,7 +1,7 @@
 from PyQt6 import QtGui
 from PyQt6.QtCore import QSettings
 
-from appGUI.GUIElements import RadioSet, FCCheckBox, FCLabel, FCGridLayout, FCFrame
+from appGUI.GUIElements import RadioSet, FCCheckBox, FCLabel, GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -43,7 +43,7 @@ class CNCJobOptPrefGroupUI(OptionsGroupUI):
         gcode_frame = FCFrame()
         self.layout.addWidget(gcode_frame)
 
-        gcode_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        gcode_grid = GLay(v_spacing=5, h_spacing=3)
         gcode_frame.setLayout(gcode_grid)
 
         # Plot Kind
diff --git a/appGUI/preferences/cncjob/CNCJobPPGroupUI.py b/appGUI/preferences/cncjob/CNCJobPPGroupUI.py
index 8cc607ea..9ddc875e 100644
--- a/appGUI/preferences/cncjob/CNCJobPPGroupUI.py
+++ b/appGUI/preferences/cncjob/CNCJobPPGroupUI.py
@@ -1,6 +1,6 @@
 from PyQt6 import QtWidgets
 
-from appGUI.GUIElements import FCDoubleSpinner, FCLabel, FCGridLayout, FCFrame
+from appGUI.GUIElements import FCDoubleSpinner, FCLabel, GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 import gettext
 import appTranslation as fcTranslate
@@ -31,7 +31,7 @@ class CNCJobPPGroupUI(OptionsGroupUI):
         comp_frame = FCFrame()
         self.layout.addWidget(comp_frame)
 
-        comp_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        comp_grid = GLay(v_spacing=5, h_spacing=3)
         comp_frame.setLayout(comp_grid)
 
         # Bed Size X
diff --git a/appGUI/preferences/excellon/ExcellonAdvOptPrefGroupUI.py b/appGUI/preferences/excellon/ExcellonAdvOptPrefGroupUI.py
index 738154d6..135e94aa 100644
--- a/appGUI/preferences/excellon/ExcellonAdvOptPrefGroupUI.py
+++ b/appGUI/preferences/excellon/ExcellonAdvOptPrefGroupUI.py
@@ -1,6 +1,6 @@
 from PyQt6 import QtWidgets
 
-from appGUI.GUIElements import FCCheckBox, FCLabel, FCGridLayout, FCFrame
+from appGUI.GUIElements import FCCheckBox, FCLabel, GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 import gettext
 import appTranslation as fcTranslate
@@ -35,7 +35,7 @@ class ExcellonAdvOptPrefGroupUI(OptionsGroupUI):
         param_frame = FCFrame()
         self.layout.addWidget(param_frame)
 
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         param_frame.setLayout(param_grid)
 
         # Table Visibility CB
diff --git a/appGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py b/appGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py
index da7b7fd0..c0ab3814 100644
--- a/appGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py
+++ b/appGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py
@@ -1,6 +1,6 @@
 from PyQt6 import QtWidgets
 
-from appGUI.GUIElements import FCSpinner, FCDoubleSpinner, RadioSet, FCLabel, FCGridLayout, FCFrame
+from appGUI.GUIElements import FCSpinner, FCDoubleSpinner, RadioSet, FCLabel, GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -32,7 +32,7 @@ class ExcellonEditorPrefGroupUI(OptionsGroupUI):
         param_frame = FCFrame()
         self.layout.addWidget(param_frame)
 
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         param_frame.setLayout(param_grid)
 
         # Selection Limit
@@ -85,7 +85,7 @@ class ExcellonEditorPrefGroupUI(OptionsGroupUI):
         lin_frame = FCFrame()
         self.layout.addWidget(lin_frame)
 
-        lin_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        lin_grid = GLay(v_spacing=5, h_spacing=3)
         lin_frame.setLayout(lin_grid)
 
         # Linear Drill Array direction
@@ -140,7 +140,7 @@ class ExcellonEditorPrefGroupUI(OptionsGroupUI):
         circ_frame = FCFrame()
         self.layout.addWidget(circ_frame)
 
-        circ_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        circ_grid = GLay(v_spacing=5, h_spacing=3)
         circ_frame.setLayout(circ_grid)
 
         # Circular Drill Array direction
@@ -179,7 +179,7 @@ class ExcellonEditorPrefGroupUI(OptionsGroupUI):
         slots_frame = FCFrame()
         self.layout.addWidget(slots_frame)
 
-        slots_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        slots_grid = GLay(v_spacing=5, h_spacing=3)
         slots_frame.setLayout(slots_grid)
 
         # Slot length
@@ -242,7 +242,7 @@ class ExcellonEditorPrefGroupUI(OptionsGroupUI):
         slot_array_frame = FCFrame()
         self.layout.addWidget(slot_array_frame)
 
-        slot_array_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        slot_array_grid = GLay(v_spacing=5, h_spacing=3)
         slot_array_frame.setLayout(slot_array_grid)
 
         # Number of slot holes in a drill array
@@ -312,7 +312,7 @@ class ExcellonEditorPrefGroupUI(OptionsGroupUI):
         circ_slot_frame = FCFrame()
         self.layout.addWidget(circ_slot_frame)
 
-        circ_slot_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        circ_slot_grid = GLay(v_spacing=5, h_spacing=3)
         circ_slot_frame.setLayout(circ_slot_grid)
 
         # Circular Slot Array direction
@@ -342,7 +342,7 @@ class ExcellonEditorPrefGroupUI(OptionsGroupUI):
         circ_slot_grid.addWidget(self.slot_array_circular_angle_label, 2, 0)
         circ_slot_grid.addWidget(self.slot_array_circular_angle_entry, 2, 1)
 
-        FCGridLayout.set_common_column_size(
+        GLay.set_common_column_size(
             [param_grid, lin_grid, circ_grid, slots_grid, slot_array_grid, circ_slot_grid], 0)
 
         self.layout.addStretch()
diff --git a/appGUI/preferences/excellon/ExcellonExpPrefGroupUI.py b/appGUI/preferences/excellon/ExcellonExpPrefGroupUI.py
index 4ee21165..8ff30202 100644
--- a/appGUI/preferences/excellon/ExcellonExpPrefGroupUI.py
+++ b/appGUI/preferences/excellon/ExcellonExpPrefGroupUI.py
@@ -1,6 +1,6 @@
 from PyQt6 import QtWidgets, QtCore
 
-from appGUI.GUIElements import RadioSet, FCSpinner, FCLabel, FCGridLayout, FCFrame
+from appGUI.GUIElements import RadioSet, FCSpinner, FCLabel, GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 import gettext
 import appTranslation as fcTranslate
@@ -33,7 +33,7 @@ class ExcellonExpPrefGroupUI(OptionsGroupUI):
         exp_frame = FCFrame()
         self.layout.addWidget(exp_frame)
 
-        exp_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        exp_grid = GLay(v_spacing=5, h_spacing=3)
         exp_frame.setLayout(exp_grid)
 
         # Excellon Units
diff --git a/appGUI/preferences/excellon/ExcellonGenPrefGroupUI.py b/appGUI/preferences/excellon/ExcellonGenPrefGroupUI.py
index d35e4913..ff0276ed 100644
--- a/appGUI/preferences/excellon/ExcellonGenPrefGroupUI.py
+++ b/appGUI/preferences/excellon/ExcellonGenPrefGroupUI.py
@@ -3,7 +3,7 @@ import platform
 from PyQt6 import QtWidgets, QtCore, QtGui
 
 from appGUI.GUIElements import FCCheckBox, FCSpinner, RadioSet, FCSliderWithSpinner, FCColorEntry, FCLabel, \
-    FCGridLayout, FCFrame
+    GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 import gettext
 import appTranslation as fcTranslate
@@ -33,7 +33,7 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI):
         plot_frame = FCFrame()
         self.layout.addWidget(plot_frame)
 
-        plot_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        plot_grid = GLay(v_spacing=5, h_spacing=3)
         plot_frame.setLayout(plot_grid)
 
         # Plot CB
@@ -105,7 +105,7 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI):
         format_frame = FCFrame()
         self.layout.addWidget(format_frame)
 
-        format_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        format_grid = GLay(v_spacing=5, h_spacing=3)
         format_frame.setLayout(format_grid)
 
         self.excellon_format_in_label = FCLabel('%s:' % _("INCH"))
@@ -226,7 +226,7 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI):
         opt_frame = FCFrame()
         self.layout.addWidget(opt_frame)
 
-        opt_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        opt_grid = GLay(v_spacing=5, h_spacing=3)
         opt_frame.setLayout(opt_grid)
 
         self.excellon_optimization_label = FCLabel(_('Algorithm:'))
@@ -278,7 +278,7 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI):
         fuse_frame = FCFrame()
         self.layout.addWidget(fuse_frame)
 
-        fuse_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        fuse_grid = GLay(v_spacing=5, h_spacing=3)
         fuse_frame.setLayout(fuse_grid)
 
         self.fuse_tools_cb = FCCheckBox(_("Fuse Tools"))
@@ -297,7 +297,7 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI):
         obj_frame = FCFrame()
         self.layout.addWidget(obj_frame)
 
-        obj_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        obj_grid = GLay(v_spacing=5, h_spacing=3)
         obj_frame.setLayout(obj_grid)
 
         # Plot Line Color
@@ -332,7 +332,7 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI):
         obj_grid.addWidget(self.excellon_alpha_label, 4, 0)
         obj_grid.addWidget(self.excellon_alpha_entry, 4, 1)
 
-        FCGridLayout.set_common_column_size([plot_grid, format_grid, opt_grid, obj_grid, fuse_grid], 0)
+        GLay.set_common_column_size([plot_grid, format_grid, opt_grid, obj_grid, fuse_grid], 0)
 
         self.layout.addStretch()
 
diff --git a/appGUI/preferences/excellon/ExcellonOptPrefGroupUI.py b/appGUI/preferences/excellon/ExcellonOptPrefGroupUI.py
index 6b53a3df..83310e31 100644
--- a/appGUI/preferences/excellon/ExcellonOptPrefGroupUI.py
+++ b/appGUI/preferences/excellon/ExcellonOptPrefGroupUI.py
@@ -1,6 +1,6 @@
 from PyQt6 import QtWidgets
 
-from appGUI.GUIElements import FCDoubleSpinner, FCLabel, FCGridLayout, FCFrame
+from appGUI.GUIElements import FCDoubleSpinner, FCLabel, GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 import gettext
 import appTranslation as fcTranslate
@@ -34,7 +34,7 @@ class ExcellonOptPrefGroupUI(OptionsGroupUI):
         param_frame = FCFrame()
         self.layout.addWidget(param_frame)
 
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         param_frame.setLayout(param_grid)
 
         # ### Milling Holes ## ##
diff --git a/appGUI/preferences/general/GeneralAPPSetGroupUI.py b/appGUI/preferences/general/GeneralAPPSetGroupUI.py
index 3a3aa5db..17e6274a 100644
--- a/appGUI/preferences/general/GeneralAPPSetGroupUI.py
+++ b/appGUI/preferences/general/GeneralAPPSetGroupUI.py
@@ -2,7 +2,7 @@ from PyQt6 import QtCore, QtGui
 from PyQt6.QtCore import QSettings
 
 from appGUI.GUIElements import FCDoubleSpinner, FCCheckBox, FCComboBox, RadioSet, OptionalInputSection, FCSpinner, \
-    FCColorEntry, FCLabel, FCGridLayout, FCFrame
+    FCColorEntry, FCLabel, GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -44,7 +44,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
         self.layout.addWidget(grids_frame)
 
         # Create a grid layout for the Application general settings
-        grids_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        grids_grid = GLay(v_spacing=5, h_spacing=3)
         grids_frame.setLayout(grids_grid)
 
         # Grid X Entry
@@ -96,7 +96,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
         wk_frame = FCFrame()
         self.layout.addWidget(wk_frame)
 
-        wk_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        wk_grid = GLay(v_spacing=5, h_spacing=3)
         wk_frame.setLayout(wk_grid)
 
         self.workspace_cb = FCCheckBox('%s' % _('Active'))
@@ -197,7 +197,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
         fnt_frame = FCFrame()
         self.layout.addWidget(fnt_frame)
 
-        fnt_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        fnt_grid = GLay(v_spacing=5, h_spacing=3)
         fnt_frame.setLayout(fnt_grid)
 
         # Notebook Font Size
@@ -289,7 +289,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
         ax_frame = FCFrame()
         self.layout.addWidget(ax_frame)
 
-        ax_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        ax_grid = GLay(v_spacing=5, h_spacing=3)
         ax_frame.setLayout(ax_grid)
 
         # Axis Color
@@ -311,7 +311,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
         m_frame = FCFrame()
         self.layout.addWidget(m_frame)
 
-        m_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        m_grid = GLay(v_spacing=5, h_spacing=3)
         m_frame.setLayout(m_grid)
 
         # Mouse Cursor Shape
@@ -414,7 +414,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
         par_frame = FCFrame()
         self.layout.addWidget(par_frame)
 
-        par_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        par_grid = GLay(v_spacing=5, h_spacing=3)
         par_frame.setLayout(par_grid)
 
         # Delete confirmation
@@ -477,7 +477,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
         par_grid.addWidget(self.activity_label, 10, 0)
         par_grid.addWidget(self.activity_combo, 10, 1)
 
-        FCGridLayout.set_common_column_size(
+        GLay.set_common_column_size(
             [grids_grid, m_grid, par_grid, wk_grid, fnt_grid, ax_grid], 0
         )
 
diff --git a/appGUI/preferences/general/GeneralAppPrefGroupUI.py b/appGUI/preferences/general/GeneralAppPrefGroupUI.py
index 8e2a3de9..5ff68cbd 100644
--- a/appGUI/preferences/general/GeneralAppPrefGroupUI.py
+++ b/appGUI/preferences/general/GeneralAppPrefGroupUI.py
@@ -3,7 +3,7 @@ import sys
 from PyQt6.QtCore import QSettings
 
 from appGUI.GUIElements import RadioSet, FCSpinner, FCCheckBox, FCComboBox, FCButton, OptionalInputSection, \
-    FCDoubleSpinner, FCLabel, FCGridLayout, RadioSetDefaults, FCFrame, FCComboBox2
+    FCDoubleSpinner, FCLabel, GLay, RadioSetDefaults, FCFrame, FCComboBox2
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -37,7 +37,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
         grid0_frame = FCFrame()
         self.layout.addWidget(grid0_frame)
 
-        grid0 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid0 = GLay(v_spacing=5, h_spacing=3)
         grid0_frame.setLayout(grid0)
 
         # Units for FlatCAM
@@ -85,7 +85,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
         grid1_frame = FCFrame()
         self.layout.addWidget(grid1_frame)
 
-        grid1 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid1 = GLay(v_spacing=5, h_spacing=3)
         grid1_frame.setLayout(grid1)
 
         # Graphic Engine for FlatCAM
@@ -177,7 +177,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
         grid2_frame = FCFrame()
         self.layout.addWidget(grid2_frame)
 
-        grid2 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid2 = GLay(v_spacing=5, h_spacing=3)
         grid2_frame.setLayout(grid2)
 
         # Application Level for FlatCAM
@@ -196,7 +196,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
         grid3_frame = FCFrame()
         self.layout.addWidget(grid3_frame)
 
-        grid3 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid3 = GLay(v_spacing=5, h_spacing=3)
         grid3_frame.setLayout(grid3)
 
         self.language_combo = FCComboBox()
@@ -222,7 +222,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
         grid4_frame = FCFrame()
         self.layout.addWidget(grid4_frame)
 
-        grid4 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid4 = GLay(v_spacing=5, h_spacing=3)
         grid4_frame.setLayout(grid4)
 
         # Splash Screen
@@ -293,7 +293,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
         grid6_frame = FCFrame()
         self.layout.addWidget(grid6_frame)
 
-        grid6 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid6 = GLay(v_spacing=5, h_spacing=3)
         grid6_frame.setLayout(grid6)
 
         # Save compressed project CB
@@ -358,7 +358,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
         grid7_frame = FCFrame()
         self.layout.addWidget(grid7_frame)
 
-        grid7 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid7 = GLay(v_spacing=5, h_spacing=3)
         grid7_frame.setLayout(grid7)
 
         # Top Margin value
@@ -415,7 +415,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
 
         self.layout.addStretch()
 
-        FCGridLayout.set_common_column_size([grid0, grid1, grid6, grid7], 0)
+        GLay.set_common_column_size([grid0, grid1, grid6, grid7], 0)
 
         if sys.platform != 'win32':
             self.portability_cb.hide()
diff --git a/appGUI/preferences/general/GeneralGUIPrefGroupUI.py b/appGUI/preferences/general/GeneralGUIPrefGroupUI.py
index f97ad50c..49c76a07 100644
--- a/appGUI/preferences/general/GeneralGUIPrefGroupUI.py
+++ b/appGUI/preferences/general/GeneralGUIPrefGroupUI.py
@@ -2,7 +2,7 @@ from PyQt6 import QtWidgets, QtCore, QtGui
 from PyQt6.QtCore import QSettings
 
 from appGUI.GUIElements import RadioSet, FCCheckBox, FCComboBox, FCSliderWithSpinner, FCColorEntry, FCLabel, \
-    FCGridLayout, FCFrame, FCComboBox2
+    GLay, FCFrame, FCComboBox2
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -31,7 +31,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
         par_frame = FCFrame()
         self.layout.addWidget(par_frame)
 
-        grid0 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid0 = GLay(v_spacing=5, h_spacing=3)
         par_frame.setLayout(grid0)
 
         # Theme selection
@@ -152,7 +152,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
         color_frame = FCFrame()
         self.layout.addWidget(color_frame)
 
-        grid1 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid1 = GLay(v_spacing=5, h_spacing=3)
         color_frame.setLayout(grid1)
 
         # Plot Selection (left - right) Color
@@ -296,7 +296,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
         grid1.addWidget(self.proj_color_dis_label, 32, 0)
         grid1.addWidget(self.proj_color_dis_entry, 32, 1)
 
-        FCGridLayout.set_common_column_size([grid0, grid1], 0)
+        GLay.set_common_column_size([grid0, grid1], 0)
 
         # Project autohide CB
         self.project_autohide_cb = FCCheckBox(label=_('Project AutoHide'))
diff --git a/appGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py b/appGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py
index 2ff51221..e5f8809b 100644
--- a/appGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py
+++ b/appGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py
@@ -1,6 +1,6 @@
 from PyQt6 import QtWidgets
 
-from appGUI.GUIElements import FCDoubleSpinner, FCLabel, FCGridLayout, FCFrame
+from appGUI.GUIElements import FCDoubleSpinner, FCLabel, GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -35,7 +35,7 @@ class GeometryAdvOptPrefGroupUI(OptionsGroupUI):
         adv_frame = FCFrame()
         self.layout.addWidget(adv_frame)
 
-        adv_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        adv_grid = GLay(v_spacing=5, h_spacing=3)
         adv_frame.setLayout(adv_grid)
 
         # Size of trace segment on X axis
diff --git a/appGUI/preferences/geometry/GeometryEditorPrefGroupUI.py b/appGUI/preferences/geometry/GeometryEditorPrefGroupUI.py
index 4ef22b98..304712a8 100644
--- a/appGUI/preferences/geometry/GeometryEditorPrefGroupUI.py
+++ b/appGUI/preferences/geometry/GeometryEditorPrefGroupUI.py
@@ -1,6 +1,6 @@
 from PyQt6 import QtWidgets
 
-from appGUI.GUIElements import FCSpinner, RadioSet, FCLabel, FCGridLayout, FCFrame
+from appGUI.GUIElements import FCSpinner, RadioSet, FCLabel, GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -33,7 +33,7 @@ class GeometryEditorPrefGroupUI(OptionsGroupUI):
         editor_frame = FCFrame()
         self.layout.addWidget(editor_frame)
 
-        editor_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        editor_grid = GLay(v_spacing=5, h_spacing=3)
         editor_frame.setLayout(editor_grid)
 
         # Selection Limit
diff --git a/appGUI/preferences/geometry/GeometryExpPrefGroupUI.py b/appGUI/preferences/geometry/GeometryExpPrefGroupUI.py
index 8d28717c..e3899c6a 100644
--- a/appGUI/preferences/geometry/GeometryExpPrefGroupUI.py
+++ b/appGUI/preferences/geometry/GeometryExpPrefGroupUI.py
@@ -1,6 +1,6 @@
 from PyQt6 import QtWidgets, QtCore
 
-from appGUI.GUIElements import FCLabel, FCComboBox, FCGridLayout, FCFrame
+from appGUI.GUIElements import FCLabel, FCComboBox, GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 import gettext
 import appTranslation as fcTranslate
@@ -33,7 +33,7 @@ class GeometryExpPrefGroupUI(OptionsGroupUI):
         export_frame = FCFrame()
         self.layout.addWidget(export_frame)
 
-        export_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        export_grid = GLay(v_spacing=5, h_spacing=3)
         export_frame.setLayout(export_grid)
 
         # Excellon non-decimal format
diff --git a/appGUI/preferences/geometry/GeometryGenPrefGroupUI.py b/appGUI/preferences/geometry/GeometryGenPrefGroupUI.py
index c01fa6d0..6e41374b 100644
--- a/appGUI/preferences/geometry/GeometryGenPrefGroupUI.py
+++ b/appGUI/preferences/geometry/GeometryGenPrefGroupUI.py
@@ -1,6 +1,6 @@
 from PyQt6 import QtGui
 
-from appGUI.GUIElements import FCCheckBox, FCSpinner, FCColorEntry, RadioSet, FCLabel, FCGridLayout, FCFrame
+from appGUI.GUIElements import FCCheckBox, FCSpinner, FCColorEntry, RadioSet, FCLabel, GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import platform
@@ -32,7 +32,7 @@ class GeometryGenPrefGroupUI(OptionsGroupUI):
         plot_frame = FCFrame()
         self.layout.addWidget(plot_frame)
 
-        plot_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        plot_grid = GLay(v_spacing=5, h_spacing=3)
         plot_frame.setLayout(plot_grid)
 
         # Plot CB
@@ -75,7 +75,7 @@ class GeometryGenPrefGroupUI(OptionsGroupUI):
         opt_frame = FCFrame()
         self.layout.addWidget(opt_frame)
 
-        opt_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        opt_grid = GLay(v_spacing=5, h_spacing=3)
         opt_frame.setLayout(opt_grid)
 
         self.opt_algorithm_label = FCLabel(_('Algorithm:'))
@@ -125,7 +125,7 @@ class GeometryGenPrefGroupUI(OptionsGroupUI):
         fuse_frame = FCFrame()
         self.layout.addWidget(fuse_frame)
 
-        fuse_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        fuse_grid = GLay(v_spacing=5, h_spacing=3)
         fuse_frame.setLayout(fuse_grid)
 
         self.fuse_tools_cb = FCCheckBox(_("Fuse Tools"))
@@ -144,7 +144,7 @@ class GeometryGenPrefGroupUI(OptionsGroupUI):
         obj_frame = FCFrame()
         self.layout.addWidget(obj_frame)
 
-        obj_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        obj_grid = GLay(v_spacing=5, h_spacing=3)
         obj_frame.setLayout(obj_grid)
 
         # Plot Line Color
@@ -157,7 +157,7 @@ class GeometryGenPrefGroupUI(OptionsGroupUI):
         obj_grid.addWidget(self.line_color_label, 0, 0)
         obj_grid.addWidget(self.line_color_entry, 0, 1)
 
-        FCGridLayout.set_common_column_size([plot_grid, opt_grid, obj_grid, fuse_grid], 0)
+        GLay.set_common_column_size([plot_grid, opt_grid, obj_grid, fuse_grid], 0)
 
         self.layout.addStretch(1)
 
diff --git a/appGUI/preferences/geometry/GeometryOptPrefGroupUI.py b/appGUI/preferences/geometry/GeometryOptPrefGroupUI.py
index 40eee469..0c35abae 100644
--- a/appGUI/preferences/geometry/GeometryOptPrefGroupUI.py
+++ b/appGUI/preferences/geometry/GeometryOptPrefGroupUI.py
@@ -1,7 +1,7 @@
 from PyQt6 import QtWidgets
 from PyQt6.QtCore import Qt
 
-from appGUI.GUIElements import FCDoubleSpinner, FCLabel, FCGridLayout, FCFrame
+from appGUI.GUIElements import FCDoubleSpinner, FCLabel, GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -31,7 +31,7 @@ class GeometryOptPrefGroupUI(OptionsGroupUI):
         param_frame = FCFrame()
         self.layout.addWidget(param_frame)
 
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         param_frame.setLayout(param_grid)
 
         # Cut Z
diff --git a/appGUI/preferences/gerber/GerberAdvOptPrefGroupUI.py b/appGUI/preferences/gerber/GerberAdvOptPrefGroupUI.py
index 517fed24..09c0d1b4 100644
--- a/appGUI/preferences/gerber/GerberAdvOptPrefGroupUI.py
+++ b/appGUI/preferences/gerber/GerberAdvOptPrefGroupUI.py
@@ -1,6 +1,6 @@
 from PyQt6 import QtWidgets
 
-from appGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCLabel, OptionalInputSection, FCGridLayout, \
+from appGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCLabel, OptionalInputSection, GLay, \
     FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
@@ -28,7 +28,7 @@ class GerberAdvOptPrefGroupUI(OptionsGroupUI):
         adv_frame = FCFrame()
         self.layout.addWidget(adv_frame)
 
-        adv_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        adv_grid = GLay(v_spacing=5, h_spacing=3)
         adv_frame.setLayout(adv_grid)
 
         # Follow Attribute
diff --git a/appGUI/preferences/gerber/GerberEditorPrefGroupUI.py b/appGUI/preferences/gerber/GerberEditorPrefGroupUI.py
index d021d1ec..2b098cf7 100644
--- a/appGUI/preferences/gerber/GerberEditorPrefGroupUI.py
+++ b/appGUI/preferences/gerber/GerberEditorPrefGroupUI.py
@@ -1,7 +1,7 @@
 from PyQt6 import QtWidgets
 
 from appGUI.GUIElements import FCSpinner, FCDoubleSpinner, FCComboBox, FCLabel, RadioSet, NumericalEvalTupleEntry, \
-    FCGridLayout, FCFrame
+    GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -35,7 +35,7 @@ class GerberEditorPrefGroupUI(OptionsGroupUI):
         par_frame = FCFrame()
         self.layout.addWidget(par_frame)
 
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         par_frame.setLayout(param_grid)
 
         # Selection Limit
@@ -125,7 +125,7 @@ class GerberEditorPrefGroupUI(OptionsGroupUI):
         self.layout.addWidget(lin_frame)
 
         # ## Grid Layout
-        lin_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        lin_grid = GLay(v_spacing=5, h_spacing=3)
         lin_frame.setLayout(lin_grid)
 
         # Linear Pad Array direction
@@ -179,7 +179,7 @@ class GerberEditorPrefGroupUI(OptionsGroupUI):
         self.layout.addWidget(circ_frame)
 
         # ## Grid Layout
-        circ_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        circ_grid = GLay(v_spacing=5, h_spacing=3)
         circ_frame.setLayout(circ_grid)
 
         # Circular Pad Array direction
@@ -219,7 +219,7 @@ class GerberEditorPrefGroupUI(OptionsGroupUI):
         self.layout.addWidget(buff_frame)
 
         # ## Grid Layout
-        buf_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        buf_grid = GLay(v_spacing=5, h_spacing=3)
         buff_frame.setLayout(buf_grid)
 
         # Buffer Distance
@@ -244,7 +244,7 @@ class GerberEditorPrefGroupUI(OptionsGroupUI):
         self.layout.addWidget(scale_frame)
 
         # ## Grid Layout
-        scale_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        scale_grid = GLay(v_spacing=5, h_spacing=3)
         scale_frame.setLayout(scale_grid)
 
         # Scale Factor
@@ -269,7 +269,7 @@ class GerberEditorPrefGroupUI(OptionsGroupUI):
         self.layout.addWidget(ma_frame)
 
         # ## Grid Layout
-        ma_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        ma_grid = GLay(v_spacing=5, h_spacing=3)
         ma_frame.setLayout(ma_grid)
 
         # Mark area Tool low threshold
@@ -296,6 +296,6 @@ class GerberEditorPrefGroupUI(OptionsGroupUI):
         ma_grid.addWidget(self.grb_ma_high_label, 2, 0)
         ma_grid.addWidget(self.grb_ma_high_entry, 2, 1)
 
-        FCGridLayout.set_common_column_size([param_grid, lin_grid, circ_grid, buf_grid, scale_grid, ma_grid], 0)
+        GLay.set_common_column_size([param_grid, lin_grid, circ_grid, buf_grid, scale_grid, ma_grid], 0)
 
         self.layout.addStretch()
diff --git a/appGUI/preferences/gerber/GerberExpPrefGroupUI.py b/appGUI/preferences/gerber/GerberExpPrefGroupUI.py
index dd236ad3..a9a4408f 100644
--- a/appGUI/preferences/gerber/GerberExpPrefGroupUI.py
+++ b/appGUI/preferences/gerber/GerberExpPrefGroupUI.py
@@ -1,6 +1,6 @@
 from PyQt6 import QtWidgets, QtCore
 
-from appGUI.GUIElements import RadioSet, FCSpinner, FCLabel, FCGridLayout, FCFrame
+from appGUI.GUIElements import RadioSet, FCSpinner, FCLabel, GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -28,7 +28,7 @@ class GerberExpPrefGroupUI(OptionsGroupUI):
         self.layout.addWidget(exp_frame)
 
         # ## Grid Layout
-        exp_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        exp_grid = GLay(v_spacing=5, h_spacing=3)
         exp_frame.setLayout(exp_grid)
 
         # Gerber Units
diff --git a/appGUI/preferences/gerber/GerberGenPrefGroupUI.py b/appGUI/preferences/gerber/GerberGenPrefGroupUI.py
index 979da744..1f098fb7 100644
--- a/appGUI/preferences/gerber/GerberGenPrefGroupUI.py
+++ b/appGUI/preferences/gerber/GerberGenPrefGroupUI.py
@@ -1,7 +1,7 @@
 from PyQt6 import QtCore, QtGui, QtWidgets
 
 from appGUI.GUIElements import FCCheckBox, FCSpinner, RadioSet, FCButton, FCSliderWithSpinner, FCLabel, \
-    FCGridLayout, FCFrame, FCTable, FCColorEntry, OptionalInputSection
+    GLay, FCFrame, FCTable, FCColorEntry, OptionalInputSection
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 from copy import deepcopy
@@ -36,7 +36,7 @@ class GerberGenPrefGroupUI(OptionsGroupUI):
         self.layout.addWidget(plot_frame)
 
         # ## Grid Layout
-        plot_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        plot_grid = GLay(v_spacing=5, h_spacing=3)
         plot_frame.setLayout(plot_grid)
 
         # Plot CB
@@ -89,7 +89,7 @@ class GerberGenPrefGroupUI(OptionsGroupUI):
         self.layout.addWidget(def_frame)
 
         # ## Grid Layout
-        def_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        def_grid = GLay(v_spacing=5, h_spacing=3)
         def_frame.setLayout(def_grid)
 
         # Gerber Units
@@ -141,7 +141,7 @@ class GerberGenPrefGroupUI(OptionsGroupUI):
         self.layout.addWidget(par_frame)
 
         # ## Grid Layout
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         par_frame.setLayout(param_grid)
 
         # Apertures Cleaning
@@ -180,7 +180,7 @@ class GerberGenPrefGroupUI(OptionsGroupUI):
         self.layout.addWidget(layers_frame)
 
         # ## Grid Layout
-        layers_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        layers_grid = GLay(v_spacing=5, h_spacing=3)
         layers_frame.setLayout(layers_grid)
 
         # Store colors
@@ -227,7 +227,7 @@ class GerberGenPrefGroupUI(OptionsGroupUI):
         self.layout.addWidget(obj_frame)
 
         # ## Grid Layout
-        obj_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        obj_grid = GLay(v_spacing=5, h_spacing=3)
         obj_frame.setLayout(obj_grid)
 
         # Enable Outline plotting
@@ -272,7 +272,7 @@ class GerberGenPrefGroupUI(OptionsGroupUI):
         obj_grid.addWidget(self.gerber_alpha_label, 6, 0)
         obj_grid.addWidget(self.gerber_alpha_entry, 6, 1, 1, 2)
 
-        FCGridLayout.set_common_column_size([plot_grid, param_grid, def_grid, obj_grid], 0)
+        GLay.set_common_column_size([plot_grid, param_grid, def_grid, obj_grid], 0)
 
         self.layout.addStretch()
 
@@ -362,7 +362,7 @@ class ColorsManager(QtWidgets.QDialog):
         layers_frame.setSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Expanding)
         self.layout.addWidget(layers_frame)
 
-        layers_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        layers_grid = GLay(v_spacing=5, h_spacing=3)
         layers_frame.setLayout(layers_grid)
 
         # Layers Colors Table
@@ -406,7 +406,7 @@ class ColorsManager(QtWidgets.QDialog):
         # #############################################################################################################
         # ######################################## Button Grid ########################################################
         # #############################################################################################################
-        button_grid = FCGridLayout(h_spacing=5, v_spacing=5)
+        button_grid = GLay(h_spacing=5, v_spacing=5)
         self.layout.addLayout(button_grid)
 
         self.button_box = QtWidgets.QDialogButtonBox(QtWidgets.QDialogButtonBox.StandardButton.Ok |
diff --git a/appGUI/preferences/gerber/GerberOptPrefGroupUI.py b/appGUI/preferences/gerber/GerberOptPrefGroupUI.py
index bdfd6666..d20f8fd1 100644
--- a/appGUI/preferences/gerber/GerberOptPrefGroupUI.py
+++ b/appGUI/preferences/gerber/GerberOptPrefGroupUI.py
@@ -1,6 +1,6 @@
 from PyQt6 import QtWidgets
 
-from appGUI.GUIElements import FCDoubleSpinner, FCCheckBox, FCLabel, FCGridLayout, FCFrame
+from appGUI.GUIElements import FCDoubleSpinner, FCCheckBox, FCLabel, GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -39,7 +39,7 @@ class GerberOptPrefGroupUI(OptionsGroupUI):
         self.layout.addWidget(ncc_frame)
 
         # ## Grid Layout
-        ncc_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        ncc_grid = GLay(v_spacing=5, h_spacing=3)
         ncc_frame.setLayout(ncc_grid)
 
         # Margin
@@ -74,7 +74,7 @@ class GerberOptPrefGroupUI(OptionsGroupUI):
         bb_frame = FCFrame()
         self.layout.addWidget(bb_frame)
 
-        bb_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        bb_grid = GLay(v_spacing=5, h_spacing=3)
         bb_frame.setLayout(bb_grid)
 
         bbmargin = FCLabel('%s:' % _('Boundary Margin'))
@@ -99,6 +99,6 @@ class GerberOptPrefGroupUI(OptionsGroupUI):
         )
         bb_grid.addWidget(self.bbrounded_cb, 2, 0, 1, 2)
 
-        FCGridLayout.set_common_column_size([ncc_grid, bb_grid], 0)
+        GLay.set_common_column_size([ncc_grid, bb_grid], 0)
 
         self.layout.addStretch()
diff --git a/appGUI/preferences/tools/Tools2CThievingPrefGroupUI.py b/appGUI/preferences/tools/Tools2CThievingPrefGroupUI.py
index 9b69296a..153feffe 100644
--- a/appGUI/preferences/tools/Tools2CThievingPrefGroupUI.py
+++ b/appGUI/preferences/tools/Tools2CThievingPrefGroupUI.py
@@ -1,6 +1,6 @@
 from PyQt6 import QtWidgets
 
-from appGUI.GUIElements import FCSpinner, FCDoubleSpinner, RadioSet, FCLabel, FCCheckBox, FCGridLayout, FCFrame, \
+from appGUI.GUIElements import FCSpinner, FCDoubleSpinner, RadioSet, FCLabel, FCCheckBox, GLay, FCFrame, \
     FCComboBox2
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
@@ -36,7 +36,7 @@ class Tools2CThievingPrefGroupUI(OptionsGroupUI):
         self.layout.addWidget(par_frame)
 
         # ## Grid Layout
-        grid_par = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid_par = GLay(v_spacing=5, h_spacing=3)
         par_frame.setLayout(grid_par)
 
         # CIRCLE STEPS - to be used when buffering
@@ -149,7 +149,7 @@ class Tools2CThievingPrefGroupUI(OptionsGroupUI):
         self.layout.addWidget(dots_frame)
 
         # ## Grid Layout
-        grid_dots = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid_dots = GLay(v_spacing=5, h_spacing=3)
         dots_frame.setLayout(grid_dots)
 
         # Dot diameter #
@@ -188,7 +188,7 @@ class Tools2CThievingPrefGroupUI(OptionsGroupUI):
         self.layout.addWidget(square_frame)
 
         # ## Grid Layout
-        grid_square = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid_square = GLay(v_spacing=5, h_spacing=3)
         square_frame.setLayout(grid_square)
 
         # Square Size #
@@ -227,7 +227,7 @@ class Tools2CThievingPrefGroupUI(OptionsGroupUI):
         self.layout.addWidget(line_frame)
 
         # ## Grid Layout
-        grid_line = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid_line = GLay(v_spacing=5, h_spacing=3)
         line_frame.setLayout(grid_line)
 
         # Line Size #
@@ -270,7 +270,7 @@ class Tools2CThievingPrefGroupUI(OptionsGroupUI):
         self.layout.addWidget(rob_frame)
 
         # ## Grid Layout
-        grid_robber = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid_robber = GLay(v_spacing=5, h_spacing=3)
         rob_frame.setLayout(grid_robber)
 
         # ROBBER BAR MARGIN #
@@ -312,7 +312,7 @@ class Tools2CThievingPrefGroupUI(OptionsGroupUI):
         self.layout.addWidget(ppm_frame)
 
         # ## Grid Layout
-        grid_ppm = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid_ppm = GLay(v_spacing=5, h_spacing=3)
         ppm_frame.setLayout(grid_ppm)
 
         # Use Only Pads
@@ -346,7 +346,7 @@ class Tools2CThievingPrefGroupUI(OptionsGroupUI):
         grid_ppm.addWidget(self.ppm_choice_label, 4, 0)
         grid_ppm.addWidget(self.ppm_choice_combo, 4, 1)
 
-        FCGridLayout.set_common_column_size(
+        GLay.set_common_column_size(
             [grid_par, grid_ppm, grid_line, grid_dots, grid_robber, grid_square], 0)
 
         self.layout.addStretch()
diff --git a/appGUI/preferences/tools/Tools2CalPrefGroupUI.py b/appGUI/preferences/tools/Tools2CalPrefGroupUI.py
index e3e642de..a95b3c20 100644
--- a/appGUI/preferences/tools/Tools2CalPrefGroupUI.py
+++ b/appGUI/preferences/tools/Tools2CalPrefGroupUI.py
@@ -1,7 +1,7 @@
 from PyQt6 import QtWidgets
 
 from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, NumericalEvalTupleEntry, FCLabel, \
-    FCGridLayout, FCFrame
+    GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -33,7 +33,7 @@ class Tools2CalPrefGroupUI(OptionsGroupUI):
         par_frame = FCFrame()
         self.layout.addWidget(par_frame)
 
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         par_frame.setLayout(param_grid)
         
         param_grid.addWidget(self.param_label, 0, 0, 1, 2)
@@ -116,7 +116,7 @@ class Tools2CalPrefGroupUI(OptionsGroupUI):
         tc_frame = FCFrame()
         self.layout.addWidget(tc_frame)
 
-        tc_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        tc_grid = GLay(v_spacing=5, h_spacing=3)
         tc_frame.setLayout(tc_grid)
 
         # Toolchange X-Y entry
@@ -146,6 +146,6 @@ class Tools2CalPrefGroupUI(OptionsGroupUI):
         tc_grid.addWidget(toolchangez_lbl, 2, 0)
         tc_grid.addWidget(self.toolchangez_entry, 2, 1)
 
-        FCGridLayout.set_common_column_size([param_grid, tc_grid], 0)
+        GLay.set_common_column_size([param_grid, tc_grid], 0)
 
         self.layout.addStretch()
diff --git a/appGUI/preferences/tools/Tools2ExtractPrefGroupUI.py b/appGUI/preferences/tools/Tools2ExtractPrefGroupUI.py
index f30da307..921bb918 100644
--- a/appGUI/preferences/tools/Tools2ExtractPrefGroupUI.py
+++ b/appGUI/preferences/tools/Tools2ExtractPrefGroupUI.py
@@ -1,6 +1,6 @@
 from PyQt6 import QtWidgets
 
-from appGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCLabel, FCGridLayout, FCFrame
+from appGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCLabel, GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -36,7 +36,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
         param_frame = FCFrame()
         self.layout.addWidget(param_frame)
 
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         param_frame.setLayout(param_grid)
 
         # Circular Aperture Selection
@@ -90,7 +90,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
         met_frame = FCFrame()
         self.layout.addWidget(met_frame)
 
-        met_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        met_grid = GLay(v_spacing=5, h_spacing=3)
         met_frame.setLayout(met_grid)
 
         self.method_radio = RadioSet(
@@ -125,7 +125,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
         fix_frame = FCFrame()
         self.layout.addWidget(fix_frame)
 
-        fix_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        fix_grid = GLay(v_spacing=5, h_spacing=3)
         fix_frame.setLayout(fix_grid)
 
         # Diameter value
@@ -155,7 +155,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
         ring_frame = FCFrame()
         self.layout.addWidget(ring_frame)
 
-        ring_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        ring_grid = GLay(v_spacing=5, h_spacing=3)
         ring_frame.setLayout(ring_grid)
 
         # Circular Annular Ring Value
@@ -232,7 +232,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
         prop_frame = FCFrame()
         self.layout.addWidget(prop_frame)
 
-        prop_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        prop_grid = GLay(v_spacing=5, h_spacing=3)
         prop_frame.setLayout(prop_grid)
 
         # Factor value
@@ -261,7 +261,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
         solder_frame = FCFrame()
         self.layout.addWidget(solder_frame)
 
-        solder_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        solder_grid = GLay(v_spacing=5, h_spacing=3)
         solder_frame.setLayout(solder_grid)
 
         # CLEARANCE soldermask extraction
@@ -289,7 +289,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
         ecut_frame = FCFrame()
         self.layout.addWidget(ecut_frame)
 
-        ecut_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        ecut_grid = GLay(v_spacing=5, h_spacing=3)
         ecut_frame.setLayout(ecut_grid)
 
         # Margin Cutout
@@ -320,7 +320,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
         ecut_grid.addWidget(self.thick_cut_label, 2, 0)
         ecut_grid.addWidget(self.thick_cut_entry, 2, 1)
 
-        FCGridLayout.set_common_column_size(
+        GLay.set_common_column_size(
             [param_grid, ring_grid, fix_grid, prop_grid, met_grid, solder_grid, ecut_grid], 0)
 
         self.layout.addStretch()
diff --git a/appGUI/preferences/tools/Tools2FiducialsPrefGroupUI.py b/appGUI/preferences/tools/Tools2FiducialsPrefGroupUI.py
index c5cff4df..0b514a4f 100644
--- a/appGUI/preferences/tools/Tools2FiducialsPrefGroupUI.py
+++ b/appGUI/preferences/tools/Tools2FiducialsPrefGroupUI.py
@@ -1,6 +1,6 @@
 from PyQt6 import QtWidgets
 
-from appGUI.GUIElements import FCDoubleSpinner, RadioSet, FCLabel, FCGridLayout, FCComboBox2, FCFrame
+from appGUI.GUIElements import FCDoubleSpinner, RadioSet, FCLabel, GLay, FCComboBox2, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -33,7 +33,7 @@ class Tools2FiducialsPrefGroupUI(OptionsGroupUI):
         par_frame = FCFrame()
         self.layout.addWidget(par_frame)
 
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         par_frame.setLayout(param_grid)
 
         # DIAMETER #
@@ -124,7 +124,7 @@ class Tools2FiducialsPrefGroupUI(OptionsGroupUI):
         self.layout.addWidget(s_frame)
 
         # Grid Layout
-        grid_sel = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid_sel = GLay(v_spacing=5, h_spacing=3)
         s_frame.setLayout(grid_sel)
 
         # Mode #
@@ -140,6 +140,6 @@ class Tools2FiducialsPrefGroupUI(OptionsGroupUI):
         grid_sel.addWidget(self.mode_label, 0, 0)
         grid_sel.addWidget(self.mode_radio, 0, 1)
 
-        FCGridLayout.set_common_column_size([param_grid, grid_sel], 0)
+        GLay.set_common_column_size([param_grid, grid_sel], 0)
 
         self.layout.addStretch(1)
diff --git a/appGUI/preferences/tools/Tools2InvertPrefGroupUI.py b/appGUI/preferences/tools/Tools2InvertPrefGroupUI.py
index 7afd2331..c0d7f548 100644
--- a/appGUI/preferences/tools/Tools2InvertPrefGroupUI.py
+++ b/appGUI/preferences/tools/Tools2InvertPrefGroupUI.py
@@ -1,6 +1,6 @@
 from PyQt6 import QtWidgets
 
-from appGUI.GUIElements import FCDoubleSpinner, RadioSet, FCLabel, FCGridLayout, FCFrame
+from appGUI.GUIElements import FCDoubleSpinner, RadioSet, FCLabel, GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -34,7 +34,7 @@ class Tools2InvertPrefGroupUI(OptionsGroupUI):
         param_frame = FCFrame()
         self.layout.addWidget(param_frame)
 
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         param_frame.setLayout(param_grid)
 
         # Margin
@@ -67,7 +67,7 @@ class Tools2InvertPrefGroupUI(OptionsGroupUI):
         join_frame = FCFrame()
         self.layout.addWidget(join_frame)
 
-        join_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        join_grid = GLay(v_spacing=5, h_spacing=3)
         join_frame.setLayout(join_grid)
 
         line_join_lbl = FCLabel('%s:' % _("Value"))
@@ -81,6 +81,6 @@ class Tools2InvertPrefGroupUI(OptionsGroupUI):
         join_grid.addWidget(line_join_lbl, 0, 0)
         join_grid.addWidget(self.join_radio, 0, 1)
 
-        FCGridLayout.set_common_column_size([param_grid, join_grid], 0)
+        GLay.set_common_column_size([param_grid, join_grid], 0)
 
         self.layout.addStretch()
diff --git a/appGUI/preferences/tools/Tools2OptimalPrefGroupUI.py b/appGUI/preferences/tools/Tools2OptimalPrefGroupUI.py
index 658517a0..f6e053de 100644
--- a/appGUI/preferences/tools/Tools2OptimalPrefGroupUI.py
+++ b/appGUI/preferences/tools/Tools2OptimalPrefGroupUI.py
@@ -1,6 +1,6 @@
 from PyQt6 import QtWidgets
 
-from appGUI.GUIElements import FCSpinner, FCLabel, FCGridLayout, FCFrame
+from appGUI.GUIElements import FCSpinner, FCLabel, GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -34,7 +34,7 @@ class Tools2OptimalPrefGroupUI(OptionsGroupUI):
         par_frame = FCFrame()
         self.layout.addWidget(par_frame)
 
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         par_frame.setLayout(param_grid)
 
         self.precision_sp = FCSpinner()
diff --git a/appGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py b/appGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py
index 1f81c2e2..7bc30944 100644
--- a/appGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py
+++ b/appGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py
@@ -1,6 +1,6 @@
 from PyQt6 import QtWidgets
 
-from appGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCLabel, FCGridLayout, FCFrame
+from appGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCLabel, GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -36,7 +36,7 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
         param_frame = FCFrame()
         self.layout.addWidget(param_frame)
 
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         param_frame.setLayout(param_grid)
 
         # Circular Aperture Selection
@@ -90,7 +90,7 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
         met_frame = FCFrame()
         self.layout.addWidget(met_frame)
 
-        met_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        met_grid = GLay(v_spacing=5, h_spacing=3)
         met_frame.setLayout(met_grid)
 
         self.hole_size_radio = RadioSet(
@@ -122,7 +122,7 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
         fix_frame = FCFrame()
         self.layout.addWidget(fix_frame)
 
-        fix_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        fix_grid = GLay(v_spacing=5, h_spacing=3)
         fix_frame.setLayout(fix_grid)
 
         # Diameter value
@@ -152,7 +152,7 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
         ring_frame = FCFrame()
         self.layout.addWidget(ring_frame)
 
-        ring_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        ring_grid = GLay(v_spacing=5, h_spacing=3)
         ring_frame.setLayout(ring_grid)
 
         # Circular Annular Ring Value
@@ -229,7 +229,7 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
         prop_frame = FCFrame()
         self.layout.addWidget(prop_frame)
 
-        prop_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        prop_grid = GLay(v_spacing=5, h_spacing=3)
         prop_frame.setLayout(prop_grid)
 
         # Factor value
@@ -247,7 +247,7 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
         prop_grid.addWidget(self.factor_label, 0, 0)
         prop_grid.addWidget(self.factor_entry, 0, 1)
 
-        FCGridLayout.set_common_column_size(
+        GLay.set_common_column_size(
             [param_grid, ring_grid, prop_grid, met_grid, fix_grid], 0)
 
         self.layout.addStretch()
diff --git a/appGUI/preferences/tools/Tools2QRCodePrefGroupUI.py b/appGUI/preferences/tools/Tools2QRCodePrefGroupUI.py
index 4273ef66..22683b53 100644
--- a/appGUI/preferences/tools/Tools2QRCodePrefGroupUI.py
+++ b/appGUI/preferences/tools/Tools2QRCodePrefGroupUI.py
@@ -1,6 +1,6 @@
 from PyQt6 import QtGui
 
-from appGUI.GUIElements import FCSpinner, RadioSet, FCTextArea, FCLabel, FCColorEntry, FCGridLayout, FCFrame
+from appGUI.GUIElements import FCSpinner, RadioSet, FCTextArea, FCLabel, FCColorEntry, GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -35,7 +35,7 @@ class Tools2QRCodePrefGroupUI(OptionsGroupUI):
         self.layout.addWidget(par_frame)
 
         # ## Grid Layout
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         par_frame.setLayout(param_grid)
 
         # VERSION #
diff --git a/appGUI/preferences/tools/Tools2RulesCheckPrefGroupUI.py b/appGUI/preferences/tools/Tools2RulesCheckPrefGroupUI.py
index 50680a19..73b42877 100644
--- a/appGUI/preferences/tools/Tools2RulesCheckPrefGroupUI.py
+++ b/appGUI/preferences/tools/Tools2RulesCheckPrefGroupUI.py
@@ -1,6 +1,6 @@
 from PyQt6 import QtWidgets
 
-from appGUI.GUIElements import FCCheckBox, FCDoubleSpinner, FCLabel, FCGridLayout, FCFrame
+from appGUI.GUIElements import FCCheckBox, FCDoubleSpinner, FCLabel, GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -34,7 +34,7 @@ class Tools2RulesCheckPrefGroupUI(OptionsGroupUI):
         copper_frame = FCFrame()
         self.layout.addWidget(copper_frame)
 
-        self.copper_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        self.copper_grid = GLay(v_spacing=5, h_spacing=3)
         copper_frame.setLayout(self.copper_grid)
 
         # Trace size
@@ -133,7 +133,7 @@ class Tools2RulesCheckPrefGroupUI(OptionsGroupUI):
         silk_frame = FCFrame()
         self.layout.addWidget(silk_frame)
 
-        self.silk_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        self.silk_grid = GLay(v_spacing=5, h_spacing=3)
         silk_frame.setLayout(self.silk_grid)
 
         # Silkscreen2silkscreen clearance
@@ -211,7 +211,7 @@ class Tools2RulesCheckPrefGroupUI(OptionsGroupUI):
         solder_frame = FCFrame()
         self.layout.addWidget(solder_frame)
 
-        self.solder_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        self.solder_grid = GLay(v_spacing=5, h_spacing=3)
         solder_frame.setLayout(self.solder_grid)
 
         # Soldermask2soldermask clearance
@@ -246,7 +246,7 @@ class Tools2RulesCheckPrefGroupUI(OptionsGroupUI):
         holes_frame = FCFrame()
         self.layout.addWidget(holes_frame)
 
-        self.holes_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        self.holes_grid = GLay(v_spacing=5, h_spacing=3)
         holes_frame.setLayout(self.holes_grid)
 
         # Hole2Hole clearance
diff --git a/appGUI/preferences/tools/Tools2sidedPrefGroupUI.py b/appGUI/preferences/tools/Tools2sidedPrefGroupUI.py
index 08192cbd..53bce357 100644
--- a/appGUI/preferences/tools/Tools2sidedPrefGroupUI.py
+++ b/appGUI/preferences/tools/Tools2sidedPrefGroupUI.py
@@ -1,6 +1,6 @@
 from PyQt6 import QtWidgets
 
-from appGUI.GUIElements import FCDoubleSpinner, RadioSet, FCLabel, FCGridLayout, FCFrame
+from appGUI.GUIElements import FCDoubleSpinner, RadioSet, FCLabel, GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -35,7 +35,7 @@ class Tools2sidedPrefGroupUI(OptionsGroupUI):
         par_frame = FCFrame()
         self.layout.addWidget(par_frame)
 
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         par_frame.setLayout(param_grid)
 
         # ## Drill diameter for alignment holes
@@ -95,7 +95,7 @@ class Tools2sidedPrefGroupUI(OptionsGroupUI):
         mirror_frame = FCFrame()
         self.layout.addWidget(mirror_frame)
 
-        mirror_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        mirror_grid = GLay(v_spacing=5, h_spacing=3)
         mirror_frame.setLayout(mirror_grid)
 
         mirror_grid.addWidget(self.mirax_label, 0, 0)
@@ -122,6 +122,6 @@ class Tools2sidedPrefGroupUI(OptionsGroupUI):
         mirror_grid.addWidget(self.axloc_label, 2, 0)
         mirror_grid.addWidget(self.axis_location_radio, 2, 1)
 
-        FCGridLayout.set_common_column_size([param_grid, mirror_grid], 0)
+        GLay.set_common_column_size([param_grid, mirror_grid], 0)
 
         # self.layout.addStretch(1)
diff --git a/appGUI/preferences/tools/ToolsCalculatorsPrefGroupUI.py b/appGUI/preferences/tools/ToolsCalculatorsPrefGroupUI.py
index b2f662a6..ddeeb6e9 100644
--- a/appGUI/preferences/tools/ToolsCalculatorsPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsCalculatorsPrefGroupUI.py
@@ -1,6 +1,6 @@
 from PyQt6 import QtWidgets
 
-from appGUI.GUIElements import FCDoubleSpinner, FCLabel, FCGridLayout, FCFrame
+from appGUI.GUIElements import FCDoubleSpinner, FCLabel, GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -35,7 +35,7 @@ class ToolsCalculatorsPrefGroupUI(OptionsGroupUI):
         v_frame = FCFrame()
         self.layout.addWidget(v_frame)
 
-        v_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        v_grid = GLay(v_spacing=5, h_spacing=3)
         v_frame.setLayout(v_grid)
 
         # ## Tip Diameter
@@ -93,7 +93,7 @@ class ToolsCalculatorsPrefGroupUI(OptionsGroupUI):
         el_frame = FCFrame()
         self.layout.addWidget(el_frame)
 
-        el_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        el_grid = GLay(v_spacing=5, h_spacing=3)
         el_frame.setLayout(el_grid)
 
         # ## PCB Length
@@ -155,6 +155,6 @@ class ToolsCalculatorsPrefGroupUI(OptionsGroupUI):
         el_grid.addWidget(self.growth_label, 8, 0)
         el_grid.addWidget(self.growth_entry, 8, 1)
 
-        FCGridLayout.set_common_column_size([v_grid, el_grid], 0)
+        GLay.set_common_column_size([v_grid, el_grid], 0)
 
         self.layout.addStretch()
diff --git a/appGUI/preferences/tools/ToolsCutoutPrefGroupUI.py b/appGUI/preferences/tools/ToolsCutoutPrefGroupUI.py
index 21da24a6..54006c8d 100644
--- a/appGUI/preferences/tools/ToolsCutoutPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsCutoutPrefGroupUI.py
@@ -1,7 +1,7 @@
 from PyQt6 import QtWidgets
 
 from appGUI.GUIElements import FCDoubleSpinner, FCCheckBox, RadioSet, FCComboBox, FCLabel, OptionalInputSection, \
-    FCGridLayout, FCFrame, FCComboBox2
+    GLay, FCFrame, FCComboBox2
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -37,7 +37,7 @@ class ToolsCutoutPrefGroupUI(OptionsGroupUI):
         tool_par_frame = FCFrame()
         self.layout.addWidget(tool_par_frame)
 
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         tool_par_frame.setLayout(param_grid)
 
         # Tool Diameter
@@ -143,7 +143,7 @@ class ToolsCutoutPrefGroupUI(OptionsGroupUI):
         self.layout.addWidget(gaps_frame)
 
         # Grid Layout
-        gaps_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        gaps_grid = GLay(v_spacing=5, h_spacing=3)
         gaps_frame.setLayout(gaps_grid)
 
         # Gap Size
@@ -271,7 +271,7 @@ class ToolsCutoutPrefGroupUI(OptionsGroupUI):
         self.layout.addWidget(self.drill_cut_frame)
 
         # Grid Layout
-        drill_cut_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        drill_cut_grid = GLay(v_spacing=5, h_spacing=3)
         self.drill_cut_frame.setLayout(drill_cut_grid)
 
         # Drill Tool Diameter
@@ -314,7 +314,7 @@ class ToolsCutoutPrefGroupUI(OptionsGroupUI):
         drill_cut_grid.addWidget(self.drill_margin_label, 4, 0)
         drill_cut_grid.addWidget(self.drill_margin_entry, 4, 1)
 
-        FCGridLayout.set_common_column_size([param_grid, drill_cut_grid, gaps_grid], 0)
+        GLay.set_common_column_size([param_grid, drill_cut_grid, gaps_grid], 0)
 
 
         # self.layout.addStretch()
diff --git a/appGUI/preferences/tools/ToolsDrillPrefGroupUI.py b/appGUI/preferences/tools/ToolsDrillPrefGroupUI.py
index 912609e9..d79a4914 100644
--- a/appGUI/preferences/tools/ToolsDrillPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsDrillPrefGroupUI.py
@@ -2,7 +2,7 @@ from PyQt6 import QtWidgets, QtCore
 from PyQt6.QtCore import Qt
 
 from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCComboBox, FCCheckBox, FCSpinner, NumericalEvalTupleEntry, \
-    OptionalInputSection, NumericalEvalEntry, FCLabel, FCGridLayout, FCComboBox2, FCFrame
+    OptionalInputSection, NumericalEvalEntry, FCLabel, GLay, FCComboBox2, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -34,7 +34,7 @@ class ToolsDrillPrefGroupUI(OptionsGroupUI):
         param_frame = FCFrame()
         self.layout.addWidget(param_frame)
 
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         param_frame.setLayout(param_grid)
 
         # Tool order Radio Button
@@ -232,7 +232,7 @@ class ToolsDrillPrefGroupUI(OptionsGroupUI):
         ds_frame = FCFrame()
         self.layout.addWidget(ds_frame)
 
-        ds_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        ds_grid = GLay(v_spacing=5, h_spacing=3)
         ds_frame.setLayout(ds_grid)
 
         # Drill slots
@@ -281,7 +281,7 @@ class ToolsDrillPrefGroupUI(OptionsGroupUI):
         adv_frame = FCFrame()
         self.layout.addWidget(adv_frame)
 
-        adv_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        adv_grid = GLay(v_spacing=5, h_spacing=3)
         adv_frame.setLayout(adv_grid)
 
         # Offset Z
@@ -426,7 +426,7 @@ class ToolsDrillPrefGroupUI(OptionsGroupUI):
         area_frame = FCFrame()
         self.layout.addWidget(area_frame)
 
-        area_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        area_grid = GLay(v_spacing=5, h_spacing=3)
         area_frame.setLayout(area_grid)
 
         # Exclusion Area CB
@@ -475,6 +475,6 @@ class ToolsDrillPrefGroupUI(OptionsGroupUI):
         area_grid.addWidget(self.over_z_label, 6, 0)
         area_grid.addWidget(self.over_z_entry, 6, 1, 1, 2)
 
-        FCGridLayout.set_common_column_size([param_grid, ds_grid, adv_grid, area_grid], 0)
+        GLay.set_common_column_size([param_grid, ds_grid, adv_grid, area_grid], 0)
 
         self.layout.addStretch()
diff --git a/appGUI/preferences/tools/ToolsFilmPrefGroupUI.py b/appGUI/preferences/tools/ToolsFilmPrefGroupUI.py
index 2ea24350..d6b3b6ff 100644
--- a/appGUI/preferences/tools/ToolsFilmPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsFilmPrefGroupUI.py
@@ -1,7 +1,7 @@
 from PyQt6 import QtGui
 
 from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, FCComboBox, FCColorEntry, FCLabel, FCSpinner, \
-    FCGridLayout, FCComboBox2, FCFrame
+    GLay, FCComboBox2, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -35,7 +35,7 @@ class ToolsFilmPrefGroupUI(OptionsGroupUI):
         adj_frame = FCFrame()
         self.layout.addWidget(adj_frame)
 
-        adj_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        adj_grid = GLay(v_spacing=5, h_spacing=3)
         adj_frame.setLayout(adj_grid)
 
         # Scale Geometry
@@ -55,7 +55,7 @@ class ToolsFilmPrefGroupUI(OptionsGroupUI):
         scale_frame = FCFrame()
         adj_grid.addWidget(scale_frame, 4, 0, 1, 2)
 
-        grid_scale = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid_scale = GLay(v_spacing=5, h_spacing=3)
         scale_frame.setLayout(grid_scale)
 
         # Scale Type
@@ -120,7 +120,7 @@ class ToolsFilmPrefGroupUI(OptionsGroupUI):
         skew_frame = FCFrame()
         adj_grid.addWidget(skew_frame, 10, 0, 1, 2)
 
-        grid_skew = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid_skew = GLay(v_spacing=5, h_spacing=3)
         skew_frame.setLayout(grid_skew)
 
         self.film_skew_type_lbl = FCLabel('%s:' % _("Type"))
@@ -205,7 +205,7 @@ class ToolsFilmPrefGroupUI(OptionsGroupUI):
         par_frame = FCFrame()
         self.layout.addWidget(par_frame)
 
-        grid_par = FCGridLayout()
+        grid_par = GLay()
         par_frame.setLayout(grid_par)
 
         # Convex Shape
@@ -393,7 +393,7 @@ class ToolsFilmPrefGroupUI(OptionsGroupUI):
 
         # self.layout.addStretch(1)
 
-        FCGridLayout.set_common_column_size([adj_grid, grid_par, grid_skew, grid_scale], 0)
+        GLay.set_common_column_size([adj_grid, grid_par, grid_skew, grid_scale], 0)
 
         # Film Tool
         self.film_color_entry.editingFinished.connect(self.on_film_color_entry)
diff --git a/appGUI/preferences/tools/ToolsISOPrefGroupUI.py b/appGUI/preferences/tools/ToolsISOPrefGroupUI.py
index 1e029906..7224a785 100644
--- a/appGUI/preferences/tools/ToolsISOPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsISOPrefGroupUI.py
@@ -1,7 +1,7 @@
 from PyQt6 import QtWidgets
 
 from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCComboBox2, FCCheckBox, FCSpinner, NumericalEvalTupleEntry, \
-    FCLabel, FCGridLayout, FCFrame
+    FCLabel, GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -35,7 +35,7 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
         par_frame = FCFrame()
         self.layout.addWidget(par_frame)
 
-        par_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        par_grid = GLay(v_spacing=5, h_spacing=3)
         par_frame.setLayout(par_grid)
 
         # Tool Dias
@@ -141,7 +141,7 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
         tt_frame = FCFrame()
         self.layout.addWidget(tt_frame)
 
-        tool_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        tool_grid = GLay(v_spacing=5, h_spacing=3)
         tt_frame.setLayout(tool_grid)
 
         # Shape
@@ -254,7 +254,7 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
         gp_frame = FCFrame()
         self.layout.addWidget(gp_frame)
 
-        gen_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        gen_grid = GLay(v_spacing=5, h_spacing=3)
         gp_frame.setLayout(gen_grid)
 
         # Rest machining CheckBox
@@ -371,6 +371,6 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
         gen_grid.addWidget(plotting_label, 14, 0)
         gen_grid.addWidget(self.plotting_radio, 14, 1, 1, 2)
 
-        FCGridLayout.set_common_column_size([par_grid, tool_grid, gen_grid], 0)
+        GLay.set_common_column_size([par_grid, tool_grid, gen_grid], 0)
 
         self.layout.addStretch(1)
diff --git a/appGUI/preferences/tools/ToolsLevelPrefGroupUI.py b/appGUI/preferences/tools/ToolsLevelPrefGroupUI.py
index add3e5f0..d0c415db 100644
--- a/appGUI/preferences/tools/ToolsLevelPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsLevelPrefGroupUI.py
@@ -1,6 +1,6 @@
 from PyQt6 import QtWidgets
 
-from appGUI.GUIElements import FCDoubleSpinner, FCSpinner, RadioSet, FCLabel, FCComboBox, FCGridLayout, FCFrame
+from appGUI.GUIElements import FCDoubleSpinner, FCSpinner, RadioSet, FCLabel, FCComboBox, GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -34,7 +34,7 @@ class ToolsLevelPrefGroupUI(OptionsGroupUI):
         par_frame = FCFrame()
         self.layout.addWidget(par_frame)
 
-        par_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        par_grid = GLay(v_spacing=5, h_spacing=3)
         par_frame.setLayout(par_grid)
 
         # Probe points mode
diff --git a/appGUI/preferences/tools/ToolsMarkersPrefGroupUI.py b/appGUI/preferences/tools/ToolsMarkersPrefGroupUI.py
index 72aef399..0f4635c1 100644
--- a/appGUI/preferences/tools/ToolsMarkersPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsMarkersPrefGroupUI.py
@@ -1,6 +1,6 @@
 from PyQt6 import QtWidgets
 
-from appGUI.GUIElements import FCDoubleSpinner, FCLabel, RadioSet, FCGridLayout, FCFrame
+from appGUI.GUIElements import FCDoubleSpinner, FCLabel, RadioSet, GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -33,7 +33,7 @@ class ToolsMarkersPrefGroupUI(OptionsGroupUI):
         param_frame = FCFrame()
         self.layout.addWidget(param_frame)
 
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         param_frame.setLayout(param_grid)
 
         # Type of Marker
@@ -111,7 +111,7 @@ class ToolsMarkersPrefGroupUI(OptionsGroupUI):
         off_frame = FCFrame()
         self.layout.addWidget(off_frame)
 
-        off_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        off_grid = GLay(v_spacing=5, h_spacing=3)
         off_frame.setLayout(off_grid)
 
         off_grid.addWidget(self.ref_label, 0, 0)
@@ -143,6 +143,6 @@ class ToolsMarkersPrefGroupUI(OptionsGroupUI):
         off_grid.addWidget(self.offset_y_label, 3, 0)
         off_grid.addWidget(self.offset_y_entry, 3, 1)
 
-        FCGridLayout.set_common_column_size([param_grid, off_grid], 0)
+        GLay.set_common_column_size([param_grid, off_grid], 0)
 
         self.layout.addStretch()
diff --git a/appGUI/preferences/tools/ToolsMillPrefGroupUI.py b/appGUI/preferences/tools/ToolsMillPrefGroupUI.py
index 56db1b45..9470471f 100644
--- a/appGUI/preferences/tools/ToolsMillPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsMillPrefGroupUI.py
@@ -2,7 +2,7 @@ from PyQt6 import QtWidgets, QtCore
 from PyQt6.QtCore import Qt
 
 from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCComboBox, FCCheckBox, FCSpinner, NumericalEvalTupleEntry, \
-    OptionalInputSection, NumericalEvalEntry, FCLabel, FCComboBox2, FCEntry, FCGridLayout, FCFrame
+    OptionalInputSection, NumericalEvalEntry, FCLabel, FCComboBox2, FCEntry, GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -34,7 +34,7 @@ class ToolsMillPrefGroupUI(OptionsGroupUI):
         param_frame = FCFrame()
         self.layout.addWidget(param_frame)
 
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         param_frame.setLayout(param_grid)
 
         # Tooldia
@@ -298,7 +298,7 @@ class ToolsMillPrefGroupUI(OptionsGroupUI):
         adv_frame = FCFrame()
         self.layout.addWidget(adv_frame)
 
-        adv_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        adv_grid = GLay(v_spacing=5, h_spacing=3)
         adv_frame.setLayout(adv_grid)
 
         # Toolchange X,Y
@@ -446,7 +446,7 @@ class ToolsMillPrefGroupUI(OptionsGroupUI):
         area_frame = FCFrame()
         self.layout.addWidget(area_frame)
 
-        area_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        area_grid = GLay(v_spacing=5, h_spacing=3)
         area_frame.setLayout(area_grid)
 
         # Exclusion Area CB
@@ -513,7 +513,7 @@ class ToolsMillPrefGroupUI(OptionsGroupUI):
         polish_frame = FCFrame()
         self.layout.addWidget(polish_frame)
 
-        polish_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        polish_grid = GLay(v_spacing=5, h_spacing=3)
         polish_frame.setLayout(polish_grid)
 
         # Polish Margin
@@ -571,7 +571,7 @@ class ToolsMillPrefGroupUI(OptionsGroupUI):
         excellon_mill_frame = FCFrame()
         self.layout.addWidget(excellon_mill_frame)
 
-        excellon_mill_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        excellon_mill_grid = GLay(v_spacing=5, h_spacing=3)
         excellon_mill_frame.setLayout(excellon_mill_grid)
 
         # Milling Type
@@ -639,6 +639,6 @@ class ToolsMillPrefGroupUI(OptionsGroupUI):
 
         excellon_mill_grid.addWidget(self.connect_cb, 8, 0, 1, 2)
 
-        FCGridLayout.set_common_column_size([param_grid, adv_grid, area_grid, polish_grid, excellon_mill_grid], 0)
+        GLay.set_common_column_size([param_grid, adv_grid, area_grid, polish_grid, excellon_mill_grid], 0)
 
         self.layout.addStretch()
diff --git a/appGUI/preferences/tools/ToolsNCCPrefGroupUI.py b/appGUI/preferences/tools/ToolsNCCPrefGroupUI.py
index a473c701..0d62dbef 100644
--- a/appGUI/preferences/tools/ToolsNCCPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsNCCPrefGroupUI.py
@@ -1,7 +1,7 @@
 from PyQt6 import QtWidgets
 
 from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, NumericalEvalTupleEntry, FCComboBox2, FCLabel, \
-    FCGridLayout, FCFrame
+    GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -36,7 +36,7 @@ class ToolsNCCPrefGroupUI(OptionsGroupUI):
         par_frame = FCFrame()
         self.layout.addWidget(par_frame)
 
-        par_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        par_grid = GLay(v_spacing=5, h_spacing=3)
         par_frame.setLayout(par_grid)
 
         # Tools Diameters
@@ -161,7 +161,7 @@ class ToolsNCCPrefGroupUI(OptionsGroupUI):
         tt_frame = FCFrame()
         self.layout.addWidget(tt_frame)
 
-        tool_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        tool_grid = GLay(v_spacing=5, h_spacing=3)
         tt_frame.setLayout(tool_grid)
 
         # Overlap Entry
@@ -280,7 +280,7 @@ class ToolsNCCPrefGroupUI(OptionsGroupUI):
         gp_frame = FCFrame()
         self.layout.addWidget(gp_frame)
 
-        gen_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        gen_grid = GLay(v_spacing=5, h_spacing=3)
         gp_frame.setLayout(gen_grid)
 
         # Rest machining CheckBox
@@ -355,6 +355,6 @@ class ToolsNCCPrefGroupUI(OptionsGroupUI):
 
         gen_grid.addWidget(self.valid_cb, 10, 0, 1, 2)
 
-        FCGridLayout.set_common_column_size([par_grid, tool_grid, gen_grid], 0)
+        GLay.set_common_column_size([par_grid, tool_grid, gen_grid], 0)
 
         self.layout.addStretch(1)
diff --git a/appGUI/preferences/tools/ToolsPaintPrefGroupUI.py b/appGUI/preferences/tools/ToolsPaintPrefGroupUI.py
index 9a5a5b13..4f6e2a6f 100644
--- a/appGUI/preferences/tools/ToolsPaintPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsPaintPrefGroupUI.py
@@ -1,7 +1,7 @@
 from PyQt6 import QtWidgets
 
 from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCComboBox2, FCCheckBox, NumericalEvalTupleEntry, FCLabel, \
-    FCGridLayout, FCFrame
+    GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -38,7 +38,7 @@ class ToolsPaintPrefGroupUI(OptionsGroupUI):
         par_frame = FCFrame()
         self.layout.addWidget(par_frame)
 
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         par_frame.setLayout(param_grid)
 
         # Tool dia
@@ -144,7 +144,7 @@ class ToolsPaintPrefGroupUI(OptionsGroupUI):
         tt_frame = FCFrame()
         self.layout.addWidget(tt_frame)
 
-        tool_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        tool_grid = GLay(v_spacing=5, h_spacing=3)
         tt_frame.setLayout(tool_grid)
 
         # Overlap
@@ -237,7 +237,7 @@ class ToolsPaintPrefGroupUI(OptionsGroupUI):
         gp_frame = FCFrame()
         self.layout.addWidget(gp_frame)
 
-        gen_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        gen_grid = GLay(v_spacing=5, h_spacing=3)
         gp_frame.setLayout(gen_grid)
 
         self.rest_cb = FCCheckBox('%s' % _("Rest"))
@@ -310,6 +310,6 @@ class ToolsPaintPrefGroupUI(OptionsGroupUI):
         gen_grid.addWidget(plotting_label, 8, 0)
         gen_grid.addWidget(self.paint_plotting_radio, 8, 1)
 
-        FCGridLayout.set_common_column_size([tool_grid, param_grid, gen_grid], 0)
+        GLay.set_common_column_size([tool_grid, param_grid, gen_grid], 0)
 
         self.layout.addStretch(1)
diff --git a/appGUI/preferences/tools/ToolsPanelizePrefGroupUI.py b/appGUI/preferences/tools/ToolsPanelizePrefGroupUI.py
index c749d855..15c7f28e 100644
--- a/appGUI/preferences/tools/ToolsPanelizePrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsPanelizePrefGroupUI.py
@@ -1,6 +1,6 @@
 from PyQt6 import QtWidgets
 
-from appGUI.GUIElements import FCDoubleSpinner, FCSpinner, RadioSet, FCCheckBox, FCLabel, FCGridLayout, FCFrame
+from appGUI.GUIElements import FCDoubleSpinner, FCSpinner, RadioSet, FCCheckBox, FCLabel, GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -35,7 +35,7 @@ class ToolsPanelizePrefGroupUI(OptionsGroupUI):
         param_frame = FCFrame()
         self.layout.addWidget(param_frame)
 
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         param_frame.setLayout(param_grid)
 
         # ## Spacing Columns
diff --git a/appGUI/preferences/tools/ToolsSolderpastePrefGroupUI.py b/appGUI/preferences/tools/ToolsSolderpastePrefGroupUI.py
index 358d30d2..b42408fd 100644
--- a/appGUI/preferences/tools/ToolsSolderpastePrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsSolderpastePrefGroupUI.py
@@ -1,6 +1,6 @@
 from PyQt6 import QtCore
 
-from appGUI.GUIElements import FCDoubleSpinner, FCSpinner, FCComboBox, NumericalEvalTupleEntry, FCLabel, FCGridLayout, \
+from appGUI.GUIElements import FCDoubleSpinner, FCSpinner, FCComboBox, NumericalEvalTupleEntry, FCLabel, GLay, \
     FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
@@ -35,7 +35,7 @@ class ToolsSolderpastePrefGroupUI(OptionsGroupUI):
         param_frame = FCFrame()
         self.layout.addWidget(param_frame)
 
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         param_frame.setLayout(param_grid)
 
         # Nozzle Tool Diameters
diff --git a/appGUI/preferences/tools/ToolsSubPrefGroupUI.py b/appGUI/preferences/tools/ToolsSubPrefGroupUI.py
index 1373ca19..60185758 100644
--- a/appGUI/preferences/tools/ToolsSubPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsSubPrefGroupUI.py
@@ -1,4 +1,4 @@
-from appGUI.GUIElements import FCCheckBox, FCLabel, FCFrame, FCGridLayout
+from appGUI.GUIElements import FCCheckBox, FCLabel, FCFrame, GLay
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -31,7 +31,7 @@ class ToolsSubPrefGroupUI(OptionsGroupUI):
         param_frame = FCFrame()
         self.layout.addWidget(param_frame)
 
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         param_frame.setLayout(param_grid)
 
         self.close_paths_cb = FCCheckBox(_("Close paths"))
diff --git a/appGUI/preferences/tools/ToolsTransformPrefGroupUI.py b/appGUI/preferences/tools/ToolsTransformPrefGroupUI.py
index 3c0702c3..e0cda26b 100644
--- a/appGUI/preferences/tools/ToolsTransformPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsTransformPrefGroupUI.py
@@ -1,7 +1,7 @@
 from PyQt6 import QtWidgets, QtGui
 
 from appGUI.GUIElements import FCDoubleSpinner, FCCheckBox, NumericalEvalTupleEntry, FCComboBox, FCLabel, \
-    FCGridLayout, FCFrame
+    GLay, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -35,7 +35,7 @@ class ToolsTransformPrefGroupUI(OptionsGroupUI):
         param_frame = FCFrame()
         self.layout.addWidget(param_frame)
 
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         param_frame.setLayout(param_grid)
 
         # Reference Type
@@ -91,7 +91,7 @@ class ToolsTransformPrefGroupUI(OptionsGroupUI):
         rot_frame = FCFrame()
         self.layout.addWidget(rot_frame)
 
-        rot_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        rot_grid = GLay(v_spacing=5, h_spacing=3)
         rot_frame.setLayout(rot_grid)
 
         self.rotate_entry = FCDoubleSpinner()
@@ -132,7 +132,7 @@ class ToolsTransformPrefGroupUI(OptionsGroupUI):
         skew_frame = FCFrame()
         self.layout.addWidget(skew_frame)
 
-        skew_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        skew_grid = GLay(v_spacing=5, h_spacing=3)
         skew_frame.setLayout(skew_grid)
 
         self.skewx_entry = FCDoubleSpinner()
@@ -183,7 +183,7 @@ class ToolsTransformPrefGroupUI(OptionsGroupUI):
         scale_frame = FCFrame()
         self.layout.addWidget(scale_frame)
 
-        scale_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        scale_grid = GLay(v_spacing=5, h_spacing=3)
         scale_frame.setLayout(scale_grid)
 
         self.scalex_entry = FCDoubleSpinner()
@@ -220,7 +220,7 @@ class ToolsTransformPrefGroupUI(OptionsGroupUI):
         off_frame = FCFrame()
         self.layout.addWidget(off_frame)
 
-        off_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        off_grid = GLay(v_spacing=5, h_spacing=3)
         off_frame.setLayout(off_grid)
 
         self.offx_entry = FCDoubleSpinner()
@@ -273,7 +273,7 @@ class ToolsTransformPrefGroupUI(OptionsGroupUI):
         buff_frame = FCFrame()
         self.layout.addWidget(buff_frame)
 
-        buff_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        buff_grid = GLay(v_spacing=5, h_spacing=3)
         buff_frame.setLayout(buff_grid)
 
         self.buffer_label = FCLabel('%s:' % _("Distance"))
@@ -311,7 +311,7 @@ class ToolsTransformPrefGroupUI(OptionsGroupUI):
         buff_grid.addWidget(self.buffer_factor_label, 4, 0)
         buff_grid.addWidget(self.buffer_factor_entry, 4, 1)
 
-        FCGridLayout.set_common_column_size(
+        GLay.set_common_column_size(
             [param_grid, rot_grid, skew_grid, scale_grid, off_grid, buff_grid], 0)
 
         self.layout.addStretch()
diff --git a/appMain.py b/appMain.py
index c8e813fe..e28de4c9 100644
--- a/appMain.py
+++ b/appMain.py
@@ -82,8 +82,8 @@ from appGUI.PlotCanvas import *
 from appGUI.PlotCanvasLegacy import *
 from appGUI.PlotCanvas3d import *
 from appGUI.MainGUI import *
-from appGUI.GUIElements import FCFileSaveDialog, message_dialog, FlatCAMSystemTray, FCInputDialogSlider, \
-    FCGridLayout, FCLabel, DialogBoxChoice
+from appGUI.GUIElements import FCFileSaveDialog, message_dialog, AppSystemTray, FCInputDialogSlider, \
+    GLay, FCLabel, DialogBoxChoice
 
 # App Pre-processors
 from appPreProcessor import load_preprocessors
@@ -1373,16 +1373,16 @@ class App(QtCore.QObject):
         self.parent_w = QtWidgets.QWidget()
         if self.cmd_line_headless == 1:
             # if running headless always have the systray to be able to quit the app correctly
-            self.trayIcon = FlatCAMSystemTray(app=self,
-                                              icon=QtGui.QIcon(self.resource_location +
+            self.trayIcon = AppSystemTray(app=self,
+                                          icon=QtGui.QIcon(self.resource_location +
                                                                '/app32.png'),
-                                              headless=True,
-                                              parent=self.parent_w)
+                                          headless=True,
+                                          parent=self.parent_w)
         else:
             if self.options["global_systray_icon"]:
-                self.trayIcon = FlatCAMSystemTray(app=self,
-                                                  icon=QtGui.QIcon(self.resource_location + '/app32.png'),
-                                                  parent=self.parent_w)
+                self.trayIcon = AppSystemTray(app=self,
+                                              icon=QtGui.QIcon(self.resource_location + '/app32.png'),
+                                              parent=self.parent_w)
 
         # ###########################################################################################################
         # ############################################ SETUP RECENT ITEMS ###########################################
@@ -3565,7 +3565,7 @@ class App(QtCore.QObject):
                     },
                 ]
 
-                self.prog_grid_lay = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0, 0, 1])
+                self.prog_grid_lay = GLay(v_spacing=5, h_spacing=3, c_stretch=[0, 0, 1])
                 self.prog_grid_lay.setHorizontalSpacing(20)
 
                 prog_widget = QtWidgets.QWidget()
@@ -3606,7 +3606,7 @@ class App(QtCore.QObject):
                         self.prog_grid_lay.addWidget(FCLabel(''), line, 0)
                         line += 1
 
-                self.translator_grid_lay = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0, 0, 1, 0])
+                self.translator_grid_lay = GLay(v_spacing=5, h_spacing=3, c_stretch=[0, 0, 1, 0])
 
                 # trans_widget = QtWidgets.QWidget()
                 # trans_widget.setLayout(self.translator_grid_lay)
@@ -3813,7 +3813,7 @@ class App(QtCore.QObject):
                 self.intro_tab_layout.setContentsMargins(2, 2, 2, 2)
                 tab_widget.addTab(self.intro_tab, _("Contribute"))
 
-                self.grid_lay = FCGridLayout(v_spacing=5, h_spacing=20)
+                self.grid_lay = GLay(v_spacing=5, h_spacing=20)
                 # self.grid_lay.setHorizontalSpacing(20)
 
                 intro_wdg = QtWidgets.QWidget()
@@ -6934,6 +6934,9 @@ class App(QtCore.QObject):
     # def on_close_notebook_tab(self):
         # self.tool_shapes.clear(update=True)
 
+    def on_gui_coords_clicked(self):
+        self.distance_tool.run(toggle=True)
+
     def on_flipy(self):
         """
         Executed when the menu entry in Options -> Flip on Y axis is clicked.
diff --git a/appPlugins/ToolAlignObjects.py b/appPlugins/ToolAlignObjects.py
index 428599f2..a616403a 100644
--- a/appPlugins/ToolAlignObjects.py
+++ b/appPlugins/ToolAlignObjects.py
@@ -427,7 +427,7 @@ class AlignUI:
         self.tools_box.addWidget(m_frame)
 
         # Grid Layout
-        grid0 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid0 = GLay(v_spacing=5, h_spacing=3)
         m_frame.setLayout(grid0)
 
         # Type of object to be aligned
@@ -466,7 +466,7 @@ class AlignUI:
         self.tools_box.addWidget(d_frame)
 
         # Grid Layout
-        grid1 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid1 = GLay(v_spacing=5, h_spacing=3)
         d_frame.setLayout(grid1)
 
         # Type of object to be aligned to = aligner
@@ -499,7 +499,7 @@ class AlignUI:
         self.tools_box.addWidget(par_frame)
 
         # Grid Layout
-        grid2 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid2 = GLay(v_spacing=5, h_spacing=3)
         par_frame.setLayout(grid2)
 
         # Alignment Type
@@ -518,7 +518,7 @@ class AlignUI:
         grid2.addWidget(self.a_type_lbl, 0, 0, 1, 2)
         grid2.addWidget(self.a_type_radio, 2, 0, 1, 2)
 
-        # FCGridLayout.set_common_column_size([grid0, grid1, grid2], 0, FCLabel)
+        # GLay.set_common_column_size([grid0, grid1, grid2], 0, FCLabel)
 
         # Buttons
         self.align_object_button = FCButton(_("Align Object"))
diff --git a/appPlugins/ToolCalculators.py b/appPlugins/ToolCalculators.py
index 499e7d5a..c2785faa 100644
--- a/appPlugins/ToolCalculators.py
+++ b/appPlugins/ToolCalculators.py
@@ -536,7 +536,7 @@ class CalcUI:
         # Units Calculators
         # #############################################################################################################
         # Grid Layout
-        grid_units_layout = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid_units_layout = GLay(v_spacing=5, h_spacing=3)
         units_frame.setLayout(grid_units_layout)
 
         # Length conversion
@@ -594,7 +594,7 @@ class CalcUI:
         v_frame = FCFrame()
         self.layout.addWidget(v_frame)
 
-        grid_vshape = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid_vshape = GLay(v_spacing=5, h_spacing=3)
         v_frame.setLayout(grid_vshape)
 
         # self.v_shape_spacer_label = FCLabel(" ")
@@ -672,7 +672,7 @@ class CalcUI:
         ep_frame = FCFrame()
         self.layout.addWidget(ep_frame)
 
-        grid_electro = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid_electro = GLay(v_spacing=5, h_spacing=3)
         ep_frame.setLayout(grid_electro)
 
         # grid_electro.addWidget(FCLabel(""), 0, 0, 1, 2)
@@ -858,7 +858,7 @@ class CalcUI:
         tin_frame = FCFrame()
         self.layout.addWidget(tin_frame)
 
-        grid_tin = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid_tin = GLay(v_spacing=5, h_spacing=3)
         tin_frame.setLayout(grid_tin)
 
         # Solution
@@ -1037,7 +1037,7 @@ class CalcUI:
         )
         grid_tin.addWidget(self.calculate_tin_button, 30, 0, 1, 2)
 
-        FCGridLayout.set_common_column_size([grid_units_layout, grid_electro, grid_vshape, grid_tin], 0)
+        GLay.set_common_column_size([grid_units_layout, grid_electro, grid_vshape, grid_tin], 0)
 
         self.layout.addStretch(1)
 
diff --git a/appPlugins/ToolCalibration.py b/appPlugins/ToolCalibration.py
index c8d0e51e..a265562d 100644
--- a/appPlugins/ToolCalibration.py
+++ b/appPlugins/ToolCalibration.py
@@ -764,7 +764,7 @@ class CalibrationUI:
         self.layout.addWidget(title_label)
 
         # ## Grid Layout
-        grid_lay = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0, 1, 0])
+        grid_lay = GLay(v_spacing=5, h_spacing=3, c_stretch=[0, 1, 0])
         self.layout.addLayout(grid_lay)
 
         self.gcode_title_label = FCLabel('<b>%s:</b>' % _('Parameters'))
diff --git a/appPlugins/ToolCopperThieving.py b/appPlugins/ToolCopperThieving.py
index 0e59a369..1aeae019 100644
--- a/appPlugins/ToolCopperThieving.py
+++ b/appPlugins/ToolCopperThieving.py
@@ -1282,7 +1282,7 @@ class ThievingUI:
         self.tools_box.addWidget(self.grbobj_label)
 
         # ## Grid Layout
-        i_grid_lay = FCGridLayout(v_spacing=5, h_spacing=3)
+        i_grid_lay = GLay(v_spacing=5, h_spacing=3)
         self.tools_box.addLayout(i_grid_lay)
 
         self.grb_object_combo = FCComboBox()
@@ -1304,7 +1304,7 @@ class ThievingUI:
         tp_frame = FCFrame()
         self.tools_box.addWidget(tp_frame)
 
-        grid_lay = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid_lay = GLay(v_spacing=5, h_spacing=3)
         tp_frame.setLayout(grid_lay)
 
         # CLEARANCE #
@@ -1440,7 +1440,7 @@ class ThievingUI:
         self.dots_frame.setContentsMargins(0, 0, 0, 0)
         grid_lay.addWidget(self.dots_frame, 20, 0, 1, 2)
 
-        dots_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        dots_grid = GLay(v_spacing=5, h_spacing=3)
         dots_grid.setContentsMargins(0, 0, 0, 0)
         self.dots_frame.setLayout(dots_grid)
         self.dots_frame.hide()
@@ -1486,7 +1486,7 @@ class ThievingUI:
         self.squares_frame.setContentsMargins(0, 0, 0, 0)
         grid_lay.addWidget(self.squares_frame, 22, 0, 1, 2)
 
-        squares_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        squares_grid = GLay(v_spacing=5, h_spacing=3)
         squares_grid.setContentsMargins(0, 0, 0, 0)
         self.squares_frame.setLayout(squares_grid)
         self.squares_frame.hide()
@@ -1532,7 +1532,7 @@ class ThievingUI:
         self.lines_frame.setContentsMargins(0, 0, 0, 0)
         grid_lay.addWidget(self.lines_frame, 24, 0, 1, 2)
 
-        lines_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        lines_grid = GLay(v_spacing=5, h_spacing=3)
         lines_grid.setContentsMargins(0, 0, 0, 0)
         self.lines_frame.setLayout(lines_grid)
         self.lines_frame.hide()
@@ -1603,7 +1603,7 @@ class ThievingUI:
         self.tools_box.addWidget(rob_frame)
 
         # ## Grid Layout
-        grid_lay_1 = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0, 1, 0])
+        grid_lay_1 = GLay(v_spacing=5, h_spacing=3, c_stretch=[0, 1, 0])
         rob_frame.setLayout(grid_lay_1)
 
         # separator_line_1 = QtWidgets.QFrame()
@@ -1686,7 +1686,7 @@ class ThievingUI:
         self.tools_box.addWidget(pp_frame)
 
         # ## Grid Layout
-        grid_lay_2 = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0, 1, 0])
+        grid_lay_2 = GLay(v_spacing=5, h_spacing=3, c_stretch=[0, 1, 0])
         pp_frame.setLayout(grid_lay_2)
 
         # Only Pads
@@ -1748,7 +1748,7 @@ class ThievingUI:
         grid_lay_2.addWidget(self.ppm_choice_label, 6, 0)
         grid_lay_2.addWidget(self.ppm_choice_combo, 6, 1, 1, 2)
 
-        FCGridLayout.set_common_column_size(
+        GLay.set_common_column_size(
             [i_grid_lay, grid_lay, grid_lay_1, grid_lay_2, dots_grid, squares_grid, lines_grid], 0)
 
         # #############################################################################################################
diff --git a/appPlugins/ToolCutOut.py b/appPlugins/ToolCutOut.py
index 0d4a2d91..fbcf9cf9 100644
--- a/appPlugins/ToolCutOut.py
+++ b/appPlugins/ToolCutOut.py
@@ -2266,7 +2266,7 @@ class CutoutUI:
         self.tools_box.addWidget(obj_frame)
 
         # Grid Layout
-        obj_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        obj_grid = GLay(v_spacing=5, h_spacing=3)
         obj_frame.setLayout(obj_grid)
 
         # Object kind
@@ -2319,7 +2319,7 @@ class CutoutUI:
         self.tools_box.addWidget(tool_frame)
 
         # Grid Layout
-        tool_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        tool_grid = GLay(v_spacing=5, h_spacing=3)
         tool_frame.setLayout(tool_grid)
 
         # Tool Diameter
@@ -2377,7 +2377,7 @@ class CutoutUI:
         self.tools_box.addWidget(tool_par_frame)
 
         # Grid Layout
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         tool_par_frame.setLayout(param_grid)
 
         # Convex Shape
@@ -2456,7 +2456,7 @@ class CutoutUI:
         self.tools_box.addWidget(gaps_frame)
 
         # Grid Layout
-        gaps_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        gaps_grid = GLay(v_spacing=5, h_spacing=3)
         gaps_frame.setLayout(gaps_grid)
 
         # Gapsize
@@ -2606,7 +2606,7 @@ class CutoutUI:
         self.man_frame.setContentsMargins(0, 0, 0, 0)
         gaps_grid.addWidget(self.man_frame, 20, 0, 1, 2)
 
-        man_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        man_grid = GLay(v_spacing=5, h_spacing=3)
         man_grid.setContentsMargins(0, 0, 0, 0)
         self.man_frame.setLayout(man_grid)
 
@@ -2705,7 +2705,7 @@ class CutoutUI:
         self.tools_box.addWidget(self.drill_cut_frame)
 
         # Grid Layout
-        drill_cut_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        drill_cut_grid = GLay(v_spacing=5, h_spacing=3)
         self.drill_cut_frame.setLayout(drill_cut_grid)
 
         # Drilling Geo Object Label
@@ -2765,7 +2765,7 @@ class CutoutUI:
         drill_cut_grid.addWidget(self.drill_margin_label, 8, 0)
         drill_cut_grid.addWidget(self.drill_margin_entry, 8, 1)
 
-        FCGridLayout.set_common_column_size([obj_grid, tool_grid, param_grid, man_grid, drill_cut_grid, gaps_grid], 0)
+        GLay.set_common_column_size([obj_grid, tool_grid, param_grid, man_grid, drill_cut_grid, gaps_grid], 0)
 
         # Drill Cut Button
         self.drillcut_btn = FCButton(_("Cut by Drilling"))
diff --git a/appPlugins/ToolDblSided.py b/appPlugins/ToolDblSided.py
index 3d723c7a..220abdbb 100644
--- a/appPlugins/ToolDblSided.py
+++ b/appPlugins/ToolDblSided.py
@@ -728,7 +728,7 @@ class DsidedUI:
         self.tools_box.addWidget(source_frame)
 
         # ## Grid Layout
-        obj_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        obj_grid = GLay(v_spacing=5, h_spacing=3)
         source_frame.setLayout(obj_grid)
 
         # Type of object to be cutout
@@ -763,7 +763,7 @@ class DsidedUI:
         self.bounds_frame = FCFrame()
         self.tools_box.addWidget(self.bounds_frame)
 
-        grid_bounds = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid_bounds = GLay(v_spacing=5, h_spacing=3)
         self.bounds_frame.setLayout(grid_bounds)
 
         # Xmin value
@@ -861,7 +861,7 @@ class DsidedUI:
         mirror_frame = FCFrame()
         self.tools_box.addWidget(mirror_frame)
 
-        grid_mirror = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid_mirror = GLay(v_spacing=5, h_spacing=3)
         mirror_frame.setLayout(grid_mirror)
 
         # ## Axis
@@ -946,7 +946,7 @@ class DsidedUI:
         self.br_frame.setContentsMargins(0, 0, 0, 0)
         grid_mirror.addWidget(self.br_frame, 11, 0, 1, 3)
 
-        grid_box_ref = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid_box_ref = GLay(v_spacing=5, h_spacing=3)
         grid_box_ref.setContentsMargins(0, 0, 0, 0)
         self.br_frame.setLayout(grid_box_ref)
 
@@ -976,7 +976,7 @@ class DsidedUI:
         self.sr_frame.setContentsMargins(0, 0, 0, 0)
         grid_mirror.addWidget(self.sr_frame, 13, 0, 1, 3)
 
-        grid_snap_ref = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid_snap_ref = GLay(v_spacing=5, h_spacing=3)
         grid_snap_ref.setContentsMargins(0, 0, 0, 0)
         self.sr_frame.setLayout(grid_snap_ref)
 
@@ -1035,7 +1035,7 @@ class DsidedUI:
         align_frame = FCFrame()
         self.tools_box.addWidget(align_frame)
 
-        grid4 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid4 = GLay(v_spacing=5, h_spacing=3)
         align_frame.setLayout(grid4)
 
         # ## Drill diameter for alignment holes
@@ -1122,7 +1122,7 @@ class DsidedUI:
         hlay.addWidget(self.delete_drill_point_button)
         grid4.addLayout(hlay, 9, 0, 1, 2)
 
-        FCGridLayout.set_common_column_size([obj_grid, grid_bounds, grid_mirror, grid_box_ref, grid4], 0)
+        GLay.set_common_column_size([obj_grid, grid_bounds, grid_mirror, grid_box_ref, grid4], 0)
 
         # ## Buttons
         self.create_excellon_button = FCButton(_("Create Excellon Object"))
diff --git a/appPlugins/ToolDistance.py b/appPlugins/ToolDistance.py
index 174ee0b1..8583360d 100644
--- a/appPlugins/ToolDistance.py
+++ b/appPlugins/ToolDistance.py
@@ -90,11 +90,58 @@ class Distance(AppTool):
 
         self.init_plugin()
 
-        # if the splitter is hidden, display it
-        if self.app.ui.splitter.sizes()[0] == 0:
-            self.app.ui.splitter.setSizes([1, 1])
         if toggle:
-            pass
+            # if the splitter is hidden, display it
+            if self.app.ui.splitter.sizes()[0] == 0:
+                self.app.ui.splitter.setSizes([1, 1])
+
+            # if the Tool Tab is hidden display it, else hide it but only if the objectName is the same
+            found_idx = None
+            for idx in range(self.app.ui.notebook.count()):
+                if self.app.ui.notebook.widget(idx).objectName() == "plugin_tab":
+                    found_idx = idx
+                    break
+            # show the Tab
+            if not found_idx:
+                try:
+                    self.app.ui.notebook.addTab(self.app.ui.plugin_tab, _("Plugin"))
+                except RuntimeError:
+                    self.app.ui.plugin_tab = QtWidgets.QWidget()
+                    self.app.ui.plugin_tab.setObjectName("plugin_tab")
+                    self.app.ui.plugin_tab_layout = QtWidgets.QVBoxLayout(self.app.ui.plugin_tab)
+                    self.app.ui.plugin_tab_layout.setContentsMargins(2, 2, 2, 2)
+
+                    self.app.ui.plugin_scroll_area = VerticalScrollArea()
+                    self.app.ui.plugin_tab_layout.addWidget(self.app.ui.plugin_scroll_area)
+                    self.app.ui.notebook.addTab(self.app.ui.plugin_tab, _("Plugin"))
+                # focus on Tool Tab
+                self.app.ui.notebook.setCurrentWidget(self.app.ui.plugin_tab)
+
+            try:
+                if self.app.ui.plugin_scroll_area.widget().objectName() == self.pluginName and found_idx:
+                    # if the Tool Tab is not focused, focus on it
+                    if not self.app.ui.notebook.currentWidget() is self.app.ui.plugin_tab:
+                        # focus on Tool Tab
+                        self.app.ui.notebook.setCurrentWidget(self.app.ui.plugin_tab)
+                    else:
+                        # else remove the Tool Tab
+                        self.app.ui.notebook.setCurrentWidget(self.app.ui.properties_tab)
+                        self.app.ui.notebook.removeTab(2)
+
+                        # if there are no objects loaded in the app then hide the Notebook widget
+                        if not self.app.collection.get_list():
+                            self.app.ui.splitter.setSizes([0, 1])
+
+                        if self.active:
+                            self.on_exit()
+                        return
+            except AttributeError:
+                pass
+
+            AppTool.run(self)
+        else:
+            if self.app.ui.splitter.sizes()[0] == 0:
+                self.app.ui.splitter.setSizes([1, 1])
 
         self.old_cursor_type = self.app.options["global_cursor_type"]
 
@@ -793,7 +840,7 @@ class DistanceUI:
         self.par_frame = FCFrame()
         self.layout.addWidget(self.par_frame)
 
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         self.par_frame.setLayout(param_grid)
 
         self.snap_center_cb = FCCheckBox(_("Snap to center"))
@@ -824,7 +871,7 @@ class DistanceUI:
         coords_frame = FCFrame()
         self.layout.addWidget(coords_frame)
 
-        coords_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        coords_grid = GLay(v_spacing=5, h_spacing=3)
         coords_frame.setLayout(coords_grid)
 
         # separator_line = QtWidgets.QFrame()
@@ -867,7 +914,7 @@ class DistanceUI:
         res_frame = FCFrame()
         self.layout.addWidget(res_frame)
 
-        res_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        res_grid = GLay(v_spacing=5, h_spacing=3)
         res_frame.setLayout(res_grid)
 
         # DX distance
@@ -945,7 +992,7 @@ class DistanceUI:
         self.measure_btn = FCButton(_("Measure"))
         self.layout.addWidget(self.measure_btn)
 
-        FCGridLayout.set_common_column_size([param_grid, coords_grid, res_grid], 0)
+        GLay.set_common_column_size([param_grid, coords_grid, res_grid], 0)
 
         self.layout.addStretch(1)
 
diff --git a/appPlugins/ToolDrilling.py b/appPlugins/ToolDrilling.py
index 5bf0dccd..b8190f5f 100644
--- a/appPlugins/ToolDrilling.py
+++ b/appPlugins/ToolDrilling.py
@@ -2407,7 +2407,7 @@ class DrillingUI:
         self.tools_box.addWidget(self.obj_combo_label)
 
         # Grid Layout
-        obj_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        obj_grid = GLay(v_spacing=5, h_spacing=3)
         self.tools_box.addLayout(obj_grid)
 
         # ################################################
@@ -2436,7 +2436,7 @@ class DrillingUI:
         tt_frame = FCFrame()
         self.tools_box.addWidget(tt_frame)
 
-        tool_grid = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0, 0])
+        tool_grid = GLay(v_spacing=5, h_spacing=3, c_stretch=[0, 0])
         tt_frame.setLayout(tool_grid)
 
         # Tools Table
@@ -2514,7 +2514,7 @@ class DrillingUI:
         self.exc_tools_box.addWidget(tp_frame)
 
         # Grid Layout
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         tp_frame.setLayout(param_grid)
 
         # Cut Z
@@ -2753,7 +2753,7 @@ class DrillingUI:
         gp_frame = FCFrame()
         self.exc_tools_box.addWidget(gp_frame)
 
-        all_par_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        all_par_grid = GLay(v_spacing=5, h_spacing=3)
         gp_frame.setLayout(all_par_grid)
 
         # Tool change
@@ -2932,7 +2932,7 @@ class DrillingUI:
 
         self.exclusion_table.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows)
 
-        exclud_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        exclud_grid = GLay(v_spacing=5, h_spacing=3)
         self.exclusion_box.addLayout(exclud_grid)
 
         # Chose Strategy
@@ -2998,7 +2998,7 @@ class DrillingUI:
         # separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
         # all_par_grid.addWidget(separator_line, 25, 0, 1, 2)
 
-        FCGridLayout.set_common_column_size([obj_grid, tool_grid, param_grid, all_par_grid], 0)
+        GLay.set_common_column_size([obj_grid, tool_grid, param_grid, all_par_grid], 0)
 
         self.generate_cnc_button = QtWidgets.QPushButton(_('Generate CNCJob object'))
         self.generate_cnc_button.setIcon(QtGui.QIcon(self.app.resource_location + '/cnc16.png'))
diff --git a/appPlugins/ToolEtchCompensation.py b/appPlugins/ToolEtchCompensation.py
index 595fd5f7..d3c851fd 100644
--- a/appPlugins/ToolEtchCompensation.py
+++ b/appPlugins/ToolEtchCompensation.py
@@ -339,7 +339,7 @@ class EtchUI:
         self.tools_box.addWidget(util_frame)
 
         # Grid Layout
-        grid0 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid0 = GLay(v_spacing=5, h_spacing=3)
         util_frame.setLayout(grid0)
 
         # Oz to um conversion
@@ -396,7 +396,7 @@ class EtchUI:
         self.gp_frame = FCFrame()
         self.tools_box.addWidget(self.gp_frame)
 
-        grid1 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid1 = GLay(v_spacing=5, h_spacing=3)
         self.gp_frame.setLayout(grid1)
 
         # Thickness
diff --git a/appPlugins/ToolExtract.py b/appPlugins/ToolExtract.py
index 386b52e5..adfa7491 100644
--- a/appPlugins/ToolExtract.py
+++ b/appPlugins/ToolExtract.py
@@ -1040,15 +1040,15 @@ class ExtractUI:
         self.tools_box.addWidget(pads_frame)
 
         # ## Grid Layout
-        grid_lay = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid_lay = GLay(v_spacing=5, h_spacing=3)
         grid_lay.setColumnStretch(0, 1)
         grid_lay.setColumnStretch(1, 0)
         pads_frame.setLayout(grid_lay)
 
-        pad_all_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        pad_all_grid = GLay(v_spacing=5, h_spacing=3)
         grid_lay.addLayout(pad_all_grid, 5, 0, 1, 2)
 
-        pad_grid = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0])
+        pad_grid = GLay(v_spacing=5, h_spacing=3, c_stretch=[0])
         pad_all_grid.addLayout(pad_grid, 0, 0)
 
         # All Aperture Selection
@@ -1141,7 +1141,7 @@ class ExtractUI:
         self.tools_box.addWidget(ed_frame)
 
         # ## Grid Layout
-        grid1 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid1 = GLay(v_spacing=5, h_spacing=3)
         ed_frame.setLayout(grid1)
 
         self.method_label = FCLabel('%s:' % _("Method"))
@@ -1181,7 +1181,7 @@ class ExtractUI:
         self.ring_frame.setLayout(self.ring_box)
 
         # ## Grid Layout
-        ring_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        ring_grid = GLay(v_spacing=5, h_spacing=3)
         ring_grid.setContentsMargins(0, 0, 0, 0)
         self.ring_box.addLayout(ring_grid)
 
@@ -1266,7 +1266,7 @@ class ExtractUI:
         self.fix_frame.setContentsMargins(0, 0, 0, 0)
         grid1.addWidget(self.fix_frame, 10, 0, 1, 2)
 
-        fixed_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        fixed_grid = GLay(v_spacing=5, h_spacing=3)
         fixed_grid.setContentsMargins(0, 0, 0, 0)
         self.fix_frame.setLayout(fixed_grid)
 
@@ -1294,7 +1294,7 @@ class ExtractUI:
         self.prop_frame.setContentsMargins(0, 0, 0, 0)
         grid1.addWidget(self.prop_frame, 12, 0, 1, 2)
 
-        prop_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        prop_grid = GLay(v_spacing=5, h_spacing=3)
         prop_grid.setContentsMargins(0, 0, 0, 0)
         self.prop_frame.setLayout(prop_grid)
 
@@ -1345,7 +1345,7 @@ class ExtractUI:
         self.es_frame = FCFrame()
         self.tools_box.addWidget(self.es_frame)
 
-        es_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        es_grid = GLay(v_spacing=5, h_spacing=3)
         self.es_frame.setLayout(es_grid)
 
         # CLEARANCE
@@ -1390,7 +1390,7 @@ class ExtractUI:
         self.ec_frame = FCFrame()
         self.tools_box.addWidget(self.ec_frame)
 
-        ec_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        ec_grid = GLay(v_spacing=5, h_spacing=3)
         self.ec_frame.setLayout(ec_grid)
 
         # Margin
@@ -1421,7 +1421,7 @@ class ExtractUI:
         ec_grid.addWidget(self.thick_cut_label, 2, 0)
         ec_grid.addWidget(self.thick_cut_entry, 2, 1)
 
-        FCGridLayout.set_common_column_size(
+        GLay.set_common_column_size(
             [grid1, grid_lay, ring_grid, ec_grid, prop_grid, fixed_grid, ring_grid, es_grid, pad_all_grid, pad_grid], 0)
 
         # #############################################################################################################
diff --git a/appPlugins/ToolFiducials.py b/appPlugins/ToolFiducials.py
index b618abda..8b0b021d 100644
--- a/appPlugins/ToolFiducials.py
+++ b/appPlugins/ToolFiducials.py
@@ -1057,7 +1057,7 @@ class FidoUI:
         par_frame = FCFrame()
         self.tools_box.addWidget(par_frame)
 
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         par_frame.setLayout(param_grid)
 
         # DIAMETER #
@@ -1153,7 +1153,7 @@ class FidoUI:
         self.tools_box.addWidget(self.s_frame)
 
         # Grid Layout
-        grid_sel = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid_sel = GLay(v_spacing=5, h_spacing=3)
         self.s_frame.setLayout(grid_sel)
 
         # Mode #
@@ -1175,7 +1175,7 @@ class FidoUI:
             _("Use a big cursor."))
         grid_sel.addWidget(self.big_cursor_cb, 2, 0, 1, 2)
 
-        FCGridLayout.set_common_column_size([grid_sel, param_grid, param_grid], 0)
+        GLay.set_common_column_size([grid_sel, param_grid, param_grid], 0)
 
         # ## Insert Copper Fiducial
         self.add_cfid_button = FCButton(_("Add Fiducial"))
diff --git a/appPlugins/ToolFilm.py b/appPlugins/ToolFilm.py
index 4a64f39d..49bae2e2 100644
--- a/appPlugins/ToolFilm.py
+++ b/appPlugins/ToolFilm.py
@@ -1276,7 +1276,7 @@ class FilmUI:
         obj_frame = FCFrame()
         self.tools_box.addWidget(obj_frame)
 
-        obj_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        obj_grid = GLay(v_spacing=5, h_spacing=3)
         obj_frame.setLayout(obj_grid)
 
         # Type of object for which to create the film
@@ -1342,7 +1342,7 @@ class FilmUI:
         self.adj_frame = FCFrame()
         self.tools_box.addWidget(self.adj_frame)
 
-        adj_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        adj_grid = GLay(v_spacing=5, h_spacing=3)
         self.adj_frame.setLayout(adj_grid)
 
         # Scale Geometry
@@ -1535,7 +1535,7 @@ class FilmUI:
         par_frame = FCFrame()
         self.tools_box.addWidget(par_frame)
 
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         par_frame.setLayout(param_grid)
 
         # Convex Shape
@@ -1622,7 +1622,7 @@ class FilmUI:
         self.punch_frame.setContentsMargins(0, 0, 0, 0)
         param_grid.addWidget(self.punch_frame, 12, 0, 1, 2)
 
-        punch_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        punch_grid = GLay(v_spacing=5, h_spacing=3)
         punch_grid.setContentsMargins(0, 0, 0, 0)
         self.punch_frame.setLayout(punch_grid)
 
@@ -1675,7 +1675,7 @@ class FilmUI:
         exp_frame = FCFrame()
         self.tools_box.addWidget(exp_frame)
 
-        export_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        export_grid = GLay(v_spacing=5, h_spacing=3)
         exp_frame.setLayout(export_grid)
 
         self.file_type_label = FCLabel('%s:' % _("Film Type"))
@@ -1790,7 +1790,7 @@ class FilmUI:
         self.png_dpi_label.hide()
         self.png_dpi_spinner.hide()
 
-        FCGridLayout.set_common_column_size([adj_grid, param_grid, obj_grid, export_grid, punch_grid], 0)
+        GLay.set_common_column_size([adj_grid, param_grid, obj_grid, export_grid, punch_grid], 0)
 
         # Buttons
         self.film_object_button = FCButton(_("Save Film"))
diff --git a/appPlugins/ToolFollow.py b/appPlugins/ToolFollow.py
index c9594169..55104bca 100644
--- a/appPlugins/ToolFollow.py
+++ b/appPlugins/ToolFollow.py
@@ -720,7 +720,7 @@ class FollowUI:
         self.gp_frame = FCFrame()
         self.tools_box.addWidget(self.gp_frame)
 
-        grid0 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid0 = GLay(v_spacing=5, h_spacing=3)
         self.gp_frame.setLayout(grid0)
 
         # Polygon selection
diff --git a/appPlugins/ToolImage.py b/appPlugins/ToolImage.py
index f8066b95..233b353b 100644
--- a/appPlugins/ToolImage.py
+++ b/appPlugins/ToolImage.py
@@ -311,7 +311,7 @@ class ImageUI:
         self.layout.addWidget(title_label)
 
         # Grid Layout
-        grid0 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid0 = GLay(v_spacing=5, h_spacing=3)
         self.layout.addLayout(grid0)
 
         # Type of object to create for the image
diff --git a/appPlugins/ToolInvertGerber.py b/appPlugins/ToolInvertGerber.py
index e40b8e4f..4a29ba1b 100644
--- a/appPlugins/ToolInvertGerber.py
+++ b/appPlugins/ToolInvertGerber.py
@@ -249,7 +249,7 @@ class InvertUI:
         self.tools_box.addWidget(self.gp_frame)
 
         # Grid Layout
-        grid0 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid0 = GLay(v_spacing=5, h_spacing=3)
         self.gp_frame.setLayout(grid0)
 
         # Margin
diff --git a/appPlugins/ToolIsolation.py b/appPlugins/ToolIsolation.py
index 85234389..8fc20617 100644
--- a/appPlugins/ToolIsolation.py
+++ b/appPlugins/ToolIsolation.py
@@ -3413,7 +3413,7 @@ class IsoUI:
         self.tools_box.addWidget(tt_frame)
 
         # Grid Layout
-        tool_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        tool_grid = GLay(v_spacing=5, h_spacing=3)
         tt_frame.setLayout(tool_grid)
 
         self.tools_table = FCTable(drag_drop=True)
@@ -3461,7 +3461,7 @@ class IsoUI:
         self.add_tool_frame.setContentsMargins(0, 0, 0, 0)
         tool_grid.addWidget(self.add_tool_frame, 4, 0, 1, 2)
 
-        new_tool_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        new_tool_grid = GLay(v_spacing=5, h_spacing=3)
         new_tool_grid.setContentsMargins(0, 0, 0, 0)
         self.add_tool_frame.setLayout(new_tool_grid)
 
@@ -3502,7 +3502,7 @@ class IsoUI:
         # #############################################################################################################
         # ################################    Button Grid   ###########################################################
         # #############################################################################################################
-        button_grid = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[1, 0])
+        button_grid = GLay(v_spacing=5, h_spacing=3, c_stretch=[1, 0])
         new_tool_grid.addLayout(button_grid, 6, 0, 1, 3)
 
         self.search_and_add_btn = FCButton(_('Search and Add'))
@@ -3568,7 +3568,7 @@ class IsoUI:
         self.tool_params_box.addWidget(tp_frame)
 
         # Grid Layout
-        tool_param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        tool_param_grid = GLay(v_spacing=5, h_spacing=3)
         tp_frame.setLayout(tool_param_grid)
 
         # Tool Type
@@ -3601,7 +3601,7 @@ class IsoUI:
         self.v_frame.setContentsMargins(0, 0, 0, 0)
         tool_param_grid.addWidget(self.v_frame, 2, 0, 1, 2)
 
-        v_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        v_grid = GLay(v_spacing=5, h_spacing=3)
         v_grid.setContentsMargins(0, 0, 0, 0)
         self.v_frame.setLayout(v_grid)
 
@@ -3767,7 +3767,7 @@ class IsoUI:
         gp_frame = FCFrame()
         self.tool_params_box.addWidget(gp_frame)
 
-        gen_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        gen_grid = GLay(v_spacing=5, h_spacing=3)
         gp_frame.setLayout(gen_grid)
 
         # Rest Machining
@@ -3954,7 +3954,7 @@ class IsoUI:
         self.area_shape_label.hide()
         self.area_shape_radio.hide()
 
-        FCGridLayout.set_common_column_size([tool_grid, new_tool_grid, tool_param_grid, v_grid, gen_grid], 0)
+        GLay.set_common_column_size([tool_grid, new_tool_grid, tool_param_grid, v_grid, gen_grid], 0)
 
         # #############################################################################################################
         # Generate Geometry object
diff --git a/appPlugins/ToolLevelling.py b/appPlugins/ToolLevelling.py
index 7cac3b9a..58f1c5a9 100644
--- a/appPlugins/ToolLevelling.py
+++ b/appPlugins/ToolLevelling.py
@@ -1791,7 +1791,7 @@ class LevelUI:
         self.al_box.setContentsMargins(0, 0, 0, 0)
         self.al_frame.setLayout(self.al_box)
 
-        grid0 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid0 = GLay(v_spacing=5, h_spacing=3)
         self.al_box.addLayout(grid0)
 
         self.al_title = FCLabel('<b>%s</b>' % _("Probe Points Table"))
@@ -1815,7 +1815,7 @@ class LevelUI:
         self.tools_box.addWidget(tt_frame)
 
         # Grid Layout
-        tool_grid = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0, 0])
+        tool_grid = GLay(v_spacing=5, h_spacing=3, c_stretch=[0, 0])
         tt_frame.setLayout(tool_grid)
 
         self.al_probe_points_table = FCTable()
@@ -1848,7 +1848,7 @@ class LevelUI:
         self.tools_box.addWidget(tp_frame)
 
         # Grid Layout
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         tp_frame.setLayout(param_grid)
 
         # Travel Z Probe
@@ -1963,7 +1963,7 @@ class LevelUI:
         self.c_frame = FCFrame()
         self.tools_box.addWidget(self.c_frame)
 
-        ctrl_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        ctrl_grid = GLay(v_spacing=5, h_spacing=3)
         self.c_frame.setLayout(ctrl_grid)
 
         self.al_controller_combo = FCComboBox()
@@ -2034,7 +2034,7 @@ class LevelUI:
         self.connect_frame = FCFrame()
         self.gr_conn_tab_layout.addWidget(self.connect_frame)
 
-        grbl_conn_grid = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0, 1, 0])
+        grbl_conn_grid = GLay(v_spacing=5, h_spacing=3, c_stretch=[0, 1, 0])
         self.connect_frame.setLayout(grbl_conn_grid)
 
         # COM list
@@ -2114,12 +2114,12 @@ class LevelUI:
         # #############################################################################################################
         self.ctrl_grbl_frame = FCFrame()
         self.gr_ctrl_tab_layout.addWidget(self.ctrl_grbl_frame)
-        grbl_ctrl_grid = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0, 1, 0])
+        grbl_ctrl_grid = GLay(v_spacing=5, h_spacing=3, c_stretch=[0, 1, 0])
         self.ctrl_grbl_frame.setLayout(grbl_ctrl_grid)
 
         self.ctrl_grbl_frame2 = FCFrame()
         self.gr_ctrl_tab_layout.addWidget(self.ctrl_grbl_frame2)
-        grbl_ctrl2_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        grbl_ctrl2_grid = GLay(v_spacing=5, h_spacing=3)
         self.ctrl_grbl_frame2.setLayout(grbl_ctrl2_grid)
 
         self.gr_ctrl_tab_layout.addStretch(1)
@@ -2221,7 +2221,7 @@ class LevelUI:
         self.sender_frame = FCFrame()
         self.gr_send_tab_layout.addWidget(self.sender_frame)
 
-        grbl_send_grid = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[1, 0])
+        grbl_send_grid = GLay(v_spacing=5, h_spacing=3, c_stretch=[1, 0])
         self.sender_frame.setLayout(grbl_send_grid)
 
         # Send CUSTOM COMMAND
diff --git a/appPlugins/ToolMarkers.py b/appPlugins/ToolMarkers.py
index dadfcbfb..82e602ad 100644
--- a/appPlugins/ToolMarkers.py
+++ b/appPlugins/ToolMarkers.py
@@ -1287,7 +1287,7 @@ class MarkersUI:
         par_frame = FCFrame()
         self.tools_box.addWidget(par_frame)
 
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         par_frame.setLayout(param_grid)
 
         # Type of Marker
@@ -1341,7 +1341,7 @@ class MarkersUI:
         self.off_frame = FCFrame()
         self.tools_box.addWidget(self.off_frame)
 
-        off_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        off_grid = GLay(v_spacing=5, h_spacing=3)
         self.off_frame.setLayout(off_grid)
 
         # Offset Reference
@@ -1405,7 +1405,7 @@ class MarkersUI:
         self.tools_box.addWidget(self.loc_frame)
 
         # Grid Layout
-        grid_loc = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid_loc = GLay(v_spacing=5, h_spacing=3)
         self.loc_frame.setLayout(grid_loc)
 
         # TOP LEFT
@@ -1443,7 +1443,7 @@ class MarkersUI:
         self.tools_box.addWidget(self.s_frame)
 
         # Grid Layout
-        grid_sel = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid_sel = GLay(v_spacing=5, h_spacing=3)
         self.s_frame.setLayout(grid_sel)
 
         # Type of placement of markers
@@ -1502,7 +1502,7 @@ class MarkersUI:
         self.tools_box.addWidget(self.drill_frame)
 
         # Grid Layout
-        grid_drill = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid_drill = GLay(v_spacing=5, h_spacing=3)
         self.drill_frame.setLayout(grid_drill)
 
         # Drill Tooldia #
@@ -1568,7 +1568,7 @@ class MarkersUI:
         self.insert_frame = FCFrame()
         self.tools_box.addWidget(self.insert_frame)
 
-        insert_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        insert_grid = GLay(v_spacing=5, h_spacing=3)
         self.insert_frame.setLayout(insert_grid)
 
         self.insert_type_label = FCLabel('%s:' % _("Type"))
@@ -1605,7 +1605,7 @@ class MarkersUI:
                                        """)
         self.tools_box.addWidget(self.insert_markers_button)
 
-        FCGridLayout.set_common_column_size([grid_sel, param_grid, off_grid, grid_loc, grid_drill, insert_grid], 0)
+        GLay.set_common_column_size([grid_sel, param_grid, off_grid, grid_loc, grid_drill, insert_grid], 0)
 
         self.layout.addStretch(1)
 
diff --git a/appPlugins/ToolMilling.py b/appPlugins/ToolMilling.py
index 2a3d0aa1..0ffb8646 100644
--- a/appPlugins/ToolMilling.py
+++ b/appPlugins/ToolMilling.py
@@ -3954,7 +3954,7 @@ class MillingUI:
         self.tools_box.addWidget(obj_frame)
 
         # Grid Layout
-        obj_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        obj_grid = GLay(v_spacing=5, h_spacing=3)
         obj_frame.setLayout(obj_grid)
 
         self.target_label = FCLabel('%s:' % _("Type"))
@@ -3993,7 +3993,7 @@ class MillingUI:
         # #############################################################################################################
 
         # Grid Layout
-        tool_title_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        tool_title_grid = GLay(v_spacing=5, h_spacing=3)
         self.tools_box.addLayout(tool_title_grid)
 
         self.tools_table_label = FCLabel('<span style="color:green;"><b>%s</b></span>' % _('Tools Table'))
@@ -4012,7 +4012,7 @@ class MillingUI:
         self.tools_box.addWidget(tt_frame)
 
         # Grid Layout
-        tool_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        tool_grid = GLay(v_spacing=5, h_spacing=3)
         tt_frame.setLayout(tool_grid)
 
         # ################################################
@@ -4175,7 +4175,7 @@ class MillingUI:
         self.add_tool_frame.setContentsMargins(0, 0, 0, 0)
         tool_grid.addWidget(self.add_tool_frame, 6, 0, 1, 2)
 
-        new_tool_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        new_tool_grid = GLay(v_spacing=5, h_spacing=3)
         new_tool_grid.setContentsMargins(0, 0, 0, 0)
         self.add_tool_frame.setLayout(new_tool_grid)
 
@@ -4203,7 +4203,7 @@ class MillingUI:
         # #############################################################################################################
         # ################################    Button Grid   ###########################################################
         # #############################################################################################################
-        button_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        button_grid = GLay(v_spacing=5, h_spacing=3)
         button_grid.setColumnStretch(0, 1)
         button_grid.setColumnStretch(1, 0)
         new_tool_grid.addLayout(button_grid, 5, 0, 1, 2)
@@ -4273,7 +4273,7 @@ class MillingUI:
         self.tool_params_box.addWidget(tp_frame)
 
         # Grid Layout
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         tp_frame.setLayout(param_grid)
 
         # Milling Type
@@ -4769,7 +4769,7 @@ class MillingUI:
         gp_frame = FCFrame()
         self.tool_params_box.addWidget(gp_frame)
 
-        gen_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        gen_grid = GLay(v_spacing=5, h_spacing=3)
         gp_frame.setLayout(gen_grid)
 
         # Tool change Z:
@@ -4982,7 +4982,7 @@ class MillingUI:
 
         self.exclusion_table.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows)
 
-        grid_a1 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid_a1 = GLay(v_spacing=5, h_spacing=3)
         self.exclusion_box.addLayout(grid_a1)
 
         # Chose Strategy
@@ -5043,7 +5043,7 @@ class MillingUI:
         # -------------------------- EXCLUSION AREAS END -------------------------------------------------------------
         # ------------------------------------------------------------------------------------------------------------
 
-        FCGridLayout.set_common_column_size(
+        GLay.set_common_column_size(
             [obj_grid, tool_title_grid, tool_grid, new_tool_grid, param_grid, gen_grid], 0)
 
         # #############################################################################################################
diff --git a/appPlugins/ToolNCC.py b/appPlugins/ToolNCC.py
index ab775161..a6b2e444 100644
--- a/appPlugins/ToolNCC.py
+++ b/appPlugins/ToolNCC.py
@@ -4071,7 +4071,7 @@ class NccUI:
         self.tools_box.addWidget(obj_frame)
 
         # Grid Layout
-        obj_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        obj_grid = GLay(v_spacing=5, h_spacing=3)
         obj_frame.setLayout(obj_grid)
 
         # #############################################################################################################
@@ -4121,7 +4121,7 @@ class NccUI:
         tt_frame = FCFrame()
         self.tools_box.addWidget(tt_frame)
 
-        tool_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        tool_grid = GLay(v_spacing=5, h_spacing=3)
         tt_frame.setLayout(tool_grid)
 
         # Tools Table
@@ -4181,7 +4181,7 @@ class NccUI:
         self.add_tool_frame.setContentsMargins(0, 0, 0, 0)
         tool_grid.addWidget(self.add_tool_frame, 6, 0, 1, 2)
 
-        new_tool_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        new_tool_grid = GLay(v_spacing=5, h_spacing=3)
         new_tool_grid.setContentsMargins(0, 0, 0, 0)
         self.add_tool_frame.setLayout(new_tool_grid)
 
@@ -4203,7 +4203,7 @@ class NccUI:
         )
         new_tool_grid.addWidget(self.new_tooldia_lbl, 4, 0)
 
-        # nt_grid = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[1, 0])
+        # nt_grid = GLay(v_spacing=5, h_spacing=3, c_stretch=[1, 0])
         # nt_grid.setContentsMargins(0, 0, 0, 0)
         # new_tool_grid.addLayout(nt_grid, 4, 1)
 
@@ -4228,7 +4228,7 @@ class NccUI:
         # #############################################################################################################
         # ################################    Button Grid   ###########################################################
         # #############################################################################################################
-        button_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        button_grid = GLay(v_spacing=5, h_spacing=3)
         button_grid.setColumnStretch(0, 1)
         button_grid.setColumnStretch(1, 0)
         new_tool_grid.addLayout(button_grid, 6, 0, 1, 3)
@@ -4280,7 +4280,7 @@ class NccUI:
         tt_frame = FCFrame()
         self.tools_box.addWidget(tt_frame)
 
-        par_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        par_grid = GLay(v_spacing=5, h_spacing=3)
         tt_frame.setLayout(par_grid)
 
         # Operation
@@ -4453,7 +4453,7 @@ class NccUI:
         gp_frame = FCFrame()
         self.tools_box.addWidget(gp_frame)
 
-        gen_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        gen_grid = GLay(v_spacing=5, h_spacing=3)
         gp_frame.setLayout(gen_grid)
 
         # Rest Machining
@@ -4591,7 +4591,7 @@ class NccUI:
 
         gen_grid.addWidget(self.valid_cb, 16, 0, 1, 2)
 
-        FCGridLayout.set_common_column_size([obj_grid, tool_grid, new_tool_grid, par_grid, gen_grid], 0)
+        GLay.set_common_column_size([obj_grid, tool_grid, new_tool_grid, par_grid, gen_grid], 0)
 
         # #############################################################################################################
         # Generate NCC Geometry Button
diff --git a/appPlugins/ToolObjectDistance.py b/appPlugins/ToolObjectDistance.py
index f1bddc05..98446b44 100644
--- a/appPlugins/ToolObjectDistance.py
+++ b/appPlugins/ToolObjectDistance.py
@@ -453,7 +453,7 @@ class ObjectDistanceUI:
         par_frame = FCFrame()
         self.layout.addWidget(par_frame)
 
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         par_frame.setLayout(param_grid)
 
         # Distance Type
@@ -479,7 +479,7 @@ class ObjectDistanceUI:
         coords_frame = FCFrame()
         self.layout.addWidget(coords_frame)
 
-        coords_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        coords_grid = GLay(v_spacing=5, h_spacing=3)
         coords_frame.setLayout(coords_grid)
 
         # separator_line = QtWidgets.QFrame()
@@ -522,7 +522,7 @@ class ObjectDistanceUI:
         res_frame = FCFrame()
         self.layout.addWidget(res_frame)
 
-        res_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        res_grid = GLay(v_spacing=5, h_spacing=3)
         res_frame.setLayout(res_grid)
 
         # DX distance
@@ -604,7 +604,7 @@ class ObjectDistanceUI:
         self.jump_hp_btn.setDisabled(True)
         self.layout.addWidget(self.jump_hp_btn)
 
-        FCGridLayout.set_common_column_size([param_grid, coords_grid, res_grid], 0)
+        GLay.set_common_column_size([param_grid, coords_grid, res_grid], 0)
 
         self.layout.addStretch(1)
 
diff --git a/appPlugins/ToolOptimal.py b/appPlugins/ToolOptimal.py
index 13b3a6f0..55c9278b 100644
--- a/appPlugins/ToolOptimal.py
+++ b/appPlugins/ToolOptimal.py
@@ -515,7 +515,7 @@ class OptimalUI:
         par_frame = FCFrame()
         self.layout.addWidget(par_frame)
 
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         par_frame.setLayout(param_grid)
 
         # Precision = nr of decimals
@@ -538,7 +538,7 @@ class OptimalUI:
         res_frame = FCFrame()
         self.layout.addWidget(res_frame)
 
-        res_grid = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0, 1, 0])
+        res_grid = GLay(v_spacing=5, h_spacing=3, c_stretch=[0, 1, 0])
         res_frame.setLayout(res_grid)
 
         # Result value
@@ -603,7 +603,7 @@ class OptimalUI:
         other_frame = FCFrame()
         self.layout.addWidget(other_frame)
 
-        other_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        other_grid = GLay(v_spacing=5, h_spacing=3)
         other_frame.setLayout(other_grid)
 
         # Control if to display the locations of where the minimum was found
@@ -694,7 +694,7 @@ class OptimalUI:
         self.calculate_button.setMinimumWidth(60)
         self.layout.addWidget(self.calculate_button)
 
-        FCGridLayout.set_common_column_size([param_grid, res_grid], 0)
+        GLay.set_common_column_size([param_grid, res_grid], 0)
 
         self.layout.addStretch(1)
 
diff --git a/appPlugins/ToolPaint.py b/appPlugins/ToolPaint.py
index 3eaa8b68..c8f4e059 100644
--- a/appPlugins/ToolPaint.py
+++ b/appPlugins/ToolPaint.py
@@ -2956,7 +2956,7 @@ class PaintUI:
         self.tools_box.addWidget(obj_frame)
 
         # Grid Layout
-        obj_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        obj_grid = GLay(v_spacing=5, h_spacing=3)
         obj_frame.setLayout(obj_grid)
 
         # #############################################################################################################
@@ -3007,7 +3007,7 @@ class PaintUI:
         self.tools_box.addWidget(tt_frame)
 
         # Grid Layout
-        tool_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        tool_grid = GLay(v_spacing=5, h_spacing=3)
         tt_frame.setLayout(tool_grid)
 
         self.tools_table = FCTable(drag_drop=True)
@@ -3062,7 +3062,7 @@ class PaintUI:
         self.add_tool_frame.setContentsMargins(0, 0, 0, 0)
         tool_grid.addWidget(self.add_tool_frame, 6, 0, 1, 2)
 
-        new_tool_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        new_tool_grid = GLay(v_spacing=5, h_spacing=3)
         new_tool_grid.setContentsMargins(0, 0, 0, 0)
         self.add_tool_frame.setLayout(new_tool_grid)
 
@@ -3092,7 +3092,7 @@ class PaintUI:
         # #############################################################################################################
         # ################################    Button Grid   ###########################################################
         # #############################################################################################################
-        button_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        button_grid = GLay(v_spacing=5, h_spacing=3)
         button_grid.setColumnStretch(0, 1)
         button_grid.setColumnStretch(1, 0)
         new_tool_grid.addLayout(button_grid, 6, 0, 1, 2)
@@ -3146,7 +3146,7 @@ class PaintUI:
         tt_frame = FCFrame()
         self.tools_box.addWidget(tt_frame)
 
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         tt_frame.setLayout(param_grid)
 
         # Overlap
@@ -3250,7 +3250,7 @@ class PaintUI:
         gp_frame = FCFrame()
         self.tools_box.addWidget(gp_frame)
 
-        gen_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        gen_grid = GLay(v_spacing=5, h_spacing=3)
         gp_frame.setLayout(gen_grid)
 
         # Rest machining
@@ -3340,7 +3340,7 @@ class PaintUI:
         self.area_shape_label.hide()
         self.area_shape_radio.hide()
 
-        FCGridLayout.set_common_column_size([obj_grid, tool_grid, new_tool_grid, param_grid, gen_grid], 0)
+        GLay.set_common_column_size([obj_grid, tool_grid, new_tool_grid, param_grid, gen_grid], 0)
 
         # #############################################################################################################
         # Generate Paint Geometry Button
diff --git a/appPlugins/ToolPanelize.py b/appPlugins/ToolPanelize.py
index 0211d005..d83aa42f 100644
--- a/appPlugins/ToolPanelize.py
+++ b/appPlugins/ToolPanelize.py
@@ -1173,7 +1173,7 @@ class PanelizeUI:
         self.tools_box.addWidget(obj_frame)
 
         # Grid Layout
-        grid0 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid0 = GLay(v_spacing=5, h_spacing=3)
         obj_frame.setLayout(grid0)
 
         # Type of object to be panelized
@@ -1222,7 +1222,7 @@ class PanelizeUI:
         self.tools_box.addWidget(pr_frame)
 
         # Grid Layout
-        grid1 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid1 = GLay(v_spacing=5, h_spacing=3)
         pr_frame.setLayout(grid1)
 
         self.reference_radio = RadioSet([{'label': _('Object'), 'value': 'object'},
@@ -1277,7 +1277,7 @@ class PanelizeUI:
         pd_frame = FCFrame()
         self.tools_box.addWidget(pd_frame)
 
-        grid2 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid2 = GLay(v_spacing=5, h_spacing=3)
         pd_frame.setLayout(grid2)
 
         # Spacing Columns
@@ -1338,7 +1338,7 @@ class PanelizeUI:
         self.gp_frame = FCFrame()
         self.tools_box.addWidget(self.gp_frame)
 
-        grid3 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid3 = GLay(v_spacing=5, h_spacing=3)
         self.gp_frame.setLayout(grid3)
 
         # Type of resulting Panel object
@@ -1406,7 +1406,7 @@ class PanelizeUI:
         self.separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
         grid3.addWidget(self.separator_line, 10, 0, 1, 2)
 
-        FCGridLayout.set_common_column_size([grid0, grid1, grid2, grid3], 0)
+        GLay.set_common_column_size([grid0, grid1, grid2, grid3], 0)
 
         # #############################################################################################################
         # Generate Panel Button
diff --git a/appPlugins/ToolPcbWizard.py b/appPlugins/ToolPcbWizard.py
index 0b59730c..d23cd9f1 100644
--- a/appPlugins/ToolPcbWizard.py
+++ b/appPlugins/ToolPcbWizard.py
@@ -405,7 +405,7 @@ class WizardUI:
         self.layout.addWidget(FCLabel("<b>%s:</b>" % _("Load files")))
 
         # Grid Layout
-        grid0 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid0 = GLay(v_spacing=5, h_spacing=3)
         self.layout.addLayout(grid0)
 
         self.excellon_label = FCLabel('%s:' % _("Excellon file"))
@@ -443,7 +443,7 @@ class WizardUI:
         self.layout.addWidget(FCLabel("<b>%s:</b>" % _("Excellon Format")))
 
         # Grid Layout
-        grid01 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid01 = GLay(v_spacing=5, h_spacing=3)
         self.layout.addLayout(grid01)
 
         # Integral part of the coordinates
diff --git a/appPlugins/ToolPunchGerber.py b/appPlugins/ToolPunchGerber.py
index a82780e7..29888ac2 100644
--- a/appPlugins/ToolPunchGerber.py
+++ b/appPlugins/ToolPunchGerber.py
@@ -2032,7 +2032,7 @@ class PunchUI:
         self.tools_box.addWidget(self.obj_combo_label)
 
         # Grid Layout
-        grid0 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid0 = GLay(v_spacing=5, h_spacing=3)
         self.tools_box.addLayout(grid0)
 
         # ## Gerber Object
@@ -2059,10 +2059,10 @@ class PunchUI:
         tt_frame = FCFrame()
         self.tools_box.addWidget(tt_frame)
 
-        pad_all_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        pad_all_grid = GLay(v_spacing=5, h_spacing=3)
         tt_frame.setLayout(pad_all_grid)
 
-        pad_grid = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0])
+        pad_grid = GLay(v_spacing=5, h_spacing=3, c_stretch=[0])
         pad_all_grid.addLayout(pad_grid, 0, 0)
 
         # Select all
@@ -2154,7 +2154,7 @@ class PunchUI:
         self.tools_box.addWidget(m_frame)
 
         # Grid Layout
-        grid1 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid1 = GLay(v_spacing=5, h_spacing=3)
         m_frame.setLayout(grid1)
 
         self.method_punch = RadioSet(
@@ -2225,7 +2225,7 @@ class PunchUI:
         self.ring_box.addWidget(self.ring_label)
 
         # ## Grid Layout
-        self.grid1 = FCGridLayout(v_spacing=5, h_spacing=3)
+        self.grid1 = GLay(v_spacing=5, h_spacing=3)
         self.ring_box.addLayout(self.grid1)
 
         # Circular Annular Ring Value
@@ -2324,7 +2324,7 @@ class PunchUI:
         self.tools_box.addWidget(self.s_frame)
 
         # Grid Layout
-        grid2 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid2 = GLay(v_spacing=5, h_spacing=3)
         self.s_frame.setLayout(grid2)
 
         # Type of doing the punch
diff --git a/appPlugins/ToolQRCode.py b/appPlugins/ToolQRCode.py
index e6d7cf21..b77b6359 100644
--- a/appPlugins/ToolQRCode.py
+++ b/appPlugins/ToolQRCode.py
@@ -749,7 +749,7 @@ class QRcodeUI:
         self.title_box.addWidget(self.level)
 
         # ## Grid Layout
-        i_grid_lay = FCGridLayout(v_spacing=5, h_spacing=3)
+        i_grid_lay = GLay(v_spacing=5, h_spacing=3)
         self.tools_box.addLayout(i_grid_lay)
 
         self.grb_object_combo = FCComboBox()
@@ -780,7 +780,7 @@ class QRcodeUI:
         self.tools_box.addWidget(tq_frame)
 
         # Grid Layout
-        grid0 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid0 = GLay(v_spacing=5, h_spacing=3)
         tq_frame.setLayout(grid0)
 
         self.text_data = FCTextArea()
@@ -808,7 +808,7 @@ class QRcodeUI:
         self.tools_box.addWidget(p_frame)
 
         # ## Grid Layout
-        grid1 = FCGridLayout(v_spacing=5, h_spacing=3)
+        grid1 = GLay(v_spacing=5, h_spacing=3)
         p_frame.setLayout(grid1)
 
         # VERSION #
@@ -921,7 +921,7 @@ class QRcodeUI:
         self.export_frame = FCFrame()
         self.tools_box.addWidget(self.export_frame)
 
-        self.export_lay = FCGridLayout(v_spacing=5, h_spacing=3)
+        self.export_lay = GLay(v_spacing=5, h_spacing=3)
         self.export_frame.setLayout(self.export_lay)
 
         # default is hidden
diff --git a/appPlugins/ToolRulesCheck.py b/appPlugins/ToolRulesCheck.py
index c986c8f7..9c7ab559 100644
--- a/appPlugins/ToolRulesCheck.py
+++ b/appPlugins/ToolRulesCheck.py
@@ -1188,7 +1188,7 @@ class RulesUI:
         sel_frame = FCFrame()
         self.layout.addWidget(sel_frame)
 
-        sel_grid = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[1, 0])
+        sel_grid = GLay(v_spacing=5, h_spacing=3, c_stretch=[1, 0])
         sel_frame.setLayout(sel_grid)
 
         # Select All Gerber
@@ -1242,7 +1242,7 @@ class RulesUI:
         top_frame = FCFrame()
         self.layout.addWidget(top_frame)
 
-        self.top_grid = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0, 3, 0])
+        self.top_grid = GLay(v_spacing=5, h_spacing=3, c_stretch=[0, 3, 0])
         top_frame.setLayout(self.top_grid)
 
         # Copper Top object
@@ -1308,7 +1308,7 @@ class RulesUI:
         bottom_frame = FCFrame()
         self.layout.addWidget(bottom_frame)
 
-        self.bottom_grid = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0, 3, 0])
+        self.bottom_grid = GLay(v_spacing=5, h_spacing=3, c_stretch=[0, 3, 0])
         bottom_frame.setLayout(self.bottom_grid)
 
         # Copper Bottom object
@@ -1374,7 +1374,7 @@ class RulesUI:
         outline_frame = FCFrame()
         self.layout.addWidget(outline_frame)
 
-        self.outline_grid = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0, 3, 0])
+        self.outline_grid = GLay(v_spacing=5, h_spacing=3, c_stretch=[0, 3, 0])
         outline_frame.setLayout(self.outline_grid)
 
         self.outline_object = FCComboBox()
@@ -1406,7 +1406,7 @@ class RulesUI:
         exc_frame = FCFrame()
         self.layout.addWidget(exc_frame)
 
-        self.exc_grid = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0, 3, 0])
+        self.exc_grid = GLay(v_spacing=5, h_spacing=3, c_stretch=[0, 3, 0])
         exc_frame.setLayout(self.exc_grid)
 
         # Excellon PTH object
@@ -1466,7 +1466,7 @@ class RulesUI:
         copper_frame = FCFrame()
         self.layout.addWidget(copper_frame)
 
-        self.copper_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        self.copper_grid = GLay(v_spacing=5, h_spacing=3)
         copper_frame.setLayout(self.copper_grid)
 
         # Trace size
@@ -1576,7 +1576,7 @@ class RulesUI:
         silk_frame = FCFrame()
         self.layout.addWidget(silk_frame)
 
-        self.silk_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        self.silk_grid = GLay(v_spacing=5, h_spacing=3)
         silk_frame.setLayout(self.silk_grid)
 
         # Silkscreen2silkscreen clearance
@@ -1663,7 +1663,7 @@ class RulesUI:
         solder_frame = FCFrame()
         self.layout.addWidget(solder_frame)
 
-        self.solder_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        self.solder_grid = GLay(v_spacing=5, h_spacing=3)
         solder_frame.setLayout(self.solder_grid)
 
         # Soldermask2soldermask clearance
@@ -1701,7 +1701,7 @@ class RulesUI:
         holes_frame = FCFrame()
         self.layout.addWidget(holes_frame)
 
-        self.holes_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        self.holes_grid = GLay(v_spacing=5, h_spacing=3)
         holes_frame.setLayout(self.holes_grid)
 
         # Hole2Hole clearance
@@ -1770,7 +1770,7 @@ class RulesUI:
                                 """)
         self.layout.addWidget(self.run_button)
 
-        FCGridLayout.set_common_column_size(
+        GLay.set_common_column_size(
             [self.copper_grid, self.solder_grid, self.silk_grid, self.exc_grid, self.top_grid, self.bottom_grid,
              self.outline_grid, self.holes_grid], 0)
 
diff --git a/appPlugins/ToolSolderPaste.py b/appPlugins/ToolSolderPaste.py
index 9ec9a36c..f69953fa 100644
--- a/appPlugins/ToolSolderPaste.py
+++ b/appPlugins/ToolSolderPaste.py
@@ -358,7 +358,7 @@ class SolderPaste(AppTool):
     def ui_connect(self):
         # on any change to the widgets that matter it will be called self.gui_form_to_storage which will save the
         # changes in geometry UI
-        for grid in self.ui.tools_box.parentWidget().findChildren(FCGridLayout):
+        for grid in self.ui.tools_box.parentWidget().findChildren(GLay):
             assert isinstance(grid, QtWidgets.QGridLayout)
             for i in range(grid.count()):
                 wdg = grid.itemAt(i).widget()
@@ -374,7 +374,7 @@ class SolderPaste(AppTool):
 
     def ui_disconnect(self):
         # if connected, disconnect the signal from the slot on item_changed as it creates issues
-        for grid in self.ui.tools_box.parentWidget().findChildren(FCGridLayout):
+        for grid in self.ui.tools_box.parentWidget().findChildren(GLay):
             assert isinstance(grid, QtWidgets.QGridLayout)
             for i in range(grid.count()):
                 wdg = grid.itemAt(i).widget()
@@ -1245,7 +1245,7 @@ class SolderUI:
         tt_frame = FCFrame()
         self.tools_box.addWidget(tt_frame)
 
-        tool_grid = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0, 0])
+        tool_grid = GLay(v_spacing=5, h_spacing=3, c_stretch=[0, 0])
         tt_frame.setLayout(tool_grid)
 
         self.tools_table = FCTable()
@@ -1313,7 +1313,7 @@ class SolderUI:
         par_frame = FCFrame()
         self.tools_box.addWidget(par_frame)
 
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         par_frame.setLayout(param_grid)
 
         # Z travel
@@ -1339,7 +1339,7 @@ class SolderUI:
         disp_frame = FCFrame()
         self.tools_box.addWidget(disp_frame)
 
-        disp_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        disp_grid = GLay(v_spacing=5, h_spacing=3)
         disp_frame.setLayout(disp_grid)
 
         # Z dispense start
@@ -1390,7 +1390,7 @@ class SolderUI:
         tc_frame = FCFrame()
         self.tools_box.addWidget(tc_frame)
 
-        tc_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        tc_grid = GLay(v_spacing=5, h_spacing=3)
         tc_frame.setLayout(tc_grid)
 
         # X,Y Toolchange location
@@ -1425,7 +1425,7 @@ class SolderUI:
         fr_frame = FCFrame()
         self.tools_box.addWidget(fr_frame)
 
-        fr_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        fr_grid = GLay(v_spacing=5, h_spacing=3)
         fr_frame.setLayout(fr_grid)
 
         # Feedrate X-Y
@@ -1478,7 +1478,7 @@ class SolderUI:
         sp_fw_frame = FCFrame()
         self.tools_box.addWidget(sp_fw_frame)
 
-        sp_fw_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        sp_fw_grid = GLay(v_spacing=5, h_spacing=3)
         sp_fw_frame.setLayout(sp_fw_grid)
 
         # Spindle Speed Forward
@@ -1516,7 +1516,7 @@ class SolderUI:
         sp_rev_frame = FCFrame()
         self.tools_box.addWidget(sp_rev_frame)
 
-        sp_rev_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        sp_rev_grid = GLay(v_spacing=5, h_spacing=3)
         sp_rev_frame.setLayout(sp_rev_grid)
 
         self.speedrev_entry = FCSpinner(callback=self.confirmation_message_int)
@@ -1551,7 +1551,7 @@ class SolderUI:
         pp_frame = FCFrame()
         self.tools_box.addWidget(pp_frame)
 
-        pp_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        pp_grid = GLay(v_spacing=5, h_spacing=3)
         pp_frame.setLayout(pp_grid)
 
         pp_label = FCLabel('%s:' % _('Preprocessor'))
@@ -1572,7 +1572,7 @@ class SolderUI:
         geo_frame = FCFrame()
         self.tools_box.addWidget(geo_frame)
 
-        geo_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        geo_grid = GLay(v_spacing=5, h_spacing=3)
         geo_frame.setLayout(geo_grid)
 
         # Generate Geometry
@@ -1613,7 +1613,7 @@ class SolderUI:
         cnc_frame = FCFrame()
         self.tools_box.addWidget(cnc_frame)
 
-        cnc_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        cnc_grid = GLay(v_spacing=5, h_spacing=3)
         cnc_frame.setLayout(cnc_grid)
 
         # ## Buttons
@@ -1669,7 +1669,7 @@ class SolderUI:
         buttons_hlay.addWidget(self.solder_gcode_view_btn)
         self.tools_box.addLayout(buttons_hlay)
 
-        FCGridLayout.set_common_column_size(
+        GLay.set_common_column_size(
             [geo_grid, fr_grid, tc_grid, disp_grid, tool_grid, sp_fw_grid, sp_rev_grid, param_grid, cnc_grid,
              pp_grid], 0)
 
diff --git a/appPlugins/ToolSub.py b/appPlugins/ToolSub.py
index 50e4a360..a973a280 100644
--- a/appPlugins/ToolSub.py
+++ b/appPlugins/ToolSub.py
@@ -814,7 +814,7 @@ class SubUI:
         self.gp_frame = FCFrame()
         self.tools_box.addWidget(self.gp_frame)
 
-        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_grid = GLay(v_spacing=5, h_spacing=3)
         self.gp_frame.setLayout(param_grid)
 
         self.delete_sources_cb = FCCheckBox(_("Delete source"))
@@ -833,7 +833,7 @@ class SubUI:
         grb_frame = FCFrame()
         self.tools_box.addWidget(grb_frame)
 
-        grb_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        grb_grid = GLay(v_spacing=5, h_spacing=3)
         grb_frame.setLayout(grb_grid)
 
         # Target Gerber Object
@@ -898,7 +898,7 @@ class SubUI:
         geo_frame = FCFrame()
         self.tools_box.addWidget(geo_frame)
 
-        geo_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        geo_grid = GLay(v_spacing=5, h_spacing=3)
         geo_frame.setLayout(geo_grid)
 
         self.geo_title = FCLabel("<b>%s</b>" % _("GEOMETRY"))
diff --git a/appPlugins/ToolTransform.py b/appPlugins/ToolTransform.py
index bb5138bb..d057ceef 100644
--- a/appPlugins/ToolTransform.py
+++ b/appPlugins/ToolTransform.py
@@ -599,7 +599,7 @@ class TransformUI:
         ref_frame = FCFrame()
         self.layout.addWidget(ref_frame)
 
-        ref_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        ref_grid = GLay(v_spacing=5, h_spacing=3)
         ref_frame.setLayout(ref_grid)
 
         ref_label = FCLabel('%s:' % _("Reference"))
@@ -677,7 +677,7 @@ class TransformUI:
         rot_frame = FCFrame()
         self.layout.addWidget(rot_frame)
 
-        rot_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        rot_grid = GLay(v_spacing=5, h_spacing=3)
         rot_frame.setLayout(rot_grid)
 
         self.rotate_label = FCLabel('%s:' % _("Angle"))
@@ -731,7 +731,7 @@ class TransformUI:
         skew_frame = FCFrame()
         self.layout.addWidget(skew_frame)
 
-        skew_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        skew_grid = GLay(v_spacing=5, h_spacing=3)
         skew_frame.setLayout(skew_grid)
 
         self.skewx_label = FCLabel('%s:' % _("X angle"))
@@ -800,7 +800,7 @@ class TransformUI:
         scale_frame = FCFrame()
         self.layout.addWidget(scale_frame)
 
-        scale_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        scale_grid = GLay(v_spacing=5, h_spacing=3)
         scale_frame.setLayout(scale_grid)
 
         self.scalex_label = FCLabel('%s:' % _("X factor"))
@@ -859,7 +859,7 @@ class TransformUI:
         mirror_frame = FCFrame()
         self.layout.addWidget(mirror_frame)
 
-        mirror_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        mirror_grid = GLay(v_spacing=5, h_spacing=3)
         mirror_frame.setLayout(mirror_grid)
 
         self.flipx_button = FCButton(_("Flip on X"))
@@ -887,7 +887,7 @@ class TransformUI:
         off_frame = FCFrame()
         self.layout.addWidget(off_frame)
 
-        off_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        off_grid = GLay(v_spacing=5, h_spacing=3)
         off_frame.setLayout(off_grid)
 
         self.offx_label = FCLabel('%s:' % _("X val"))
@@ -955,7 +955,7 @@ class TransformUI:
         buff_frame = FCFrame()
         self.layout.addWidget(buff_frame)
 
-        buff_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        buff_grid = GLay(v_spacing=5, h_spacing=3)
         buff_frame.setLayout(buff_grid)
 
         self.buffer_label = FCLabel('%s:' % _("Distance"))
@@ -1009,7 +1009,7 @@ class TransformUI:
         buff_grid.addWidget(self.buffer_factor_entry, 2, 1)
         buff_grid.addWidget(self.buffer_factor_button, 2, 2)
 
-        FCGridLayout.set_common_column_size(
+        GLay.set_common_column_size(
             [ref_grid, rot_grid, skew_grid, scale_grid, mirror_grid, off_grid, buff_grid], 0)
 
         self.layout.addStretch()