diff --git a/admin b/admin
deleted file mode 100644
index 845e1a5..0000000
--- a/admin
+++ /dev/null
@@ -1,7 +0,0 @@
-button R0 C5 T"Cool Down" A"M98 P#0" L"/menu/cooldown"
-button R10 C5 T"Unload Filament" A"M702"
-button R20 C5 T"Level Bed" A"menu bedlevel"
-button R30 C5 T"Motors Off" A"M18"
-button R40 C5 T"Reboot Board" A"M999"
-button R51 C5 F0 T"<" A"return"
-value N534 C47 W80 H2
\ No newline at end of file
diff --git a/bed.img b/bed.img
index 978bcd2..9ca74c8 100644
Binary files a/bed.img and b/bed.img differ
diff --git a/bedlevel b/bedlevel
index bcd4fc7..8b95a43 100644
--- a/bedlevel
+++ b/bedlevel
@@ -1,8 +1 @@
-button R20 C2 T"Start" A"M98 P#0" L"0:/macros/Bed/Start"
-button R35 C40 T"1" A"M98 P#0" L"0:/macros/Bed/Point-A"
-button R35 C75 T"2" A"M98 P#0" L"0:/macros/Bed/Point-B"
-button R2 C75 T"3" A"M98 P#0" L"0:/macros/Bed/Point-C"
-button R2 C40 T"4" A"M98 P#0" L"0:/macros/Bed/Point-D"
-button R20 C57 T"*"  A"M98 P#0" L"0:/macros/Bed/Center"
-image R50 C0 L"hline.img"
-button R51 C5 F0 T"<" A"return"
\ No newline at end of file
+G32
\ No newline at end of file
diff --git a/listFiles b/listFiles
index 992e928..52121ef 100644
--- a/listFiles
+++ b/listFiles
@@ -1,3 +1,3 @@
-files R0 F0 N4 I"/gcodes" A"M32 #0|return"
-image R50 C0 L"hline.img"
+files R3 F0 N4 I"/gcodes" A"M32 #0|return"
+;image R50 C0 L"hline.img"
 button R51 C0 F0 T"<" A"return"
\ No newline at end of file
diff --git a/macros/Bed/Center b/macros/Bed/Center
deleted file mode 100644
index a70ca5c..0000000
--- a/macros/Bed/Center
+++ /dev/null
@@ -1,4 +0,0 @@
-G90
-G1 Z10 F3000
-G1 X150 Y150
-G1 Z0 F1000
\ No newline at end of file
diff --git a/macros/Bed/Point-A b/macros/Bed/Point-A
deleted file mode 100644
index 1fbd398..0000000
--- a/macros/Bed/Point-A
+++ /dev/null
@@ -1,4 +0,0 @@
-G90
-G0 Z10 F3000
-G0 X28 Y32
-G1 Z0 F1000
\ No newline at end of file
diff --git a/macros/Bed/Point-B b/macros/Bed/Point-B
deleted file mode 100644
index e959951..0000000
--- a/macros/Bed/Point-B
+++ /dev/null
@@ -1,4 +0,0 @@
-G90
-G0 Z10 F3000
-G0 X268 Y32
-G1 Z0 F1000
\ No newline at end of file
diff --git a/macros/Bed/Point-C b/macros/Bed/Point-C
deleted file mode 100644
index 78c1b51..0000000
--- a/macros/Bed/Point-C
+++ /dev/null
@@ -1,4 +0,0 @@
-G90
-G1 Z10 F3000
-G1 X268 Y280 
-G1 Z0 F1000
\ No newline at end of file
diff --git a/macros/Bed/Point-D b/macros/Bed/Point-D
deleted file mode 100644
index 3f494bf..0000000
--- a/macros/Bed/Point-D
+++ /dev/null
@@ -1,4 +0,0 @@
-G90
-G1 Z10 F3000
-G1 X28 Y280
-G1 Z0 F1000
\ No newline at end of file
diff --git a/macros/Bed/Start b/macros/Bed/Start
deleted file mode 100644
index 7c5582d..0000000
--- a/macros/Bed/Start
+++ /dev/null
@@ -1,4 +0,0 @@
-G28
-G90
-G1 X28 Y32 F3000
-G1 Z0 F1000
\ No newline at end of file
diff --git a/main b/main
index 96cd889..ceeb3b2 100644
--- a/main
+++ b/main
@@ -1,38 +1,65 @@
-;"Not printing" Menu
-button R51 C0 F0 V5 T" Heat " A"menu heat"
-button V5 T" Move " A"menu move"
-button V5 " Admin " A"menu admin"
-button V5 " Print " A"menu listFiles"
+;---------------------------------------------------------------
+; Pre-print
+;---------------------------------------------------------------
 
-; "Printing" Menu
-button R51 C2 F0 T" Tune " A"menu tune" V2
-button T" Pause " A"M25" V2 
-button T" Abort " A"M25 M0 H1" V2
+image  V5 R12 C25 L"nozzle.img"
+image  V5 C88 L"bed.img"
 
-; "Paused" Menu
-button R51 C0 F0 V6 T" Resume " A"M24"
-button V6 T" Abort " A"M0 H1"
+value  V5 N079 R30 C12 H2 W19
+text T"/"
+alter  V5 N179 H0 W19
 
-; Main
-image R3 C0 L"nozzle.img"
-value N079 F1 R0  C17 W19 H0
-alter N179 F0 R12 C16 W19 H0
+value  V5 N080 C75 H2 W19
+text T"/"
+alter  V5 N180 H0 W19
 
-image R3 C45 L"bed.img"
-value N080 F1 R0  C64 W19 H0
-alter N180 F0 R12 C63 W19 H0
+image  V5 C1 R50 L"2buttop.img"
+image  V5 C1 R62 L"2buttop.img"
+image  V5 C1 R51 L"lbutside.img"
+image  V5 C62 R51 L"lbutside.img"
+button V5 "Print" A"menu listFiles" R51 C2 W60
 
-image R3 C90 L"mms.img" ;V2
-value N539 F1 R0  C108 W19 ;V2 ; speed actual
-value N538 F0 R12 C108 W19 ;V2 ; speed requested
+image  V5 C65 R51 L"lbutside.img"
+image  V5 C126 R51 L"lbutside.img"
+button V5 "Setup" A"menu setup" R51 C66 W60
 
-image R23 C0 L"hline.img"
 
-image R24 C0 L"blower.img"
-alter N300 F0 R26 C16 H0 W26
+;---------------------------------------------------------------
+; Printing
+;---------------------------------------------------------------
 
-value N535 F0 C57 W25 H2 V2 ; % done
-value N537 F0 C89 W39 H2 V2 ; time left
+button V4 R0 C0 A"M25" T" •• " ; pause
+image  V2 R1 C14 L"babystep.img"
+alter  V2 R0 N521 D2 ; babystep
+image  V2 R1 C52 L"speed.img"
+alter  V2 R0 N500 ; speed
+image  V2 R1 C94 L"flow.img"
+alter  V2 R0 N400 ; flow
 
-value N501 F0 R39 C0 W128 H1 V2 ; M117 messages
-image R50 C0 L"hline.img"
\ No newline at end of file
+image  V4 R17 C13 L"nozzle.img"
+image  V4 C57 L"bed.img"
+image  V4 C98 L"mms.img"
+
+value  V4 N079 R34 C0 H2 W19 ; nozzle temp
+text   V4 T"/"
+alter  V4 N179 H0 W19 ; nozzle temp set
+value  V4 N080 C43 H2 W19 ; bed temp
+text   V4 T"/"
+alter  V4 N180 H0 W19 ; bed temp set
+value  V4 N539 C86 H2 W19 ; speed actual
+text   V4 T"/"
+value  V4 N538 H0 W19 ; speed requested
+
+image  V4 R48 C0 L"blower.img"
+alter  V4 N300 F0 R51 C17 H0 W19 ; fan set
+value  V4 N535 F0 C57 W19 H1 ; % done
+value  V4 N537 F0 C88 W40 H2 ; time left
+
+;button T"." A"menu main"
+
+;---------------------------------------------------------------
+; Paused
+;---------------------------------------------------------------
+
+button V6 R0 C14 W57 F0 T" Resume " A"M24"
+button V6 W57 T" Abort " A"M0 H1"
\ No newline at end of file
diff --git a/mms.img b/mms.img
index 8185986..d41954f 100644
Binary files a/mms.img and b/mms.img differ
diff --git a/move b/move
index 63b44f4..c95eadb 100644
--- a/move
+++ b/move
@@ -1,7 +1,9 @@
 text R0 C2 F0 T"x:"
-alter N510 D1 W26
+alter N510 D0 W26
+
 text C46 T"y:"
-alter N511 D1 W26
+alter N511 D0 W26
+
 text C88 T"z:"
 alter N512 D2 W32
 
@@ -33,4 +35,7 @@ button C108 T"+25 " A"G91 G1 Z25 F6000"
 
 image R50 C0 L"hline.img"
 button R51 C0 F0 T"<" A"return"
-button T" Home All " A"M98 P/sys/homeall.g"
\ No newline at end of file
+button T" Home All " A"M98 P/sys/homeall.g"
+
+button T" Unsafe " A"M564 S0"
+button T" Safe " A"M564 S1"
\ No newline at end of file
diff --git a/tune b/tune
index 513216c..82d723d 100644
--- a/tune
+++ b/tune
@@ -1,11 +1,10 @@
-text "Baby Step: " R0 C0
+text "Baby Step: " R0 C0 F0
 alter N521 D2
 
-text "Flow Rate: " R15 C0
+text "Flow Rate: " R12 C0
 alter N400
 
-text "Speed: " R30 C0
+text "Speed: " R24 C0
 alter N500
 
-button R51 C0 F0 T"<" A"return"
-image R50 C0 L"hline.img"
\ No newline at end of file
+button R51 C0 F0 T"<" A"return"
\ No newline at end of file