diff --git a/A2Mac/Assets.xcassets/disk1 open on.imageset/disk1 open on.png b/A2Mac/Assets.xcassets/disk1 open on.imageset/disk1 open on.png
index 3378f59..9b3e89e 100644
Binary files a/A2Mac/Assets.xcassets/disk1 open on.imageset/disk1 open on.png and b/A2Mac/Assets.xcassets/disk1 open on.imageset/disk1 open on.png differ
diff --git a/A2Mac/Assets.xcassets/disk_door_closed.imageset/Contents.json b/A2Mac/Assets.xcassets/disk_door_closed.imageset/Contents.json
new file mode 100644
index 0000000..4174376
--- /dev/null
+++ b/A2Mac/Assets.xcassets/disk_door_closed.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "disk_door_closed.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/A2Mac/Assets.xcassets/disk_door_closed.imageset/disk_door_closed.png b/A2Mac/Assets.xcassets/disk_door_closed.imageset/disk_door_closed.png
new file mode 100644
index 0000000..a4e9efb
Binary files /dev/null and b/A2Mac/Assets.xcassets/disk_door_closed.imageset/disk_door_closed.png differ
diff --git a/A2Mac/Assets.xcassets/disk_door_opened.imageset/Contents.json b/A2Mac/Assets.xcassets/disk_door_opened.imageset/Contents.json
new file mode 100644
index 0000000..e89fc6b
--- /dev/null
+++ b/A2Mac/Assets.xcassets/disk_door_opened.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "disk_door_opened.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/A2Mac/Assets.xcassets/disk_door_opened.imageset/disk_door_opened.png b/A2Mac/Assets.xcassets/disk_door_opened.imageset/disk_door_opened.png
new file mode 100644
index 0000000..31dd883
Binary files /dev/null and b/A2Mac/Assets.xcassets/disk_door_opened.imageset/disk_door_opened.png differ
diff --git a/A2Mac/Assets.xcassets/disk_face.imageset/Contents.json b/A2Mac/Assets.xcassets/disk_face.imageset/Contents.json
new file mode 100644
index 0000000..a431526
--- /dev/null
+++ b/A2Mac/Assets.xcassets/disk_face.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "disk_face.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/A2Mac/Assets.xcassets/disk_face.imageset/disk_face.png b/A2Mac/Assets.xcassets/disk_face.imageset/disk_face.png
new file mode 100644
index 0000000..e83adaf
Binary files /dev/null and b/A2Mac/Assets.xcassets/disk_face.imageset/disk_face.png differ
diff --git a/A2Mac/Assets.xcassets/disk_led_on.imageset/Contents.json b/A2Mac/Assets.xcassets/disk_led_on.imageset/Contents.json
new file mode 100644
index 0000000..800a16a
--- /dev/null
+++ b/A2Mac/Assets.xcassets/disk_led_on.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "disk_led_on.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/A2Mac/Assets.xcassets/disk_led_on.imageset/disk_led_on.png b/A2Mac/Assets.xcassets/disk_led_on.imageset/disk_led_on.png
new file mode 100644
index 0000000..cb5ef41
Binary files /dev/null and b/A2Mac/Assets.xcassets/disk_led_on.imageset/disk_led_on.png differ
diff --git a/A2Mac/Assets.xcassets/disk_number_1.imageset/Contents.json b/A2Mac/Assets.xcassets/disk_number_1.imageset/Contents.json
new file mode 100644
index 0000000..cc6174c
--- /dev/null
+++ b/A2Mac/Assets.xcassets/disk_number_1.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "disk_number_1.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/A2Mac/Assets.xcassets/disk_number_1.imageset/disk_number_1.png b/A2Mac/Assets.xcassets/disk_number_1.imageset/disk_number_1.png
new file mode 100644
index 0000000..b50b441
Binary files /dev/null and b/A2Mac/Assets.xcassets/disk_number_1.imageset/disk_number_1.png differ
diff --git a/A2Mac/Assets.xcassets/disk_number_2.imageset/Contents.json b/A2Mac/Assets.xcassets/disk_number_2.imageset/Contents.json
new file mode 100644
index 0000000..3f3155b
--- /dev/null
+++ b/A2Mac/Assets.xcassets/disk_number_2.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "disk_number_2.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/A2Mac/Assets.xcassets/disk_number_2.imageset/disk_number_2.png b/A2Mac/Assets.xcassets/disk_number_2.imageset/disk_number_2.png
new file mode 100644
index 0000000..b616832
Binary files /dev/null and b/A2Mac/Assets.xcassets/disk_number_2.imageset/disk_number_2.png differ
diff --git a/A2Mac/Base.lproj/Main.storyboard b/A2Mac/Base.lproj/Main.storyboard
index d2d0046..490007e 100644
--- a/A2Mac/Base.lproj/Main.storyboard
+++ b/A2Mac/Base.lproj/Main.storyboard
@@ -1438,7 +1438,7 @@
                                     <popUpButton key="view" id="Ktw-L6-kEz">
                                         <rect key="frame" x="0.0" y="14" width="43" height="30"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                        <popUpButtonCell key="cell" type="bevel" bezelStyle="regularSquare" image="popUpButtonCell:A4p-LJ-svz:image" imagePosition="only" alignment="right" lineBreakMode="truncatingTail" refusesFirstResponder="YES" imageScaling="proportionallyUpOrDown" inset="2" pullsDown="YES" arrowPosition="noArrow" id="A4p-LJ-svz">
+                                        <popUpButtonCell key="cell" type="bevel" bezelStyle="regularSquare" image="Joystick" imagePosition="only" alignment="right" lineBreakMode="truncatingTail" refusesFirstResponder="YES" imageScaling="proportionallyUpOrDown" inset="2" pullsDown="YES" arrowPosition="noArrow" id="A4p-LJ-svz">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="menu"/>
                                             <menu key="menu" id="q8R-kX-3jc">
@@ -1464,7 +1464,7 @@
                                     <popUpButton key="view" id="rfS-6q-EKe">
                                         <rect key="frame" x="0.0" y="14" width="43" height="30"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                        <popUpButtonCell key="cell" type="bevel" bezelStyle="regularSquare" image="popUpButtonCell:A4p-LJ-svz:image" imagePosition="only" alignment="right" lineBreakMode="truncatingTail" refusesFirstResponder="YES" imageScaling="proportionallyUpOrDown" inset="2" pullsDown="YES" arrowPosition="noArrow" id="8bV-Aa-zHf">
+                                        <popUpButtonCell key="cell" type="bevel" bezelStyle="regularSquare" image="Quick Disk" imagePosition="only" alignment="right" lineBreakMode="truncatingTail" refusesFirstResponder="YES" imageScaling="proportionallyUpOrDown" inset="2" pullsDown="YES" arrowPosition="noArrow" id="8bV-Aa-zHf">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="menu"/>
                                             <menu key="menu" id="7Vp-Rc-UbT">
@@ -1487,7 +1487,7 @@
                                     <popUpButton key="view" id="MAv-S5-diZ">
                                         <rect key="frame" x="0.0" y="14" width="43" height="30"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                        <popUpButtonCell key="cell" type="bevel" bezelStyle="regularSquare" image="popUpButtonCell:A4p-LJ-svz:image" imagePosition="only" alignment="right" lineBreakMode="truncatingTail" refusesFirstResponder="YES" imageScaling="proportionallyUpOrDown" inset="2" pullsDown="YES" arrowPosition="noArrow" id="WVW-Wo-mc9">
+                                        <popUpButtonCell key="cell" type="bevel" bezelStyle="regularSquare" image="Chip" imagePosition="only" alignment="right" lineBreakMode="truncatingTail" refusesFirstResponder="YES" imageScaling="proportionallyUpOrDown" inset="2" pullsDown="YES" arrowPosition="noArrow" id="WVW-Wo-mc9">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="menu"/>
                                             <menu key="menu" id="Gc4-Or-LMB">
@@ -1743,7 +1743,7 @@
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <textView editable="NO" selectable="NO" drawsBackground="NO" importsGraphics="NO" richText="NO" horizontallyResizable="YES" verticallyResizable="YES" baseWritingDirection="leftToRight" findStyle="bar" allowsCharacterPickerTouchBarItem="NO" textCompletion="NO" id="ccC-Wu-3za" userLabel="Display" customClass="DisplayView" customModule="Steve___" customModuleProvider="target">
-                                            <rect key="frame" x="0.0" y="-64" width="1152" height="768"/>
+                                            <rect key="frame" x="0.0" y="-128" width="1152" height="768"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" red="0.0" green="0.99143940210000003" blue="1" alpha="0.76658818490000002" colorSpace="custom" customColorSpace="sRGB"/>
@@ -1877,9 +1877,9 @@
                                     <stackView focusRingType="none" distribution="fill" orientation="vertical" alignment="leading" spacing="-20" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5gO-h7-NcU" userLabel="Prefipheries">
                                         <rect key="frame" x="0.0" y="574" width="120" height="178"/>
                                         <subviews>
-                                            <popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="49f-8R-QCc" userLabel="IDisk1 Button">
+                                            <popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="49f-8R-QCc" userLabel="Disk1 Button">
                                                 <rect key="frame" x="0.0" y="79" width="120" height="99"/>
-                                                <popUpButtonCell key="cell" type="bevel" bezelStyle="regularSquare" image="popUpButtonCell:A4p-LJ-svz:image" imagePosition="only" alignment="left" lineBreakMode="truncatingTail" refusesFirstResponder="YES" imageScaling="proportionallyUpOrDown" inset="2" pullsDown="YES" arrowPosition="noArrow" altersStateOfSelectedItem="NO" id="CNs-lh-urM">
+                                                <popUpButtonCell key="cell" type="bevel" bezelStyle="regularSquare" image="popUpButtonCell:CNs-lh-urM:image" imagePosition="only" alignment="left" lineBreakMode="truncatingTail" refusesFirstResponder="YES" imageScaling="proportionallyUpOrDown" inset="2" pullsDown="YES" arrowPosition="noArrow" altersStateOfSelectedItem="NO" id="CNs-lh-urM">
                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                     <font key="font" metaFont="menu"/>
                                                     <menu key="menu" id="N33-K0-nba">
@@ -1913,7 +1913,7 @@
                                             </popUpButton>
                                             <popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="QDr-Cp-9QQ" userLabel="Disk2 Button">
                                                 <rect key="frame" x="0.0" y="0.0" width="120" height="99"/>
-                                                <popUpButtonCell key="cell" type="bevel" bezelStyle="regularSquare" image="popUpButtonCell:A4p-LJ-svz:image" imagePosition="only" alignment="left" lineBreakMode="truncatingTail" refusesFirstResponder="YES" imageScaling="proportionallyUpOrDown" inset="2" pullsDown="YES" arrowPosition="noArrow" altersStateOfSelectedItem="NO" selectedItem="28N-X8-n7Q" id="8FA-1D-k8p">
+                                                <popUpButtonCell key="cell" type="bevel" bezelStyle="regularSquare" image="popUpButtonCell:CNs-lh-urM:image" imagePosition="only" alignment="left" lineBreakMode="truncatingTail" refusesFirstResponder="YES" imageScaling="proportionallyUpOrDown" inset="2" pullsDown="YES" arrowPosition="noArrow" altersStateOfSelectedItem="NO" selectedItem="28N-X8-n7Q" id="8FA-1D-k8p">
                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                     <font key="font" metaFont="menu"/>
                                                     <menu key="menu" id="8He-mk-LVI">
@@ -1945,36 +1945,59 @@
                                                     <action selector="Disk1:" target="XfG-lQ-9wD" id="ZjR-28-3Rx"/>
                                                 </connections>
                                             </popUpButton>
-                                            <button hidden="YES" focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="T0r-xy-OJF">
-                                                <rect key="frame" x="0.0" y="79" width="120" height="99"/>
-                                                <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="disk2 open off" imagePosition="only" alignment="center" enabled="NO" refusesFirstResponder="YES" focusRingType="none" imageScaling="proportionallyUpOrDown" inset="2" id="z4y-xq-1UN">
-                                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                    <font key="font" metaFont="system"/>
-                                                </buttonCell>
-                                            </button>
                                         </subviews>
                                         <constraints>
-                                            <constraint firstItem="T0r-xy-OJF" firstAttribute="leading" secondItem="5gO-h7-NcU" secondAttribute="leading" id="N3X-wj-QNL"/>
-                                            <constraint firstAttribute="trailing" secondItem="T0r-xy-OJF" secondAttribute="trailing" id="ntu-ND-2Tg"/>
+                                            <constraint firstAttribute="trailing" secondItem="49f-8R-QCc" secondAttribute="trailing" id="6aB-Qg-JZQ"/>
+                                            <constraint firstItem="49f-8R-QCc" firstAttribute="leading" secondItem="5gO-h7-NcU" secondAttribute="leading" id="Vej-Ld-EaC"/>
                                         </constraints>
                                         <visibilityPriorities>
                                             <integer value="1000"/>
                                             <integer value="1000"/>
-                                            <integer value="1000"/>
                                         </visibilityPriorities>
                                         <customSpacing>
                                             <real value="3.4028234663852886e+38"/>
                                             <real value="3.4028234663852886e+38"/>
-                                            <real value="3.4028234663852886e+38"/>
                                         </customSpacing>
                                     </stackView>
                                     <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="lIN-1F-RHJ" userLabel="Disk1 Image">
                                         <rect key="frame" x="0.0" y="653" width="120" height="99"/>
-                                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="disk1 open off" id="xxP-4w-d2M"/>
+                                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="disk_face" id="xxP-4w-d2M"/>
+                                    </imageView>
+                                    <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="t8u-aV-fBq" userLabel="Disk1 Number">
+                                        <rect key="frame" x="0.0" y="653" width="120" height="99"/>
+                                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="disk_number_1" id="ysU-b8-xrG"/>
+                                    </imageView>
+                                    <imageView hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="AZl-Zl-L9T" userLabel="Disk1 LED On">
+                                        <rect key="frame" x="0.0" y="653" width="120" height="99"/>
+                                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="disk_led_on" id="M0Y-GE-7h7"/>
+                                    </imageView>
+                                    <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="IAx-Q8-Avg" userLabel="Disk1 Door Opened">
+                                        <rect key="frame" x="0.0" y="653" width="120" height="99"/>
+                                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="disk_door_opened" id="hQj-nV-BFQ"/>
+                                    </imageView>
+                                    <imageView hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="KZx-ua-xoJ" userLabel="Disk1 Door Closed">
+                                        <rect key="frame" x="0.0" y="653" width="120" height="99"/>
+                                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="disk_door_closed" id="pAr-tf-GsW"/>
                                     </imageView>
                                     <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="iRL-7l-xsy" userLabel="Disk2 Image">
                                         <rect key="frame" x="0.0" y="574" width="120" height="99"/>
-                                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="disk2 open off" id="8WE-ms-8gh"/>
+                                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="disk_face" id="8WE-ms-8gh"/>
+                                    </imageView>
+                                    <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="rGw-Rl-YdJ" userLabel="Disk2 Number">
+                                        <rect key="frame" x="0.0" y="574" width="120" height="99"/>
+                                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="disk_number_2" id="lUX-PN-Log"/>
+                                    </imageView>
+                                    <imageView hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="RNo-MO-g2S" userLabel="Disk2 LED On">
+                                        <rect key="frame" x="0.0" y="574" width="120" height="99"/>
+                                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="disk_led_on" id="0k0-vp-Uj2"/>
+                                    </imageView>
+                                    <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Q1Z-SM-g7J" userLabel="Disk2 Door Opened">
+                                        <rect key="frame" x="0.0" y="574" width="120" height="99"/>
+                                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="disk_door_opened" id="6WR-1M-cdU"/>
+                                    </imageView>
+                                    <imageView hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="2Et-DA-JIr" userLabel="Disk2 Door Closed">
+                                        <rect key="frame" x="0.0" y="574" width="120" height="99"/>
+                                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="disk_door_closed" id="CaE-Oz-Qm7"/>
                                     </imageView>
                                     <stackView focusRingType="none" distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="lVP-FP-u6x" userLabel="CPU Speed Selection">
                                         <rect key="frame" x="8" y="8" width="104" height="158"/>
@@ -2156,19 +2179,51 @@
                                 </subviews>
                                 <constraints>
                                     <constraint firstItem="iRL-7l-xsy" firstAttribute="trailing" secondItem="QDr-Cp-9QQ" secondAttribute="trailing" id="0Bd-I3-lVq"/>
+                                    <constraint firstItem="rGw-Rl-YdJ" firstAttribute="top" secondItem="QDr-Cp-9QQ" secondAttribute="top" id="2RC-LS-aGq"/>
+                                    <constraint firstItem="2Et-DA-JIr" firstAttribute="leading" secondItem="QDr-Cp-9QQ" secondAttribute="leading" id="2rz-gJ-DCj"/>
+                                    <constraint firstItem="KZx-ua-xoJ" firstAttribute="leading" secondItem="49f-8R-QCc" secondAttribute="leading" id="3td-ii-m2J"/>
+                                    <constraint firstItem="KZx-ua-xoJ" firstAttribute="bottom" secondItem="49f-8R-QCc" secondAttribute="bottom" id="4ky-OJ-Aix"/>
+                                    <constraint firstItem="Q1Z-SM-g7J" firstAttribute="trailing" secondItem="QDr-Cp-9QQ" secondAttribute="trailing" id="6hE-n6-7Hn"/>
+                                    <constraint firstItem="Q1Z-SM-g7J" firstAttribute="bottom" secondItem="QDr-Cp-9QQ" secondAttribute="bottom" id="8BX-Am-50D"/>
+                                    <constraint firstItem="t8u-aV-fBq" firstAttribute="top" secondItem="49f-8R-QCc" secondAttribute="top" id="C0r-AL-H7x"/>
                                     <constraint firstAttribute="bottom" secondItem="lVP-FP-u6x" secondAttribute="bottom" constant="8" id="DtK-7e-K5K"/>
+                                    <constraint firstItem="IAx-Q8-Avg" firstAttribute="top" secondItem="49f-8R-QCc" secondAttribute="top" id="E6z-sO-5at"/>
+                                    <constraint firstItem="Q1Z-SM-g7J" firstAttribute="top" secondItem="QDr-Cp-9QQ" secondAttribute="top" id="HYQ-PN-Oxj"/>
+                                    <constraint firstItem="t8u-aV-fBq" firstAttribute="trailing" secondItem="49f-8R-QCc" secondAttribute="trailing" id="HjF-nv-c9Z"/>
+                                    <constraint firstItem="RNo-MO-g2S" firstAttribute="trailing" secondItem="QDr-Cp-9QQ" secondAttribute="trailing" id="LyD-EE-1rD"/>
+                                    <constraint firstItem="AZl-Zl-L9T" firstAttribute="trailing" secondItem="49f-8R-QCc" secondAttribute="trailing" id="M5M-1T-mpt"/>
+                                    <constraint firstItem="t8u-aV-fBq" firstAttribute="leading" secondItem="49f-8R-QCc" secondAttribute="leading" id="Mot-cJ-g3c"/>
                                     <constraint firstItem="iRL-7l-xsy" firstAttribute="leading" secondItem="QDr-Cp-9QQ" secondAttribute="leading" id="O30-kN-xJf"/>
+                                    <constraint firstItem="RNo-MO-g2S" firstAttribute="leading" secondItem="QDr-Cp-9QQ" secondAttribute="leading" id="OEj-gU-TX3"/>
+                                    <constraint firstItem="2Et-DA-JIr" firstAttribute="trailing" secondItem="QDr-Cp-9QQ" secondAttribute="trailing" id="ONV-xQ-bVV"/>
+                                    <constraint firstItem="rGw-Rl-YdJ" firstAttribute="trailing" secondItem="QDr-Cp-9QQ" secondAttribute="trailing" id="OSH-fX-JtF"/>
+                                    <constraint firstItem="IAx-Q8-Avg" firstAttribute="leading" secondItem="49f-8R-QCc" secondAttribute="leading" id="Obi-vy-TGb"/>
                                     <constraint firstItem="5gO-h7-NcU" firstAttribute="leading" secondItem="Fdf-pv-iEw" secondAttribute="leading" id="PKR-Iu-37M"/>
+                                    <constraint firstItem="AZl-Zl-L9T" firstAttribute="bottom" secondItem="49f-8R-QCc" secondAttribute="bottom" id="PUU-yT-lkg"/>
                                     <constraint firstItem="lIN-1F-RHJ" firstAttribute="leading" secondItem="49f-8R-QCc" secondAttribute="leading" id="YNu-WV-S2S"/>
+                                    <constraint firstItem="IAx-Q8-Avg" firstAttribute="bottom" secondItem="49f-8R-QCc" secondAttribute="bottom" id="Z0Y-GC-Qoe"/>
+                                    <constraint firstItem="KZx-ua-xoJ" firstAttribute="top" secondItem="49f-8R-QCc" secondAttribute="top" id="Zwp-4t-6pA"/>
+                                    <constraint firstItem="t8u-aV-fBq" firstAttribute="bottom" secondItem="49f-8R-QCc" secondAttribute="bottom" id="a2c-ga-hl1"/>
+                                    <constraint firstItem="Q1Z-SM-g7J" firstAttribute="leading" secondItem="QDr-Cp-9QQ" secondAttribute="leading" id="aCK-cF-QHQ"/>
                                     <constraint firstItem="lIN-1F-RHJ" firstAttribute="trailing" secondItem="49f-8R-QCc" secondAttribute="trailing" id="ch5-TQ-a4T"/>
+                                    <constraint firstItem="2Et-DA-JIr" firstAttribute="top" secondItem="QDr-Cp-9QQ" secondAttribute="top" id="cmL-ec-iPL"/>
                                     <constraint firstItem="lIN-1F-RHJ" firstAttribute="top" secondItem="49f-8R-QCc" secondAttribute="top" id="ct7-UP-C3J"/>
+                                    <constraint firstItem="RNo-MO-g2S" firstAttribute="top" secondItem="QDr-Cp-9QQ" secondAttribute="top" id="d83-UU-hkA"/>
+                                    <constraint firstItem="IAx-Q8-Avg" firstAttribute="trailing" secondItem="49f-8R-QCc" secondAttribute="trailing" id="fbp-ej-xYo"/>
                                     <constraint firstItem="5gO-h7-NcU" firstAttribute="top" secondItem="Fdf-pv-iEw" secondAttribute="top" id="hLf-YC-yBF"/>
+                                    <constraint firstItem="rGw-Rl-YdJ" firstAttribute="leading" secondItem="QDr-Cp-9QQ" secondAttribute="leading" id="j7d-rY-uFN"/>
                                     <constraint firstItem="iRL-7l-xsy" firstAttribute="bottom" secondItem="QDr-Cp-9QQ" secondAttribute="bottom" id="k2S-C1-421"/>
                                     <constraint firstAttribute="trailing" secondItem="5gO-h7-NcU" secondAttribute="trailing" id="ldB-KD-cfy"/>
                                     <constraint firstItem="iRL-7l-xsy" firstAttribute="top" secondItem="QDr-Cp-9QQ" secondAttribute="top" id="mva-M6-KcJ"/>
+                                    <constraint firstItem="rGw-Rl-YdJ" firstAttribute="bottom" secondItem="QDr-Cp-9QQ" secondAttribute="bottom" id="nDK-vb-Nfq"/>
                                     <constraint firstAttribute="trailing" secondItem="lVP-FP-u6x" secondAttribute="trailing" constant="8" id="oC3-82-hiy"/>
                                     <constraint firstItem="lIN-1F-RHJ" firstAttribute="bottom" secondItem="49f-8R-QCc" secondAttribute="bottom" id="oqI-7S-uUx"/>
+                                    <constraint firstItem="2Et-DA-JIr" firstAttribute="bottom" secondItem="QDr-Cp-9QQ" secondAttribute="bottom" id="qVV-5S-dmB"/>
+                                    <constraint firstItem="RNo-MO-g2S" firstAttribute="bottom" secondItem="QDr-Cp-9QQ" secondAttribute="bottom" id="rTz-xI-I4f"/>
+                                    <constraint firstItem="AZl-Zl-L9T" firstAttribute="leading" secondItem="49f-8R-QCc" secondAttribute="leading" id="rZa-yl-eYO"/>
+                                    <constraint firstItem="KZx-ua-xoJ" firstAttribute="trailing" secondItem="49f-8R-QCc" secondAttribute="trailing" id="sDl-7F-oT5"/>
                                     <constraint firstItem="lVP-FP-u6x" firstAttribute="leading" secondItem="Fdf-pv-iEw" secondAttribute="leading" constant="8" id="tk8-7H-382"/>
+                                    <constraint firstItem="AZl-Zl-L9T" firstAttribute="top" secondItem="49f-8R-QCc" secondAttribute="top" id="uWd-M6-Uan"/>
                                 </constraints>
                             </customView>
                         </subviews>
@@ -2212,14 +2267,15 @@
                         </connections>
                     </view>
                     <connections>
-                        <outlet property="Disk1_Button" destination="49f-8R-QCc" id="igd-aj-3Kk"/>
-                        <outlet property="Disk1_ButtonCell" destination="CNs-lh-urM" id="mdP-Yd-4JA"/>
                         <outlet property="DiskSound_Disk1" destination="5cI-3C-PMM" id="ptG-tm-GZs"/>
                         <outlet property="DiskSound_Disk2" destination="vmR-CG-qdv" id="22u-xi-nHH"/>
                         <outlet property="EMALabel" destination="11J-tH-xLe" id="BHX-Gf-xsl"/>
                         <outlet property="QuickDisk_Disk1" destination="cth-H6-Drg" id="cFI-9E-kYv"/>
                         <outlet property="QuickDisk_Disk2" destination="yDH-Ob-i3N" id="hvi-ZC-Pk4"/>
-                        <outlet property="disk1_img" destination="lIN-1F-RHJ" id="ArQ-Ck-Kla"/>
+                        <outlet property="disk1_closed" destination="KZx-ua-xoJ" id="qLX-Pv-2EU"/>
+                        <outlet property="disk1_led" destination="AZl-Zl-L9T" id="o3V-Gj-nRF"/>
+                        <outlet property="disk2_closed" destination="2Et-DA-JIr" id="kHK-wX-4ih"/>
+                        <outlet property="disk2_led" destination="RNo-MO-g2S" id="9iO-Yy-dPk"/>
                         <outlet property="hires" destination="LlM-EV-ruZ" id="E60-pA-HM1"/>
                         <outlet property="initialLeadEdgeSlider" destination="8yq-X9-qQ4" id="dnS-3t-7u1"/>
                         <outlet property="initialTailEdgeSlider" destination="P91-Ah-VX6" id="wv4-vA-j9E"/>
@@ -2265,8 +2321,12 @@
         <image name="Reset" width="32" height="32"/>
         <image name="Select All" width="32" height="32"/>
         <image name="White" width="32" height="32"/>
-        <image name="disk1 open off" width="160" height="98.5"/>
-        <image name="disk2 open off" width="160" height="98.5"/>
+        <image name="disk_door_closed" width="160" height="98.5"/>
+        <image name="disk_door_opened" width="160" height="98.5"/>
+        <image name="disk_face" width="160" height="98.5"/>
+        <image name="disk_led_on" width="160" height="98.5"/>
+        <image name="disk_number_1" width="160" height="98.5"/>
+        <image name="disk_number_2" width="160" height="98.5"/>
         <image name="dotmatrix_effect" width="268.79998779296875" height="184.32000732421875"/>
         <image name="imageCell:Zax-kI-rxd:image" width="384" height="307.20001220703125">
             <mutableData key="keyedArchiveRepresentation">
@@ -138960,7 +139020,7 @@ BQB9EQcAfREJAH0RCwB9ERQAfREZAH0RHwB9EScAfREpAH0RKwB9ES0AfREvAH0imwB9IqAAfSKtAH0i
 sAB9Ir0AfSLCAH0iygB9Is0AfSLSAH0i2gAAAAAAAAQBAAAAAAAAAFAAAAAAAAAAAAAAAAAAfSLdA
 </mutableData>
         </image>
-        <image name="popUpButtonCell:A4p-LJ-svz:image" width="1" height="1">
+        <image name="popUpButtonCell:CNs-lh-urM:image" width="1" height="1">
             <mutableData key="keyedArchiveRepresentation">
 YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05T
 S2V5ZWRBcmNoaXZlctEICVRyb290gAGvEBcLDBkaIRQmKisyNTo9PkNGR0pUXF1hZFUkbnVsbNYNDg8Q
diff --git a/A2Mac/ViewController.swift b/A2Mac/ViewController.swift
index 6a34171..e3d3169 100644
--- a/A2Mac/ViewController.swift
+++ b/A2Mac/ViewController.swift
@@ -1176,18 +1176,16 @@ class ViewController: NSViewController  {
         // Disk Motor LED
         if ( frameCounter % DEF_DRV_LED_DIV == 0 ) {
             if spkr_is_disk_motor_playing() {
-                if disk1_img.image != Disk1_open_on_img {
+                if disk1_led.isHidden {
                     DispatchQueue.main.sync {
-    //                NSLog("Disk1_open_on_img: %@", Disk1_open_on_img ?? "NIL")
-                        self.disk1_img.image = self.Disk1_open_on_img
+                        disk1_led.isHidden = false
                     }
                 }
             }
             else {
-                if disk1_img.image != Disk1_open_off_img {
+                if !disk1_led.isHidden {
                     DispatchQueue.main.sync {
-    //                NSLog("Disk1_open_off_img: %@", Disk1_open_off_img ?? "NIL")
-                        self.disk1_img.image = self.Disk1_open_off_img
+                        disk1_led.isHidden = true
                     }
                 }
             }
@@ -1388,11 +1386,10 @@ class ViewController: NSViewController  {
     }
 #endif
 
-    @IBOutlet weak var disk1_img: NSImageView!
-    @IBOutlet weak var Disk1_Button: NSPopUpButton!
-    @IBOutlet var Disk1_ButtonCell: NSPopUpButtonCell!
-    var Disk1_open_on_img  = NSImage(named: "disk1 open on")
-    var Disk1_open_off_img = NSImage(named: "disk1 open off")
+    @IBOutlet weak var disk1_led: NSImageView!
+    @IBOutlet weak var disk2_led: NSImageView!
+    @IBOutlet weak var disk1_closed: NSImageView!
+    @IBOutlet weak var disk2_closed: NSImageView!
 
     override func viewDidLoad() {
         super.viewDidLoad()