diff --git a/Gui.py b/Gui.py
index 7a03417..937d55e 100644
--- a/Gui.py
+++ b/Gui.py
@@ -36,37 +36,11 @@ class Ui_fluencyCAD(object):
         self.centralwidget.setObjectName(u"centralwidget")
         self.gridLayout = QGridLayout(self.centralwidget)
         self.gridLayout.setObjectName(u"gridLayout")
-        self.compo_tool_box = QGroupBox(self.centralwidget)
-        self.compo_tool_box.setObjectName(u"compo_tool_box")
-        self.compo_tool_box.setMinimumSize(QSize(0, 50))
-        self.gridLayout_9 = QGridLayout(self.compo_tool_box)
-        self.gridLayout_9.setObjectName(u"gridLayout_9")
-        self.new_compo = QPushButton(self.compo_tool_box)
-        self.new_compo.setObjectName(u"new_compo")
-        self.new_compo.setMinimumSize(QSize(50, 50))
-        self.new_compo.setMaximumSize(QSize(50, 50))
-
-        self.gridLayout_9.addWidget(self.new_compo, 0, 0, 1, 1)
-
-        self.del_compo = QPushButton(self.compo_tool_box)
-        self.del_compo.setObjectName(u"del_compo")
-        self.del_compo.setEnabled(True)
+        self.groupBox_3 = QGroupBox(self.centralwidget)
+        self.groupBox_3.setObjectName(u"groupBox_3")
         sizePolicy = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.del_compo.sizePolicy().hasHeightForWidth())
-        self.del_compo.setSizePolicy(sizePolicy)
-        self.del_compo.setMinimumSize(QSize(50, 50))
-        self.del_compo.setMaximumSize(QSize(50, 50))
-        self.del_compo.setLayoutDirection(Qt.LeftToRight)
-
-        self.gridLayout_9.addWidget(self.del_compo, 0, 1, 1, 1)
-
-
-        self.gridLayout.addWidget(self.compo_tool_box, 11, 1, 1, 1, Qt.AlignLeft)
-
-        self.groupBox_3 = QGroupBox(self.centralwidget)
-        self.groupBox_3.setObjectName(u"groupBox_3")
         sizePolicy.setHeightForWidth(self.groupBox_3.sizePolicy().hasHeightForWidth())
         self.groupBox_3.setSizePolicy(sizePolicy)
         self.groupBox_3.setMaximumSize(QSize(200, 16777213))
@@ -403,6 +377,32 @@ class Ui_fluencyCAD(object):
 
         self.gridLayout.addWidget(self.groupBox_9, 0, 0, 1, 1, Qt.AlignTop)
 
+        self.compo_tool_box = QGroupBox(self.centralwidget)
+        self.compo_tool_box.setObjectName(u"compo_tool_box")
+        self.compo_tool_box.setMinimumSize(QSize(0, 50))
+        self.gridLayout_9 = QGridLayout(self.compo_tool_box)
+        self.gridLayout_9.setObjectName(u"gridLayout_9")
+        self.new_compo = QPushButton(self.compo_tool_box)
+        self.new_compo.setObjectName(u"new_compo")
+        self.new_compo.setMinimumSize(QSize(50, 50))
+        self.new_compo.setMaximumSize(QSize(50, 50))
+
+        self.gridLayout_9.addWidget(self.new_compo, 0, 0, 1, 1)
+
+        self.del_compo = QPushButton(self.compo_tool_box)
+        self.del_compo.setObjectName(u"del_compo")
+        self.del_compo.setEnabled(True)
+        sizePolicy.setHeightForWidth(self.del_compo.sizePolicy().hasHeightForWidth())
+        self.del_compo.setSizePolicy(sizePolicy)
+        self.del_compo.setMinimumSize(QSize(50, 50))
+        self.del_compo.setMaximumSize(QSize(50, 50))
+        self.del_compo.setLayoutDirection(Qt.LeftToRight)
+
+        self.gridLayout_9.addWidget(self.del_compo, 0, 1, 1, 1)
+
+
+        self.gridLayout.addWidget(self.compo_tool_box, 7, 0, 1, 1)
+
         self.groupBox_4 = QGroupBox(self.centralwidget)
         self.groupBox_4.setObjectName(u"groupBox_4")
         self.verticalLayout_2 = QVBoxLayout(self.groupBox_4)
@@ -413,7 +413,7 @@ class Ui_fluencyCAD(object):
         self.verticalLayout_2.addWidget(self.pushButton_2)
 
 
-        self.gridLayout.addWidget(self.groupBox_4, 7, 3, 1, 1)
+        self.gridLayout.addWidget(self.groupBox_4, 4, 3, 1, 1)
 
         self.assmbly_box = QGroupBox(self.centralwidget)
         self.assmbly_box.setObjectName(u"assmbly_box")
@@ -435,7 +435,7 @@ class Ui_fluencyCAD(object):
         self.gridLayout_10.addWidget(self.pushButton_6, 0, 1, 1, 1)
 
 
-        self.gridLayout.addWidget(self.assmbly_box, 11, 2, 1, 1, Qt.AlignLeft)
+        self.gridLayout.addWidget(self.assmbly_box, 7, 3, 1, 1)
 
         fluencyCAD.setCentralWidget(self.centralwidget)
         self.menubar = QMenuBar(fluencyCAD)
@@ -470,9 +470,6 @@ class Ui_fluencyCAD(object):
         self.actionNew_Project.setText(QCoreApplication.translate("fluencyCAD", u"New", None))
         self.actionLoad_Project.setText(QCoreApplication.translate("fluencyCAD", u"Load", None))
         self.actionRecent.setText(QCoreApplication.translate("fluencyCAD", u"Recent", None))
-        self.compo_tool_box.setTitle(QCoreApplication.translate("fluencyCAD", u"Component Tools", None))
-        self.new_compo.setText(QCoreApplication.translate("fluencyCAD", u"New", None))
-        self.del_compo.setText(QCoreApplication.translate("fluencyCAD", u"Del", None))
         self.groupBox_3.setTitle(QCoreApplication.translate("fluencyCAD", u"Constrain", None))
 #if QT_CONFIG(tooltip)
         self.pb_con_line.setToolTip(QCoreApplication.translate("fluencyCAD", u"Point to Line Constrain", None))
@@ -569,6 +566,9 @@ class Ui_fluencyCAD(object):
 #if QT_CONFIG(shortcut)
         self.pb_move_wp.setShortcut(QCoreApplication.translate("fluencyCAD", u"M", None))
 #endif // QT_CONFIG(shortcut)
+        self.compo_tool_box.setTitle(QCoreApplication.translate("fluencyCAD", u"Component Tools", None))
+        self.new_compo.setText(QCoreApplication.translate("fluencyCAD", u"New", None))
+        self.del_compo.setText(QCoreApplication.translate("fluencyCAD", u"Del", None))
         self.groupBox_4.setTitle(QCoreApplication.translate("fluencyCAD", u"Export", None))
         self.pushButton_2.setText(QCoreApplication.translate("fluencyCAD", u"STL", None))
         self.assmbly_box.setTitle(QCoreApplication.translate("fluencyCAD", u"Assembly Tools", None))
diff --git a/gui.ui b/gui.ui
index 6c368c7..ac3e32a 100644
--- a/gui.ui
+++ b/gui.ui
@@ -15,71 +15,6 @@
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QGridLayout" name="gridLayout">
-    <item row="11" column="1" alignment="Qt::AlignLeft">
-     <widget class="QGroupBox" name="compo_tool_box">
-      <property name="minimumSize">
-       <size>
-        <width>0</width>
-        <height>50</height>
-       </size>
-      </property>
-      <property name="title">
-       <string>Component Tools</string>
-      </property>
-      <layout class="QGridLayout" name="gridLayout_9">
-       <item row="0" column="0">
-        <widget class="QPushButton" name="new_compo">
-         <property name="minimumSize">
-          <size>
-           <width>50</width>
-           <height>50</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>50</width>
-           <height>50</height>
-          </size>
-         </property>
-         <property name="text">
-          <string>New</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1">
-        <widget class="QPushButton" name="del_compo">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>50</width>
-           <height>50</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>50</width>
-           <height>50</height>
-          </size>
-         </property>
-         <property name="layoutDirection">
-          <enum>Qt::LeftToRight</enum>
-         </property>
-         <property name="text">
-          <string>Del</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </item>
     <item row="2" column="0">
      <widget class="QGroupBox" name="groupBox_3">
       <property name="sizePolicy">
@@ -713,7 +648,72 @@
       </layout>
      </widget>
     </item>
-    <item row="7" column="3">
+    <item row="7" column="0">
+     <widget class="QGroupBox" name="compo_tool_box">
+      <property name="minimumSize">
+       <size>
+        <width>0</width>
+        <height>50</height>
+       </size>
+      </property>
+      <property name="title">
+       <string>Component Tools</string>
+      </property>
+      <layout class="QGridLayout" name="gridLayout_9">
+       <item row="0" column="0">
+        <widget class="QPushButton" name="new_compo">
+         <property name="minimumSize">
+          <size>
+           <width>50</width>
+           <height>50</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>50</width>
+           <height>50</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>New</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QPushButton" name="del_compo">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>50</width>
+           <height>50</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>50</width>
+           <height>50</height>
+          </size>
+         </property>
+         <property name="layoutDirection">
+          <enum>Qt::LeftToRight</enum>
+         </property>
+         <property name="text">
+          <string>Del</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </item>
+    <item row="4" column="3">
      <widget class="QGroupBox" name="groupBox_4">
       <property name="title">
        <string>Export</string>
@@ -729,7 +729,7 @@
       </layout>
      </widget>
     </item>
-    <item row="11" column="2" alignment="Qt::AlignLeft">
+    <item row="7" column="3">
      <widget class="QGroupBox" name="assmbly_box">
       <property name="minimumSize">
        <size>