diff --git a/src/js/macros.js b/src/js/macros.js
index 5d521ad..a7cc4a0 100644
--- a/src/js/macros.js
+++ b/src/js/macros.js
@@ -18,6 +18,16 @@ module.exports = {
         "gcode-viewer": require("./gcode-viewer")
     },
     computed:{
+        mach_state: function() {
+            const cycle = this.state.cycle;
+            const state = this.state.xx;
+
+            if (state != "ESTOPPED" && (cycle == "jogging" || cycle == "homing")) {
+                return cycle.toUpperCase();
+            }
+
+            return state || "";
+        },
         is_ready: function() {
             console.log("is_ready: ",this.mach_state);
             return this.mach_state == "READY";
diff --git a/src/pug/templates/macros.pug b/src/pug/templates/macros.pug
index 45e7231..6ab4453 100644
--- a/src/pug/templates/macros.pug
+++ b/src/pug/templates/macros.pug
@@ -1,16 +1,20 @@
 script#macros-template(type="text/x-template")
   #macros
     h1 Macros Configuration
-        .macros-form
-          h3 Name
-          input.input-name(type="text",id="macros-name",value="e.g Macros 1 ")
-        .macros-form
-          h3 Select/Upload G-Code
-          button.pure-button(title="Upload a new GCode program.", @click="open",
-                    :disabled="!is_ready",style="height:100px;width:100px;font-weight:normal")
-                    .fa.fa-folder-open
-          select(title="Select previously uploaded GCode programs.",
-                    v-model="state.selected", @change="load", :disabled="!is_ready",
-                    style="max-width:100%")
-                    option(v-for="file in state.files", :value="file") {{file}}
-          gcode-viewer
+    .macros-form
+      .input-field
+        h4 Enter Macros Name
+        input.input-name(type="text",id="macros-name",value="e.g Macros 1 ")
+      .input-field
+        h4 Select Your Macros Color
+        input.input-color(type="color",id="macros-color",value="#ffffff") 
+      .input-field
+      h3 Select/Upload G-Code
+      button.pure-button(title="Upload a new GCode program.", @click="open",
+                :disabled="!is_ready",style="height:100px;width:100px;font-weight:normal")
+                .fa.fa-folder-open
+      select(title="Select previously uploaded GCode programs.",
+                v-model="state.selected", @change="load", :disabled="!is_ready",
+                style="max-width:100%")
+                option(v-for="file in state.files", :value="file") {{file}}
+    gcode-viewer
diff --git a/src/stylus/style.styl b/src/stylus/style.styl
index 866c291..7292cd7 100644
--- a/src/stylus/style.styl
+++ b/src/stylus/style.styl
@@ -1034,13 +1034,13 @@ tt.save
 .pure-form-aligned .pure-control-group label.extra
     width 8em
 
-.macros
+#macros
   padding 30px
 
   .macros-form
-    padding 10px
+    padding 50px
   
-  .input-name
+  input.input-name
     width 300px
     height 40px
     border-radius 8px
@@ -1048,9 +1048,17 @@ tt.save
     border-color #434242
     padding-left 10px
   
+  input.input-color
+    height 40px
+    width 40px
+    border-radius 2px
+  
   button
     border-radius 8px
     border-width 1px
     border-color #434242
     padding-left 10px
 
+  .input-field
+    margin-top 10px
+