diff --git a/A2Mac.xcodeproj/project.pbxproj b/A2Mac.xcodeproj/project.pbxproj
index 8e01fb4..0fe17d1 100644
--- a/A2Mac.xcodeproj/project.pbxproj
+++ b/A2Mac.xcodeproj/project.pbxproj
@@ -746,6 +746,7 @@
 		32C823392908822E0018438F /* DebuggerWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DebuggerWindowController.swift; sourceTree = "<group>"; };
 		32D0897B291A44F200F2B486 /* 6502_bp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = 6502_bp.c; sourceTree = "<group>"; };
 		32D08987291A450400F2B486 /* 6502_bp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 6502_bp.h; sourceTree = "<group>"; };
+		32D08992291AF23500F2B486 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = A2Mac/Base.lproj/Debug.storyboard; sourceTree = "<group>"; };
 		32DBF7632334657900DD50E7 /* HiRes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HiRes.swift; sourceTree = "<group>"; };
 		32DBF76723373FB400DD50E7 /* disassembler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = disassembler.h; sourceTree = "<group>"; };
 		32E21BE62491BF8B006C0C72 /* apple-rainbow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "apple-rainbow.png"; sourceTree = "<group>"; };
@@ -1131,6 +1132,7 @@
 		32BFFB4E22EACC630003B53F = {
 			isa = PBXGroup;
 			children = (
+				32D08991291AF23500F2B486 /* Debug.storyboard */,
 				326426112328ADF4008B615F /* Apple_II_ROM.s */,
 				325EB63123F8861A00C6B4A4 /* src */,
 				3262F37823E17013008BDB95 /* Resources */,
@@ -1826,6 +1828,14 @@
 			name = Main.storyboard;
 			sourceTree = "<group>";
 		};
+		32D08991291AF23500F2B486 /* Debug.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				32D08992291AF23500F2B486 /* Base */,
+			);
+			name = Debug.storyboard;
+			sourceTree = "<group>";
+		};
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
diff --git a/A2Mac/Base.lproj/Debug.storyboard b/A2Mac/Base.lproj/Debug.storyboard
new file mode 100644
index 0000000..927f9ad
--- /dev/null
+++ b/A2Mac/Base.lproj/Debug.storyboard
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="g5o-m8-tZm">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17701"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--Debugger Window Controller-->
+        <scene sceneID="vl6-ZC-th8">
+            <objects>
+                <windowController storyboardIdentifier="debuggerWindowController" id="g5o-m8-tZm" userLabel="Debugger Window Controller" customClass="DebuggerWindowController" customModule="Steve___" customModuleProvider="target" sceneMemberID="viewController">
+                    <window key="window" title="Steve ][ Debugger" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="Steve ][ Toolbar" animationBehavior="default" id="W9O-yw-CGK">
+                        <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+                        <rect key="contentRect" x="196" y="240" width="1280" height="840"/>
+                        <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1177"/>
+                        <value key="minSize" type="size" width="280" height="192"/>
+                        <value key="minFullScreenContentSize" type="size" width="280" height="192"/>
+                        <view key="contentView" id="cHE-X3-R49">
+                            <rect key="frame" x="0.0" y="0.0" width="1280" height="840"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </view>
+                        <connections>
+                            <outlet property="delegate" destination="g5o-m8-tZm" id="3HY-k4-3eH"/>
+                        </connections>
+                    </window>
+                    <connections>
+                        <segue destination="R5e-co-cXs" kind="relationship" relationship="window.shadowedContentViewController" id="sTL-95-2Ng"/>
+                    </connections>
+                </windowController>
+                <customObject id="PfD-ca-rWD" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-4" y="2115"/>
+        </scene>
+        <!--Debugger Controller Scene-->
+        <scene sceneID="TCG-Cv-QBI">
+            <objects>
+                <viewController title="Debugger Controller Scene" id="R5e-co-cXs" customClass="DebuggerViewController" customModule="Steve___" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" identifier="Monitor View" wantsLayer="YES" focusRingType="none" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" id="Myj-W6-YvY" userLabel="Debugger View">
+                        <rect key="frame" x="0.0" y="0.0" width="1100" height="520"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    </view>
+                </viewController>
+                <customObject id="DyX-eh-3mW" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-28" y="3201"/>
+        </scene>
+    </scenes>
+</document>
diff --git a/A2Mac/Base.lproj/Debugger.storyboard b/A2Mac/Base.lproj/Debugger.storyboard
index 3f48472..45d6761 100644
--- a/A2Mac/Base.lproj/Debugger.storyboard
+++ b/A2Mac/Base.lproj/Debugger.storyboard
@@ -222,7 +222,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="Hwx-Gd-XW1" userLabel="Disass Display" customClass="DisplayView" customModule="A2MacTests" customModuleProvider="target">
-                                                    <rect key="frame" x="0.0" y="-111" width="349" height="1270"/>
+                                                    <rect key="frame" x="0.0" y="-145" width="349" height="1155"/>
                                                     <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.12549019610000001" green="0.12549019610000001" blue="0.12549019610000001" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
@@ -308,14 +308,14 @@ C20D: 4C C5 FE   JMP $FEC5
 </mutableString>
                                                             <attributes>
                                                                 <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
-                                                                <font key="NSFont" size="11" name="PrintChar21"/>
+                                                                <font key="NSFont" size="10" name="PrintChar21"/>
                                                                 <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="leftToRight" lineHeightMultiple="1.5" tighteningFactorForTruncation="0.0"/>
                                                             </attributes>
                                                         </fragment>
                                                         <fragment content="FEC5: 8D 06 C0   STA $C006">
                                                             <attributes>
                                                                 <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
-                                                                <font key="NSFont" size="11" name="PrintChar21"/>
+                                                                <font key="NSFont" size="10" name="PrintChar21"/>
                                                                 <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="leftToRight" firstLineHeadIndent="8" headIndent="8" lineHeightMultiple="1.5" tighteningFactorForTruncation="0.0"/>
                                                             </attributes>
                                                         </fragment>
@@ -391,7 +391,7 @@ C20D: 4C C5 FE   JMP $FEC5
                                                                                 <fragment content="A: A0    160    1010 0000
X: 01      1    0000 0001
Y: 10     16    0001 0000

SP: F0
PC: FD18

N V - B D I Z C
0 0 1 0 0 1 1 0">
                                                                                     <attributes>
                                                                                         <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
-                                                                                        <font key="NSFont" size="11" name="PrintChar21"/>
+                                                                                        <font key="NSFont" size="10" name="PrintChar21"/>
                                                                                         <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="leftToRight" firstLineHeadIndent="8" headIndent="8" lineHeightMultiple="1.5" tighteningFactorForTruncation="0.0"/>
                                                                                     </attributes>
                                                                                 </fragment>
@@ -448,7 +448,7 @@ C20D: 4C C5 FE   JMP $FEC5
                                                                     <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="BHr-Q4-rBI" userLabel="Stack Display" customClass="DisplayView" customModule="A2MacTests" customModuleProvider="target">
-                                                                            <rect key="frame" x="0.0" y="-187" width="334" height="181"/>
+                                                                            <rect key="frame" x="0.0" y="-218" width="334" height="165"/>
                                                                             <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" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -458,7 +458,7 @@ C20D: 4C C5 FE   JMP $FEC5
                                                                                 <fragment content="1FF: FA
1FE: 84
1FD: 01
1FC: 01
1FB: 00
1FA: 1F
1F9: C1
1F7: D443 JSR
1F5: D532 JSR
1F3: FD77 JSR
1f1: FD37 JSR">
                                                                                     <attributes>
                                                                                         <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
-                                                                                        <font key="NSFont" size="11" name="PrintChar21"/>
+                                                                                        <font key="NSFont" size="10" name="PrintChar21"/>
                                                                                         <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="leftToRight" firstLineHeadIndent="8" headIndent="8" lineHeightMultiple="1.5" tighteningFactorForTruncation="0.0"/>
                                                                                     </attributes>
                                                                                 </fragment>
@@ -472,7 +472,7 @@ C20D: 4C C5 FE   JMP $FEC5
                                                                     <rect key="frame" x="-100" y="-100" width="349" height="15"/>
                                                                     <autoresizingMask key="autoresizingMask"/>
                                                                 </scroller>
-                                                                <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="dcm-z5-VNG">
+                                                                <scroller key="verticalScroller" verticalHuggingPriority="750" doubleValue="0.2857142857142857" horizontal="NO" id="dcm-z5-VNG">
                                                                     <rect key="frame" x="335" y="1" width="15" height="158"/>
                                                                     <autoresizingMask key="autoresizingMask"/>
                                                                 </scroller>
@@ -533,19 +533,19 @@ C20D: 4C C5 FE   JMP $FEC5
                                                                 </textFieldCell>
                                                             </textField>
                                                             <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="p3x-F3-IOa" userLabel="Memory Addr Field">
-                                                                <rect key="frame" x="12" y="0.0" width="50" height="20"/>
+                                                                <rect key="frame" x="12" y="0.0" width="44" height="20"/>
                                                                 <constraints>
-                                                                    <constraint firstAttribute="width" constant="50" id="9xL-1J-8Hg"/>
+                                                                    <constraint firstAttribute="width" constant="44" id="9xL-1J-8Hg"/>
                                                                     <constraint firstAttribute="height" constant="20" identifier="Memory Addr Field.Height" id="bS5-Xb-qDz"/>
                                                                 </constraints>
                                                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="Addr" drawsBackground="YES" usesSingleLineMode="YES" id="Eze-3w-9N2" userLabel="Memory Addr Field Cell">
-                                                                    <font key="font" size="11" name="PrintChar21"/>
+                                                                    <font key="font" size="10" name="PrintChar21"/>
                                                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                 </textFieldCell>
                                                             </textField>
                                                             <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eCI-1T-iQB" userLabel="Middle Space">
-                                                                <rect key="frame" x="68" y="0.0" width="8" height="20"/>
+                                                                <rect key="frame" x="62" y="0.0" width="8" height="20"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="width" constant="4" id="O5P-Di-Yom"/>
                                                                     <constraint firstAttribute="height" constant="20" identifier="Memory Addr Field.Height" id="rxQ-uI-YNZ"/>
@@ -557,12 +557,12 @@ C20D: 4C C5 FE   JMP $FEC5
                                                                 </textFieldCell>
                                                             </textField>
                                                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DiM-zp-wCg" userLabel="Low Nibble Label">
-                                                                <rect key="frame" x="80" y="4" width="632" height="16"/>
+                                                                <rect key="frame" x="74" y="4" width="638" height="16"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="height" constant="16" identifier="Low Nibble Label.Height" id="cbC-f3-JsA"/>
                                                                 </constraints>
                                                                 <textFieldCell key="cell" lineBreakMode="clipping" selectable="YES" title="0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F" usesSingleLineMode="YES" id="ECg-7L-hRs">
-                                                                    <font key="font" size="11" name="PrintChar21"/>
+                                                                    <font key="font" size="10" name="PrintChar21"/>
                                                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                 </textFieldCell>
@@ -602,7 +602,7 @@ C20D: 4C C5 FE   JMP $FEC5
                                                                             <mutableString key="content">2000: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ABCDEFGHIJKLMNOP
2010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ABCDEFGHIJKLMNOP
2020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ABCDEFGHIJKLMNOP
2030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ABCDEFGHIJKLMNOP
2040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ABCDEFGHIJKLMNOP
2050: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ABCDEFGHIJKLMNOP
2060: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ABCDEFGHIJKLMNOP
2070: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ABCDEFGHIJKLMNOP
2080: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ABCDEFGHIJKLMNOP
2090: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ABCDEFGHIJKLMNOP
20A0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ABCDEFGHIJKLMNOP
20B0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ABCDEFGHIJKLMNOP
20C0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ABCDEFGHIJKLMNOP
20D0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ABCDEFGHIJKLMNOP
20E0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ABCDEFGHIJKLMNOP
20F0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ABCDEFGHIJKLMNOP</mutableString>
                                                                             <attributes>
                                                                                 <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
-                                                                                <font key="NSFont" size="11" name="PrintChar21"/>
+                                                                                <font key="NSFont" size="10" name="PrintChar21"/>
                                                                                 <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="leftToRight" firstLineHeadIndent="8" headIndent="8" lineHeightMultiple="1.5" tighteningFactorForTruncation="0.0"/>
                                                                             </attributes>
                                                                         </fragment>
diff --git a/A2Mac/Base.lproj/Main.storyboard b/A2Mac/Base.lproj/Main.storyboard
index 8e7d3bf..7a8d55f 100644
--- a/A2Mac/Base.lproj/Main.storyboard
+++ b/A2Mac/Base.lproj/Main.storyboard
@@ -1525,7 +1525,7 @@ Gw
                                     <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="Quick Disk" 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="popUpButtonCell:8bV-Aa-zHf:image" 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">
@@ -1812,7 +1812,7 @@ Gw
                                     <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="Text Display" customClass="DisplayView" customModule="Steve___" customModuleProvider="target">
-                                            <rect key="frame" x="0.0" y="-448" width="1152" height="768"/>
+                                            <rect key="frame" x="0.0" y="-480" 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"/>
@@ -1948,7 +1948,7 @@ Gw
                                         <subviews>
                                             <popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="49f-8R-QCc" userLabel="Disk1 Button">
                                                 <rect key="frame" x="0.0" y="75" width="104" height="99"/>
-                                                <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" userLabel="Disk1 Pop Up Button Cell">
+                                                <popUpButtonCell key="cell" type="bevel" bezelStyle="regularSquare" image="popUpButtonCell:8bV-Aa-zHf:image" imagePosition="only" alignment="left" lineBreakMode="truncatingTail" refusesFirstResponder="YES" imageScaling="proportionallyUpOrDown" inset="2" pullsDown="YES" arrowPosition="noArrow" altersStateOfSelectedItem="NO" id="CNs-lh-urM" userLabel="Disk1 Pop Up Button Cell">
                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                     <font key="font" metaFont="menu"/>
                                                     <menu key="menu" id="N33-K0-nba" userLabel="Disk1 Menu">
@@ -2000,7 +2000,7 @@ Gw
                                             </popUpButton>
                                             <popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="QDr-Cp-9QQ" userLabel="Disk2 Button">
                                                 <rect key="frame" x="0.0" y="0.0" width="104" height="99"/>
-                                                <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">
+                                                <popUpButtonCell key="cell" type="bevel" bezelStyle="regularSquare" image="popUpButtonCell:8bV-Aa-zHf: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">
@@ -139131,7 +139131,7 @@ BQB9EQcAfREJAH0RCwB9ERQAfREZAH0RHwB9EScAfREpAH0RKwB9ES0AfREvAH0imwB9IqAAfSKtAH0i
 sAB9Ir0AfSLCAH0iygB9Is0AfSLSAH0i2gAAAAAAAAQBAAAAAAAAAFAAAAAAAAAAAAAAAAAAfSLdA
 </mutableData>
         </image>
-        <image name="popUpButtonCell:CNs-lh-urM:image" width="1" height="1">
+        <image name="popUpButtonCell:8bV-Aa-zHf:image" width="1" height="1">
             <mutableData key="keyedArchiveRepresentation">
 YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05T
 S2V5ZWRBcmNoaXZlctEICVRyb290gAGvEBcLDBkaIRQmKisyNTo9PkNGR0pUXF1hZFUkbnVsbNYNDg8Q
diff --git a/src/util/disassembler.c b/src/util/disassembler.c
index f71db4f..2475d21 100644
--- a/src/util/disassembler.c
+++ b/src/util/disassembler.c
@@ -11,6 +11,7 @@
 #include <stdarg.h>
 #include "disassembler.h"
 #include "6502.h"
+#include "6502_bp.h"
 
 disassembly_t disassembly;
 unsigned long long discnt = 0;
@@ -74,7 +75,8 @@ void _disNewInstruction(void) {
 //    if ( m6502.dbgLevel.trace ) {
         memset( &disassembly, 0, sizeof(disassembly) );
         disassembly.clk = m6502.clktime + m6502.clkfrm;
-        snprintf(disassembly.addr, 5, "%04X ", m6502.PC);
+        disassembly.addr = m6502.PC;
+        snprintf(disassembly.hexAddr, 5, "%04X ", m6502.PC);
         disassembly.pOpcode = disassembly.opcode;
         disassembly.opcode[0] = '\0';
         disassembly.inst[0] = '\0';
@@ -172,11 +174,12 @@ void printDisassembly( FILE * f ) {
 const char * disassemblyLine(_Bool highlight) {
     static char line[256];
 
-    snprintf( line, sizeof(line), "%s: %-11s%-4s%s",
-         disassembly.addr,
-         disassembly.opcode,
-         disassembly.inst,
-         disassembly.oper
+    snprintf( line, sizeof(line), "%s %s: %-11s%-4s%s",
+        m6502_dbg_bp_is_exists(disassembly.addr) ? "*" : " ",
+        disassembly.hexAddr,
+        disassembly.opcode,
+        disassembly.inst,
+        disassembly.oper
     );
 
     if (highlight) {
diff --git a/src/util/disassembler.h b/src/util/disassembler.h
index 4f20afb..be0f6f0 100644
--- a/src/util/disassembler.h
+++ b/src/util/disassembler.h
@@ -36,7 +36,8 @@
 typedef struct disassembly_s {
     uint64_t clk;                   // clock time
     uint8_t op;                     // opcode
-    char addr[DISASS_ADDR_LEN];     // 4 digits + \0
+    uint16_t addr;
+    char hexAddr[DISASS_ADDR_LEN];     // 4 digits + \0
     char opcode[DISASS_OPCODE_LEN]; // max 4 bytes * (2 digits + 1 space) + \0
     char * pOpcode;                 // pointer for opcode string builder
     char inst[DISASS_INST_LEN];     // 3 char (unknown instr? -- give it 6 chars) + \0