diff --git a/admin b/admin
new file mode 100644
index 0000000..845e1a5
--- /dev/null
+++ b/admin
@@ -0,0 +1,7 @@
+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/baby.img b/baby.img
deleted file mode 100644
index 50b95a1..0000000
--- a/baby.img
+++ /dev/null
@@ -1 +0,0 @@
-À ï¨ï
\ No newline at end of file
diff --git a/babysteps b/babysteps
deleted file mode 100644
index 840db65..0000000
--- a/babysteps
+++ /dev/null
@@ -1,12 +0,0 @@
-button R0 C0 F0 T" BACK " A"return"
-text T" "
-image R11 C0 L"hline.img"
-text R26 C8 F0 T"Baby Step Adjust"
-alter C88 D2 N521
-image R51 C0 L"hline.img"
-text R52 C5 F0 T"X "
-value N510 W25
-text T" Y "
-value N511 W25
-text T" Z "
-value N512 D2 W30 
diff --git a/bedlevel b/bedlevel
new file mode 100644
index 0000000..2837247
--- /dev/null
+++ b/bedlevel
@@ -0,0 +1,8 @@
+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 R49 C0 L"hline.img"
+button R51 C5 F0 T"<" A"return"
\ No newline at end of file
diff --git a/bltouch b/bltouch
deleted file mode 100644
index 1e2f806..0000000
--- a/bltouch
+++ /dev/null
@@ -1,5 +0,0 @@
-button R0 C5 F0 T"BACK " A"return"
-button R10 C5 T"DEPLOY PROBE" A"M280 P64 S10"
-button R20 C5 T"RETRACT PROBE" A"M280 P64 S90"
-button R30 C5 T"TEST PROBE" A"M280 P64 S120"
-button R40 C5 T"RESET PROBE" A"M280 P64 S160"
\ No newline at end of file
diff --git a/control b/control
deleted file mode 100644
index b5c0e8b..0000000
--- a/control
+++ /dev/null
@@ -1,7 +0,0 @@
-button R0 C5 F0 T"BACK " A"return"
-;image R11 C5 L"hline.img"
-button R10 C5 T"COOLDOWN" A"M98 P#0" L"/menu/cooldown"
-button R20 C5 T"MOTORS OFF" A"M18"
-button R30 C5 T"REBOOT MAESTRO" A"M999"
-button R40 C5 T"RUN MESH COMPENSATION" A"M98 P#0" L"/menu/meshcomp"
-button R50 C5 T"BLTOUCH MENU" A"menu bltouch"
\ No newline at end of file
diff --git a/cooldown b/cooldown
index 8bbcbb0..b594591 100644
--- a/cooldown
+++ b/cooldown
@@ -1,4 +1,4 @@
 M140 S0	
 M140 S-273.15 R-273.15
 G10 P0 S-273.15 R-273.15
-M106 S0				;Put parts cooling fan off too
\ No newline at end of file
+M106 S0 ; Fan off
\ No newline at end of file
diff --git a/d3d.img b/d3d.img
deleted file mode 100644
index 142e734..0000000
Binary files a/d3d.img and /dev/null differ
diff --git a/flowrate.img b/flowrate.img
deleted file mode 100644
index eacc76c..0000000
--- a/flowrate.img
+++ /dev/null
@@ -1 +0,0 @@
-ð€Ü”œ
\ No newline at end of file
diff --git a/heat b/heat
index 908580f..a9c89fd 100644
--- a/heat
+++ b/heat
@@ -1,34 +1,30 @@
-button R0 C0 F0 T" BACK " A"return"
-text T" "
-button R0 C64 T"COOLDOWN" A"M98 P#0" L"/menu/cooldown"
-image R11 C0 L"hline.img"
-image R13 C4 L"bed.img"
+image R2 C2 L"nozzle.img"
+value N079 F1 R0  C15 W25 H0
+alter N179 F0 R13 C14 W25 H0
+
+image R2 C47 L"bed.img"
+value N080 F1 R0  C60 W25 H0
+alter N180 F0 R13 C59 W25 H0
+
+image R2 C94 L"fan.img"
+alter N300 F0 R3 C107 H0 W26
+
+image R25 C0 L"hline.img"
+
+image R27 C4 L"bed.img"
 button C19 T"Off" A"M140 S0"
 button C45 T"50" A"M140 S50"
 button C68 T"80" A"M140 S80"
 button C87 T"90" A"M140 S90"
 button C108 T"110" V3 A"M140 S110"
-image R25 C4 L"nozzle.img"
+
+image R37 C4 L"nozzle.img"
 button C19 T"Off" A"M104 S0"
 button C41 T"180" A"M104 S180"
 button C62 T"200" A"M104 S200"
 button C83 T"210" A"M104 S210"
 button C104 T"235" A"M104 S235"
-image R37 C0 L"hline.img"
-image R39 C10 L"bed.img"
-value H2 N180 W20
-text T"/"
-value N80 W20
-image L"nozzle.img"
-value H2 N100 W20
-text T"/"
-value N0 W20
-image R50 C0 L"hline.img"
-text R52 C4 "IP Addr:"
-value H2 N530 W20
-text "."
-value H2 N531 W20
-text "."
-value H2 N532 W20
-text "."
-value H2 N533 W20
\ No newline at end of file
+
+image R49 C0 L"hline.img"
+button R51 C0 F0 T"<" A"return"
+button T" Cool Down " A"M98 P#0" L"/menu/cooldown"
\ No newline at end of file
diff --git a/heat_For_203RC1 b/heat_For_203RC1
deleted file mode 100644
index 2f1ec41..0000000
--- a/heat_For_203RC1
+++ /dev/null
@@ -1,30 +0,0 @@
-button R0 C0 F0 T" BACK " A"return"
-text T" "
-button R0 C64 T"COOLDOWN" A"M98 P#0" L"/menu/cooldown"
-image R11 C0 L"hline.img"
-image R13 C4 L"bed.img"
-button C19 T"Off" A"M140 S0"
-button C45 T"50" A"M140 S50"
-button C68 T"80" A"M140 S80"
-button C87 T"90" A"M140 S90"
-button C108 T"110" V3 A"M140 S110"
-image R25 C4 L"nozzle.img"
-button C19 T"Off" A"M104 S0"
-button C41 T"180" A"M104 S180"
-button C62 T"200" A"M104 S200"
-button C83 T"210" A"M104 S210"
-button C104 T"235" A"M104 S235"
-image R37 C0 L"hline.img"
-image R39 C10 L"bed.img"
-value H2 N180 W20
-text T"/"
-value N80 W20
-image L"nozzle.img"
-value H2 N100 W20
-text T"/"
-value N0 W20
-image R50 C0 L"hline.img"
-text R52 C4 "IP: "
-value H0 N534 W60
-text "P: "
-value H2 N535 W20
diff --git a/listFiles b/listFiles
index 5e01555..6bef202 100644
--- a/listFiles
+++ b/listFiles
@@ -1,4 +1,3 @@
-button R0 C0 F0 T" BACK " A"return"
-text T" "
-image R11 C0 L"hline.img"
-files R14 F0 N4 I"/gcodes" A"M32 #0|return"
\ No newline at end of file
+files R0 F0 N4 I"/gcodes" A"M32 #0|return"
+image R49 C0 L"hline.img"
+button R51 C0 F0 T"<" A"return"
\ No newline at end of file
diff --git a/main b/main
index f19660c..9f89934 100644
--- a/main
+++ b/main
@@ -1,60 +1,38 @@
 ; "Not printing" Menu
-;
-button R51 C0 F0 V5 T" HEAT " A"menu heat"
-button V5 T" MOVE " A"menu move"
-button V5 " CTRL " A"menu control"
-button V5 " PRINT " A"menu listFiles"
-;
-; "Printing" Menu
-;
-button R51 C0 F0 V2 T"  BABYSTEP  " A"menu babysteps"
-button V2 T"  PAUSE        " A"M25"
-;
-; "Paused" Menu
-;
-button R51 C0 F0 V6 T"  RESUME  " A"M24"
-button V6 T"  ABORT         " A"M0 H1"
-;
-image R3 C2 L"d3d.img"
-;
-image R0 C33 L"nozzle.img"
-alter R10 C16 H2 N100 W20
-text R10 C38 T"/"
-value N0 W20
-;
-;
-image R0 C73 L"bed.img"
-alter R10 H2 C55 N180 W20
-text R10 C77 T"/"
-value N80 W20
-;
-;
-image R0 C112 L"fan.img"
-alter R10 C98 H2 N300 W20
-text T"%"
-;
-image R21 C0 L"hline.img"
-;
-;
-image R35 C0 L"hline.img"
-text R37 C8 F0 T"X: "
-value N510 W25
-text T" Y: "
-value N511 W25
-text T" Z: "
-value N512 D2 W30
 image R49 C0 L"hline.img"
-;
-;
-image R25 C4 L"flowrate.img"
-alter R23 C12 H2 N400 W20
-text T"%"
-;
-;
-image R25 C48 L"speed.img"
-alter R23 C56 H2 N500 W20
-text T"%"
-;
-image R25 C92 L"baby.img"
-alter R23 C102 N521 W26 D2
-;
\ No newline at end of file
+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"
+
+; "Printing" Menu
+button R51 C2 F0 T" Tune " A"menu tune" V2
+button T" Pause " A"M25" V2 
+button T" Abort " A"M0 H1" V2
+
+; "Paused" Menu
+button R51 C0 F0 V6 T" Resume " A"M24"
+button V6 T" Abort " A"M0 H1"
+
+; Main
+image R2 C2 L"nozzle.img"
+value N079 F1 R0  C15 W25 H0
+alter N179 F0 R13 C14 W25 H0
+
+image R2 C47 L"bed.img"
+value N080 F1 R0  C60 W25 H0
+alter N180 F0 R13 C59 W25 H0
+
+image R1 C94 L"mms.img" V2
+value N539 F1 R0  C107 W25 H0 V2 ; speed actual
+value N538 F0 R13 C107 W25 H0 V2 ; speed requested
+
+image R25 C0 L"hline.img"
+
+image R27 C2 L"fan.img"
+alter N300 F0 R27 C14 H0 W26
+
+value N535 F0 R27 C49 W25 H2 V2 ; % done
+value N537 F0 R27 C89 W39 H2 V2 ; time left
+
+value N501 F0 R37 C2 V2
\ No newline at end of file
diff --git a/main_For_203RC1 b/main_For_203RC1
deleted file mode 100644
index a9f02cb..0000000
--- a/main_For_203RC1
+++ /dev/null
@@ -1,59 +0,0 @@
-; "Not printing" Menu
-;
-button R51 C0 F0 V5 T" HEAT " A"menu heat"
-button V5 T" MOVE " A"menu move"
-button V5 " CTRL " A"menu control"
-button V5 " PRINT " A"menu listFiles"
-;
-; "Printing" Menu
-;
-button R51 C0 F0 V2 T"  BABYSTEP  " A"menu babysteps"
-button V2 T"  PAUSE        " A"M25"
-;
-; "Paused" Menu
-;
-button R51 C0 F0 V6 T"  RESUME  " A"M24"
-button V6 T"  ABORT         " A"M0 H1"
-;
-image R3 C2 L"d3d.img"
-;
-image R0 C33 L"nozzle.img"
-alter R10 C16 H2 N100 W20
-text R10 C38 T"/"
-value N0 W20
-;
-;
-image R0 C73 L"bed.img"
-alter R10 H2 C55 N180 W20
-text R10 C77 T"/"
-value N80 W20
-;
-;
-image R0 C112 L"fan.img"
-alter R10 C98 H2 N300 W26
-;
-;
-image R21 C0 L"hline.img"
-;
-;
-image R35 C0 L"hline.img"
-text R37 C8 F0 T"X: "
-value N510 W25
-text T" Y: "
-value N511 W25
-text T" Z: "
-value N512 D2 W30
-image R49 C0 L"hline.img"
-;
-;
-image R25 C4 L"flowrate.img"
-alter R23 C12 H2 N400 W26
-;
-;
-image R25 C48 L"speed.img"
-alter R23 C56 H2 N500 W26
-;
-;
-image R25 C92 L"baby.img"
-alter R23 C102 N521 W26 D2
-;
\ No newline at end of file
diff --git a/meshcomp b/meshcomp
deleted file mode 100644
index 944ae57..0000000
--- a/meshcomp
+++ /dev/null
@@ -1,11 +0,0 @@
-M291 P"Homing all axes"
-G28
-M291 P"Heating bed & nozzle"
-M190 S50
-M109 S180
-M291 P"Running mesh compensation"
-G29
-M291 P"Done - turning heaters off"
-M140 S0	
-M140 S-273.15 R-273.15
-G10 P0 S-273.15 R-273.15
\ No newline at end of file
diff --git a/mms.img b/mms.img
new file mode 100644
index 0000000..6874cfb
Binary files /dev/null and b/mms.img differ
diff --git a/move b/move
index a644308..edd0a20 100644
--- a/move
+++ b/move
@@ -1,32 +1,36 @@
-button R0 C0 F0 T" BACK " A"return"
-button C32 T" HOME " A"M98 P/sys/homeall.g"
-button C64 T" PRINT " A"menu listFiles"
-image R11 C0 L"hline.img"
-text R14 C1 F0 T"X"
-button C11 T"-50 " A"G91 G1 X-50 F6000"
-button C32 T"-10 " A"G91 G1 X-10 F6000"
-button C50 T"-1 " A"G91 G1 X-1 F6000"
-button C69 T"+1 " A"G91 G1 X1 F6000"
-button C87 T"+10 " A"G91 G1 X10 F6000"
+text R0 C2 F0 T"x:"
+alter N510 D1 W26
+text C46 T"y:"
+alter N511 D1 W26
+text C88 T"z:"
+alter N512 D2 W32
+
+image R12 C0 L"hline.img"
+
+text R14 C1 F0 T"x"
+button C11 T"-50 "  A"G91 G1 X-50 F6000"
+button C32 T"-10 "  A"G91 G1 X-10 F6000"
+button C50 T" -1 "   A"G91 G1 X-1 F6000"
+button C69 T"+1 "   A"G91 G1 X1 F6000"
+button C87 T"+10 "  A"G91 G1 X10 F6000"
 button C108 T"+50 " A"G91 G1 X50 F6000"
-text R26 C1 F0 T"Y"
-button C11 T"-50 " A"G91 G1 Y-50 F6000"
-button C32 T"-10 " A"G91 G1 Y-10 F6000"
-button C50 T" -1 " A"G91 G1 Y-1 F6000"
-button C69 T"+1 " A"G91 G1 Y1 F6000"
-button C87 T"+10 " A"G91 G1 Y10 F6000"
+
+text R26 C1 F0 T"y"
+button C11 T"-50 "  A"G91 G1 Y-50 F6000"
+button C32 T"-10 "  A"G91 G1 Y-10 F6000"
+button C50 T" -1 "  A"G91 G1 Y-1 F6000"
+button C69 T"+1 "   A"G91 G1 Y1 F6000"
+button C87 T"+10 "  A"G91 G1 Y10 F6000"
 button C108 T"+50 " A"G91 G1 Y50 F6000"
-text R38 C1 F0 T"Z"
+
+text R38 C1 F0 T"z"
 button C11 T"-25 " A"G91 G1 Z-25 F6000"
-button C32 T"-5 " A"G91 G1 Z-5 F6000"
+button C32 T"-5 "  A"G91 G1 Z-5 F6000"
 button C50 T" -1 " A"G91 G1 Z-1 F6000"
-button C69 T"+1 " A"G91 G1 Z1 F6000"
-button C87 T"+5 " A"G91 G1 Z5 F6000"
-button C108 T"+25" A"G91 G1 Z25 F6000"
-image R51 C0 L"hline.img"
-text R52 C2 F0 T"X:"
-alter N510 D1 W26 H2
-text R52 C46 T"Y:"
-alter N511 D1 W26 H2
-text R52 C88 T"Z:"
-alter N512 D2 W32 H2
\ No newline at end of file
+button C69 T"+1 "  A"G91 G1 Z1 F6000"
+button C87 T"+5 "  A"G91 G1 Z5 F6000"
+button C108 T"+25 " A"G91 G1 Z25 F6000"
+
+image R49 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
diff --git a/resetprobe b/resetprobe
deleted file mode 100644
index a51459c..0000000
--- a/resetprobe
+++ /dev/null
@@ -1 +0,0 @@
-M280 P64 S160
\ No newline at end of file
diff --git a/tune b/tune
new file mode 100644
index 0000000..19a92b7
--- /dev/null
+++ b/tune
@@ -0,0 +1,11 @@
+text "Baby Step: " R0 C0
+alter N521
+
+text "Flow Rate: " R15 C0
+alter N400
+
+text "Speed: " R30 C0
+alter N500
+
+button R51 C0 F0 T"<" A"return"
+image R49 C0 L"hline.img"
\ No newline at end of file