diff --git a/base.py b/base.py
index 59e053e..4c28d56 100644
--- a/base.py
+++ b/base.py
@@ -797,10 +797,16 @@ class BaseWindow(QMainWindow):
         #_qsize = exit_toolbar.iconSize()
         #print("qsize", _qsize)
         true_list = [self.autopost_epics, self.autopost_hdf, self.autopost_elog]
-        exit_toolbar.setIconSize(QSize(true_list.count(True)*30+10, 24))
-        #exit_toolbar.setIconSize(_qsize)
-        self.add_actions(exit_toolbar, (save_all_action, "Space", None, "Space",
-                                        quit_action))
+        
+        if true_list.count(True) > 1:
+            exit_toolbar.setIconSize(QSize(true_list.count(True)*30+10, 24))
+            #exit_toolbar.setIconSize(_qsize)
+            self.add_actions(exit_toolbar, (
+                save_all_action, "Space", None, "Space", quit_action))
+        else:
+            self.add_actions(exit_toolbar, (quit_action,))
+       
+        
 
 
     def combine_save_icons(self): #epics=False, hdf=False, elog=False):
diff --git a/guiframe.py b/guiframe.py
index 9d3dd83..a4f9412 100644
--- a/guiframe.py
+++ b/guiframe.py
@@ -1280,15 +1280,13 @@ class GUIFrame(QWidget):
             print("KeyError in guiframe.py; def checkbox_simulation:", error)
             text = "Simulation"
 
-        checkbox = QCheckBox(text)
-        checkbox.setObjectName("Simulation")
-        checkbox.setToolTip(
+        self.simulation_checkbox = QCheckBox(text)
+        self.simulation_checkbox.setObjectName("Simulation")
+        self.simulation_checkbox.setToolTip(
             "Dry-run only; does not write to EPICS Process Variables")
-        checkbox.setFont(self.font_gui)
-        #checkbox.setStyleSheet(
-        #"QCheckBox::indicator::checked {width=85px; height: 85px;};")
-
-        checkbox.stateChanged.connect(on_change)
+        self.simulation_checkbox.setFont(self.font_gui)
+       
+        self.simulation_checkbox.stateChanged.connect(on_change)
 
         checked_value = Qt.Unchecked
         if "simulation" in self.parent.input_parameters.keys():
@@ -1299,9 +1297,9 @@ class GUIFrame(QWidget):
                             "value"]:
                         checked_value = Qt.Checked
 
-            checkbox.setCheckState(checked_value)
+            self.simulation_checkbox.setCheckState(checked_value)
 
-            layout.addWidget(checkbox, row_wgt, 0)
+            layout.addWidget(self.simulation_checkbox, row_wgt, 0)
             layout.addWidget(QFrame(), row_wgt, 1, 1, 2)
             if hline == "BOTTOM":
                 layout.addWidget(QHLine(), row_wgt+1, 0, 1, 3)