diff --git a/main.ui b/main.ui
index 397aa63..7a9e33e 100644
--- a/main.ui
+++ b/main.ui
@@ -26,7 +26,7 @@
       <string>P65 XAFS Scan Manager</string>
      </property>
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="scanParameterPage">
       <property name="geometry">
@@ -43,68 +43,72 @@
       <attribute name="label">
        <string>Scan Parameters</string>
       </attribute>
-      <layout class="QHBoxLayout" name="horizontalLayout">
+      <layout class="QHBoxLayout" name="horizontalLayout_4">
        <item>
         <layout class="QGridLayout" name="gridLayout">
          <item row="0" column="0">
-          <widget class="QPushButton" name="pushButton">
-           <property name="maximumSize">
-            <size>
-             <width>75</width>
-             <height>16777215</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>Add</string>
-           </property>
-          </widget>
+          <layout class="QHBoxLayout" name="horizontalLayout">
+           <item>
+            <widget class="QPushButton" name="pushButton">
+             <property name="maximumSize">
+              <size>
+               <width>16777215</width>
+               <height>16777215</height>
+              </size>
+             </property>
+             <property name="text">
+              <string>Add</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="pushButton_3">
+             <property name="minimumSize">
+              <size>
+               <width>0</width>
+               <height>0</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>16777215</width>
+               <height>16777215</height>
+              </size>
+             </property>
+             <property name="text">
+              <string>Copy</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="pushButton_2">
+             <property name="maximumSize">
+              <size>
+               <width>16777215</width>
+               <height>16777215</height>
+              </size>
+             </property>
+             <property name="text">
+              <string>Remove</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="pushButton_7">
+             <property name="maximumSize">
+              <size>
+               <width>16777215</width>
+               <height>16777215</height>
+              </size>
+             </property>
+             <property name="text">
+              <string>Clear</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
          </item>
-         <item row="0" column="1">
-          <widget class="QPushButton" name="pushButton_3">
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>75</width>
-             <height>16777215</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>Copy</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="2">
-          <widget class="QPushButton" name="pushButton_2">
-           <property name="maximumSize">
-            <size>
-             <width>75</width>
-             <height>16777215</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>Remove</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="3">
-          <widget class="QPushButton" name="pushButton_7">
-           <property name="maximumSize">
-            <size>
-             <width>16777215</width>
-             <height>16777215</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>Clear</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0" colspan="4">
+         <item row="1" column="0">
           <widget class="QListWidget" name="listWidget">
            <item>
             <property name="text">
@@ -113,19 +117,23 @@
            </item>
           </widget>
          </item>
-         <item row="2" column="0" colspan="2">
-          <widget class="QPushButton" name="pushButton_4">
-           <property name="text">
-            <string>Start</string>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="2" colspan="2">
-          <widget class="QPushButton" name="pushButton_5">
-           <property name="text">
-            <string>Pause</string>
-           </property>
-          </widget>
+         <item row="2" column="0">
+          <layout class="QHBoxLayout" name="horizontalLayout_3">
+           <item>
+            <widget class="QPushButton" name="pushButton_4">
+             <property name="text">
+              <string>Start</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="pushButton_5">
+             <property name="text">
+              <string>Pause</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
          </item>
         </layout>
        </item>
@@ -143,16 +151,6 @@
       <attribute name="label">
        <string>Data Storage</string>
       </attribute>
-      <widget class="QSpinBox" name="spinBox">
-       <property name="geometry">
-        <rect>
-         <x>420</x>
-         <y>60</y>
-         <width>48</width>
-         <height>24</height>
-        </rect>
-       </property>
-      </widget>
       <widget class="QWidget" name="">
        <property name="geometry">
         <rect>
@@ -163,27 +161,6 @@
         </rect>
        </property>
        <layout class="QGridLayout" name="gridLayout_2">
-        <item row="0" column="0">
-         <widget class="QLabel" name="label_2">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="font">
-           <font>
-            <pointsize>20</pointsize>
-            <weight>75</weight>
-            <bold>true</bold>
-            <kerning>true</kerning>
-           </font>
-          </property>
-          <property name="text">
-           <string>Data Storage</string>
-          </property>
-         </widget>
-        </item>
         <item row="1" column="0">
          <widget class="QTableWidget" name="tableWidget_2">
           <property name="sizePolicy">
@@ -238,6 +215,27 @@
           </property>
          </widget>
         </item>
+        <item row="0" column="0">
+         <widget class="QLabel" name="label_2">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="font">
+           <font>
+            <pointsize>20</pointsize>
+            <weight>75</weight>
+            <bold>true</bold>
+            <kerning>true</kerning>
+           </font>
+          </property>
+          <property name="text">
+           <string>Data Storage</string>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </widget>
@@ -246,22 +244,5 @@
   </layout>
  </widget>
  <resources/>
- <connections>
-  <connection>
-   <sender>pushButton_6</sender>
-   <signal>clicked()</signal>
-   <receiver>spinBox</receiver>
-   <slot>stepUp()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>174</x>
-     <y>231</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>448</x>
-     <y>158</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
+ <connections/>
 </ui>
diff --git a/main_gui.py b/main_gui.py
index 335021c..f04922d 100644
--- a/main_gui.py
+++ b/main_gui.py
@@ -1,3 +1,12 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'main.ui'
+#
+# Created by: PyQt5 UI code generator 5.13.2
+#
+# WARNING! All changes made in this file will be lost!
+
+
 from PyQt5 import QtCore, QtGui, QtWidgets
 
 
@@ -13,68 +22,55 @@ class MainGui(object):
         self.scanParameterPage.setGeometry(QtCore.QRect(0, 0, 774, 483))
         self.scanParameterPage.setAccessibleName("")
         self.scanParameterPage.setObjectName("scanParameterPage")
-        self.horizontalLayout = QtWidgets.QHBoxLayout(self.scanParameterPage)
-        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.horizontalLayout_4 = QtWidgets.QHBoxLayout(self.scanParameterPage)
+        self.horizontalLayout_4.setObjectName("horizontalLayout_4")
         self.gridLayout = QtWidgets.QGridLayout()
         self.gridLayout.setObjectName("gridLayout")
+        self.horizontalLayout = QtWidgets.QHBoxLayout()
+        self.horizontalLayout.setObjectName("horizontalLayout")
         self.pushButton = QtWidgets.QPushButton(self.scanParameterPage)
-        self.pushButton.setMaximumSize(QtCore.QSize(75, 16777215))
+        self.pushButton.setMaximumSize(QtCore.QSize(16777215, 16777215))
         self.pushButton.setObjectName("pushButton")
-        self.gridLayout.addWidget(self.pushButton, 0, 0, 1, 1)
+        self.horizontalLayout.addWidget(self.pushButton)
         self.pushButton_3 = QtWidgets.QPushButton(self.scanParameterPage)
         self.pushButton_3.setMinimumSize(QtCore.QSize(0, 0))
-        self.pushButton_3.setMaximumSize(QtCore.QSize(75, 16777215))
+        self.pushButton_3.setMaximumSize(QtCore.QSize(16777215, 16777215))
         self.pushButton_3.setObjectName("pushButton_3")
-        self.gridLayout.addWidget(self.pushButton_3, 0, 1, 1, 1)
+        self.horizontalLayout.addWidget(self.pushButton_3)
         self.pushButton_2 = QtWidgets.QPushButton(self.scanParameterPage)
-        self.pushButton_2.setMaximumSize(QtCore.QSize(75, 16777215))
+        self.pushButton_2.setMaximumSize(QtCore.QSize(16777215, 16777215))
         self.pushButton_2.setObjectName("pushButton_2")
-        self.gridLayout.addWidget(self.pushButton_2, 0, 2, 1, 1)
+        self.horizontalLayout.addWidget(self.pushButton_2)
         self.pushButton_7 = QtWidgets.QPushButton(self.scanParameterPage)
         self.pushButton_7.setMaximumSize(QtCore.QSize(16777215, 16777215))
         self.pushButton_7.setObjectName("pushButton_7")
-        self.gridLayout.addWidget(self.pushButton_7, 0, 3, 1, 1)
+        self.horizontalLayout.addWidget(self.pushButton_7)
+        self.gridLayout.addLayout(self.horizontalLayout, 0, 0, 1, 1)
         self.listWidget = QtWidgets.QListWidget(self.scanParameterPage)
         self.listWidget.setObjectName("listWidget")
         item = QtWidgets.QListWidgetItem()
         self.listWidget.addItem(item)
-        self.gridLayout.addWidget(self.listWidget, 1, 0, 1, 4)
+        self.gridLayout.addWidget(self.listWidget, 1, 0, 1, 1)
+        self.horizontalLayout_3 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_3.setObjectName("horizontalLayout_3")
         self.pushButton_4 = QtWidgets.QPushButton(self.scanParameterPage)
         self.pushButton_4.setObjectName("pushButton_4")
-        self.gridLayout.addWidget(self.pushButton_4, 2, 0, 1, 2)
+        self.horizontalLayout_3.addWidget(self.pushButton_4)
         self.pushButton_5 = QtWidgets.QPushButton(self.scanParameterPage)
         self.pushButton_5.setObjectName("pushButton_5")
-        self.gridLayout.addWidget(self.pushButton_5, 2, 2, 1, 2)
-        self.horizontalLayout.addLayout(self.gridLayout)
+        self.horizontalLayout_3.addWidget(self.pushButton_5)
+        self.gridLayout.addLayout(self.horizontalLayout_3, 2, 0, 1, 1)
+        self.horizontalLayout_4.addLayout(self.gridLayout)
         self.toolBox.addItem(self.scanParameterPage, "")
         self.DataStoragePage = QtWidgets.QWidget()
         self.DataStoragePage.setGeometry(QtCore.QRect(0, 0, 774, 483))
         self.DataStoragePage.setObjectName("DataStoragePage")
-        self.spinBox = QtWidgets.QSpinBox(self.DataStoragePage)
-        self.spinBox.setGeometry(QtCore.QRect(420, 60, 48, 24))
-        self.spinBox.setObjectName("spinBox")
         self.widget = QtWidgets.QWidget(self.DataStoragePage)
         self.widget.resize(192, 157)
         self.widget.setObjectName("widget")
         self.gridLayout_2 = QtWidgets.QGridLayout(self.widget)
         self.gridLayout_2.setContentsMargins(0, 0, 0, 0)
         self.gridLayout_2.setObjectName("gridLayout_2")
-        self.label_2 = QtWidgets.QLabel(self.widget)
-        sizePolicy = QtWidgets.QSizePolicy(
-            QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(
-            self.label_2.sizePolicy().hasHeightForWidth())
-        self.label_2.setSizePolicy(sizePolicy)
-        font = QtGui.QFont()
-        font.setPointSize(20)
-        font.setBold(True)
-        font.setWeight(75)
-        font.setKerning(True)
-        self.label_2.setFont(font)
-        self.label_2.setObjectName("label_2")
-        self.gridLayout_2.addWidget(self.label_2, 0, 0, 1, 1)
         self.tableWidget_2 = QtWidgets.QTableWidget(self.widget)
         sizePolicy = QtWidgets.QSizePolicy(
             QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Maximum)
@@ -102,12 +98,27 @@ class MainGui(object):
         self.pushButton_6 = QtWidgets.QPushButton(self.widget)
         self.pushButton_6.setObjectName("pushButton_6")
         self.gridLayout_2.addWidget(self.pushButton_6, 2, 0, 1, 1)
+        self.label_2 = QtWidgets.QLabel(self.widget)
+        sizePolicy = QtWidgets.QSizePolicy(
+            QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(
+            self.label_2.sizePolicy().hasHeightForWidth())
+        self.label_2.setSizePolicy(sizePolicy)
+        font = QtGui.QFont()
+        font.setPointSize(20)
+        font.setBold(True)
+        font.setWeight(75)
+        font.setKerning(True)
+        self.label_2.setFont(font)
+        self.label_2.setObjectName("label_2")
+        self.gridLayout_2.addWidget(self.label_2, 0, 0, 1, 1)
         self.toolBox.addItem(self.DataStoragePage, "")
         self.horizontalLayout_2.addWidget(self.toolBox)
 
         self.retranslateUi(widget)
-        self.toolBox.setCurrentIndex(0)
-        self.pushButton_6.clicked.connect(self.spinBox.stepUp)
+        self.toolBox.setCurrentIndex(1)
         QtCore.QMetaObject.connectSlotsByName(widget)
 
     def retranslateUi(self, widget):
@@ -132,7 +143,6 @@ class MainGui(object):
         self.pushButton_5.setText(_translate("widget", "Pause"))
         self.toolBox.setItemText(self.toolBox.indexOf(
             self.scanParameterPage), _translate("widget", "Scan Parameters"))
-        self.label_2.setText(_translate("widget", "Data Storage"))
         item = self.tableWidget_2.verticalHeaderItem(0)
         item.setText(_translate("widget", "Location"))
         item = self.tableWidget_2.verticalHeaderItem(1)
@@ -147,5 +157,6 @@ class MainGui(object):
         item.setText(_translate("widget", "P.I."))
         self.tableWidget_2.setSortingEnabled(__sortingEnabled)
         self.pushButton_6.setText(_translate("widget", "Save"))
+        self.label_2.setText(_translate("widget", "Data Storage"))
         self.toolBox.setItemText(self.toolBox.indexOf(
             self.DataStoragePage), _translate("widget", "Data Storage"))