diff --git a/apple/OSX/OSX/OSX/en.lproj/MainMenu.xib b/apple/OSX/OSX/OSX/en.lproj/MainMenu.xib
index bcec0f0438..aad84722e4 100644
--- a/apple/OSX/OSX/OSX/en.lproj/MainMenu.xib
+++ b/apple/OSX/OSX/OSX/en.lproj/MainMenu.xib
@@ -262,34 +262,41 @@
 							<string key="NSTitle">Command</string>
 							<object class="NSMutableArray" key="NSMenuItems">
 								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="768774843">
+								<object class="NSMenuItem" id="347361677">
 									<reference key="NSMenu" ref="604031057"/>
-									<string key="NSTitle">Reset</string>
+									<string key="NSTitle">Save State Options</string>
 									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="35465992"/>
 									<reference key="NSMixedImage" ref="502551668"/>
-									<int key="NSTag">1</int>
+									<string key="NSAction">submenuAction:</string>
+									<object class="NSMenu" key="NSSubmenu" id="172285465">
+										<string key="NSTitle">Save State Options</string>
+										<object class="NSMutableArray" key="NSMenuItems">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<object class="NSMenuItem" id="354494807">
+												<reference key="NSMenu" ref="172285465"/>
+												<string key="NSTitle">Load State</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<int key="NSTag">2</int>
+											</object>
+											<object class="NSMenuItem" id="870739926">
+												<reference key="NSMenu" ref="172285465"/>
+												<string key="NSTitle">Save State</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<int key="NSTag">3</int>
+											</object>
+										</object>
+									</object>
 								</object>
-								<object class="NSMenuItem" id="354494807">
-									<reference key="NSMenu" ref="604031057"/>
-									<string key="NSTitle">Load State</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<int key="NSTag">2</int>
-								</object>
-								<object class="NSMenuItem" id="870739926">
-									<reference key="NSMenu" ref="604031057"/>
-									<string key="NSTitle">Save State</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<int key="NSTag">3</int>
-								</object>
-								<object class="NSMenuItem" id="673575837">
+								<object class="NSMenuItem" id="191361579">
 									<reference key="NSMenu" ref="604031057"/>
 									<string key="NSTitle">Disk Options</string>
 									<string key="NSKeyEquiv"/>
@@ -298,12 +305,12 @@
 									<reference key="NSOnImage" ref="35465992"/>
 									<reference key="NSMixedImage" ref="502551668"/>
 									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="706244080">
+									<object class="NSMenu" key="NSSubmenu" id="79435345">
 										<string key="NSTitle">Disk Options</string>
 										<object class="NSMutableArray" key="NSMenuItems">
 											<bool key="EncodedWithXMLCoder">YES</bool>
-											<object class="NSMenuItem" id="764426686">
-												<reference key="NSMenu" ref="706244080"/>
+											<object class="NSMenuItem" id="603789603">
+												<reference key="NSMenu" ref="79435345"/>
 												<string key="NSTitle">Cycle Tray</string>
 												<string key="NSKeyEquiv"/>
 												<int key="NSMnemonicLoc">2147483647</int>
@@ -312,8 +319,8 @@
 												<reference key="NSMixedImage" ref="502551668"/>
 												<int key="NSTag">4</int>
 											</object>
-											<object class="NSMenuItem" id="290609723">
-												<reference key="NSMenu" ref="706244080"/>
+											<object class="NSMenuItem" id="291565286">
+												<reference key="NSMenu" ref="79435345"/>
 												<string key="NSTitle">Previous Disk</string>
 												<string key="NSKeyEquiv"/>
 												<int key="NSMnemonicLoc">2147483647</int>
@@ -321,8 +328,8 @@
 												<reference key="NSMixedImage" ref="502551668"/>
 												<int key="NSTag">5</int>
 											</object>
-											<object class="NSMenuItem" id="1004113986">
-												<reference key="NSMenu" ref="706244080"/>
+											<object class="NSMenuItem" id="189555851">
+												<reference key="NSMenu" ref="79435345"/>
 												<string key="NSTitle">Next Disk</string>
 												<string key="NSKeyEquiv"/>
 												<int key="NSMnemonicLoc">2147483647</int>
@@ -333,7 +340,7 @@
 										</object>
 									</object>
 								</object>
-								<object class="NSMenuItem" id="466734512">
+								<object class="NSMenuItem" id="140877964">
 									<reference key="NSMenu" ref="604031057"/>
 									<string key="NSTitle">Mouse Options</string>
 									<string key="NSKeyEquiv"/>
@@ -342,12 +349,12 @@
 									<reference key="NSOnImage" ref="35465992"/>
 									<reference key="NSMixedImage" ref="502551668"/>
 									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="412429024">
+									<object class="NSMenu" key="NSSubmenu" id="302314278">
 										<string key="NSTitle">Mouse Options</string>
 										<object class="NSMutableArray" key="NSMenuItems">
 											<bool key="EncodedWithXMLCoder">YES</bool>
-											<object class="NSMenuItem" id="782773916">
-												<reference key="NSMenu" ref="412429024"/>
+											<object class="NSMenuItem" id="829216824">
+												<reference key="NSMenu" ref="302314278"/>
 												<string key="NSTitle">Mouse Grab Toggle</string>
 												<string key="NSKeyEquiv"/>
 												<int key="NSMnemonicLoc">2147483647</int>
@@ -361,7 +368,7 @@
 							</object>
 						</object>
 					</object>
-					<object class="NSMenuItem" id="38491277">
+					<object class="NSMenuItem" id="714859422">
 						<reference key="NSMenu" ref="649796088"/>
 						<string key="NSTitle">State</string>
 						<string key="NSKeyEquiv"/>
@@ -369,12 +376,21 @@
 						<reference key="NSOnImage" ref="35465992"/>
 						<reference key="NSMixedImage" ref="502551668"/>
 						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="150690320">
+						<object class="NSMenu" key="NSSubmenu" id="274846156">
 							<string key="NSTitle">State</string>
 							<object class="NSMutableArray" key="NSMenuItems">
 								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="133873389">
-									<reference key="NSMenu" ref="150690320"/>
+								<object class="NSMenuItem" id="863130688">
+									<reference key="NSMenu" ref="274846156"/>
+									<string key="NSTitle">Reset</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+									<int key="NSTag">1</int>
+								</object>
+								<object class="NSMenuItem" id="330055564">
+									<reference key="NSMenu" ref="274846156"/>
 									<string key="NSTitle">Menu Toggle</string>
 									<string key="NSKeyEquiv"/>
 									<int key="NSMnemonicLoc">2147483647</int>
@@ -811,14 +827,6 @@
 					</object>
 					<int key="connectionID">495</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">basicEvent:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="768774843"/>
-					</object>
-					<int key="connectionID">548</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">basicEvent:</string>
@@ -924,7 +932,7 @@
 							<reference ref="448692316"/>
 							<reference ref="265357942"/>
 							<reference ref="1225315"/>
-							<reference ref="38491277"/>
+							<reference ref="714859422"/>
 						</object>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -1144,24 +1152,12 @@
 						<reference key="object" ref="604031057"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="768774843"/>
-							<reference ref="354494807"/>
-							<reference ref="870739926"/>
-							<reference ref="673575837"/>
-							<reference ref="466734512"/>
+							<reference ref="191361579"/>
+							<reference ref="140877964"/>
+							<reference ref="347361677"/>
 						</object>
 						<reference key="parent" ref="265357942"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">547</int>
-						<reference key="object" ref="768774843"/>
-						<reference key="parent" ref="604031057"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">549</int>
-						<reference key="object" ref="354494807"/>
-						<reference key="parent" ref="604031057"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">557</int>
 						<reference key="object" ref="361653618"/>
@@ -1247,68 +1243,63 @@
 						<reference key="object" ref="777071989"/>
 						<reference key="parent" ref="715293634"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">551</int>
-						<reference key="object" ref="870739926"/>
-						<reference key="parent" ref="604031057"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">597</int>
-						<reference key="object" ref="673575837"/>
+						<reference key="object" ref="191361579"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="706244080"/>
+							<reference ref="79435345"/>
 						</object>
 						<reference key="parent" ref="604031057"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">598</int>
-						<reference key="object" ref="706244080"/>
+						<reference key="object" ref="79435345"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="764426686"/>
-							<reference ref="290609723"/>
-							<reference ref="1004113986"/>
+							<reference ref="603789603"/>
+							<reference ref="291565286"/>
+							<reference ref="189555851"/>
 						</object>
-						<reference key="parent" ref="673575837"/>
+						<reference key="parent" ref="191361579"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">596</int>
-						<reference key="object" ref="764426686"/>
-						<reference key="parent" ref="706244080"/>
+						<reference key="object" ref="603789603"/>
+						<reference key="parent" ref="79435345"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">599</int>
-						<reference key="object" ref="290609723"/>
-						<reference key="parent" ref="706244080"/>
+						<reference key="object" ref="291565286"/>
+						<reference key="parent" ref="79435345"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">600</int>
-						<reference key="object" ref="1004113986"/>
-						<reference key="parent" ref="706244080"/>
+						<reference key="object" ref="189555851"/>
+						<reference key="parent" ref="79435345"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">602</int>
-						<reference key="object" ref="466734512"/>
+						<reference key="object" ref="140877964"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="412429024"/>
+							<reference ref="302314278"/>
 						</object>
 						<reference key="parent" ref="604031057"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">603</int>
-						<reference key="object" ref="412429024"/>
+						<reference key="object" ref="302314278"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="782773916"/>
+							<reference ref="829216824"/>
 						</object>
-						<reference key="parent" ref="466734512"/>
+						<reference key="parent" ref="140877964"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">601</int>
-						<reference key="object" ref="782773916"/>
-						<reference key="parent" ref="412429024"/>
+						<reference key="object" ref="829216824"/>
+						<reference key="parent" ref="302314278"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">24</int>
@@ -1350,26 +1341,61 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">608</int>
-						<reference key="object" ref="38491277"/>
+						<reference key="object" ref="714859422"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="150690320"/>
+							<reference ref="274846156"/>
 						</object>
 						<reference key="parent" ref="649796088"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">609</int>
-						<reference key="object" ref="150690320"/>
+						<reference key="object" ref="274846156"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="133873389"/>
+							<reference ref="330055564"/>
+							<reference ref="863130688"/>
 						</object>
-						<reference key="parent" ref="38491277"/>
+						<reference key="parent" ref="714859422"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">610</int>
-						<reference key="object" ref="133873389"/>
-						<reference key="parent" ref="150690320"/>
+						<reference key="object" ref="330055564"/>
+						<reference key="parent" ref="274846156"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">611</int>
+						<reference key="object" ref="863130688"/>
+						<reference key="parent" ref="274846156"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">612</int>
+						<reference key="object" ref="347361677"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="172285465"/>
+						</object>
+						<reference key="parent" ref="604031057"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">613</int>
+						<reference key="object" ref="172285465"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="354494807"/>
+							<reference ref="870739926"/>
+						</object>
+						<reference key="parent" ref="347361677"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">549</int>
+						<reference key="object" ref="354494807"/>
+						<reference key="parent" ref="172285465"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">551</int>
+						<reference key="object" ref="870739926"/>
+						<reference key="parent" ref="172285465"/>
 					</object>
 				</object>
 			</object>
@@ -1416,7 +1442,6 @@
 					<string>545.IBPluginDependency</string>
 					<string>546.IBEditorWindowLastContentRect</string>
 					<string>546.IBPluginDependency</string>
-					<string>547.IBPluginDependency</string>
 					<string>549.IBPluginDependency</string>
 					<string>551.IBPluginDependency</string>
 					<string>557.IBEditorWindowLastContentRect</string>
@@ -1450,6 +1475,8 @@
 					<string>609.IBEditorWindowLastContentRect</string>
 					<string>609.IBPluginDependency</string>
 					<string>610.IBPluginDependency</string>
+					<string>611.IBPluginDependency</string>
+					<string>613.IBEditorWindowLastContentRect</string>
 					<string>72.IBPluginDependency</string>
 					<string>73.IBPluginDependency</string>
 					<string>79.IBPluginDependency</string>
@@ -1497,8 +1524,7 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{629, 499}, {168, 103}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{629, 539}, {192, 63}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1526,16 +1552,18 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{861, 495}, {144, 63}}</string>
+					<string>{{821, 519}, {144, 63}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{797, 499}, {185, 23}}</string>
+					<string>{{821, 539}, {185, 23}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{717, 579}, {141, 23}}</string>
+					<string>{{717, 559}, {141, 43}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{821, 559}, {123, 43}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>{{587, 529}, {164, 73}}</string>
@@ -1560,7 +1588,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">610</int>
+			<int key="maxID">613</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">