diff --git a/src/pug/templates/macros.pug b/src/pug/templates/macros.pug
index a0efde5..56255f8 100644
--- a/src/pug/templates/macros.pug
+++ b/src/pug/templates/macros.pug
@@ -22,10 +22,10 @@ script#macros-template(type="text/x-template")
 
         section#content1.tab-content
                 .macros-form
-                        p.title Enter Macros 1 Name
+                        p.title Enter Macros Name
                         .input-container
                                 input.input-color(type="color",id="macros-color-0",value="#ffffff") 
-                                input.input-name(type="text",maxlength='15',id="macros-name-0")
+                                input.input-name(type="text",minlength='1',maxlength='15',id="macros-name-0")
                         p.title Select/Upload G-Code
                         select(title="Select previously uploaded GCode programs.",
                                 v-model="state.selected", @change="load", :disabled="!is_ready",
@@ -44,10 +44,10 @@ script#macros-template(type="text/x-template")
 
         section#content2.tab-content
                 .macros-form
-                        p.title Enter Macros 2 Name
+                        p.title Enter Macros Name
                         .input-container
                                 input.input-color(type="color",id="macros-color-1",value="#ffffff") 
-                                input.input-name(type="text",maxlength='15',id="macros-name-1")
+                                input.input-name(type="text",minlength='1',maxlength='15',id="macros-name-1")
                         p.title Select/Upload G-Code
                         select(title="Select previously uploaded GCode programs.",
                                 v-model="state.selected", @change="load", :disabled="!is_ready",
@@ -66,10 +66,10 @@ script#macros-template(type="text/x-template")
 
         section#content3.tab-content
                 .macros-form
-                        p.title Enter Macros 3 Name
+                        p.title Enter Macros Name
                         .input-container
                                 input.input-color(type="color",id="macros-color-2",value="#ffffff") 
-                                input.input-name(type="text",maxlength='15',id="macros-name-2")
+                                input.input-name(type="text",minlength='1',maxlength='15',id="macros-name-2")
                         p.title Select/Upload G-Code
                         select(title="Select previously uploaded GCode programs.",
                                 v-model="state.selected", @change="load", :disabled="!is_ready",
@@ -88,10 +88,10 @@ script#macros-template(type="text/x-template")
 
         section#content4.tab-content
                 .macros-form
-                        p.title Enter Macros 4 Name
+                        p.title Enter Macros Name
                         .input-container
                                 input.input-color(type="color",id="macros-color-3",value="#ffffff") 
-                                input.input-name(type="text",maxlength='15',id="macros-name-3")
+                                input.input-name(type="text",minlength='1',maxlength='15',id="macros-name-3")
                         p.title Select/Upload G-Code
                         select(title="Select previously uploaded GCode programs.",
                                 v-model="state.selected", @change="load", :disabled="!is_ready",
@@ -110,10 +110,10 @@ script#macros-template(type="text/x-template")
 
         section#content5.tab-content
                 .macros-form
-                        p.title Enter Macros 5 Name
+                        p.title Enter Macros Name
                         .input-container
                                 input.input-color(type="color",id="macros-color-4",value="#ffffff") 
-                                input.input-name(type="text",maxlength='15',id="macros-name-4")
+                                input.input-name(type="text",minlength='1',maxlength='15',id="macros-name-4")
                         p.title Select/Upload G-Code
                         select(title="Select previously uploaded GCode programs.",
                                 v-model="state.selected", @change="load", :disabled="!is_ready",
@@ -132,10 +132,10 @@ script#macros-template(type="text/x-template")
 
         section#content6.tab-content
                 .macros-form
-                        p.title Enter Macros 6 Name
+                        p.title Enter Macros Name
                         .input-container
                                 input.input-color(type="color",id="macros-color-5",value="#ffffff") 
-                                input.input-name(type="text",maxlength='15',id="macros-name-5")
+                                input.input-name(type="text",minlength='1',maxlength='15',id="macros-name-5")
                         p.title Select/Upload G-Code
                         select(title="Select previously uploaded GCode programs.",
                                 v-model="state.selected", @change="load", :disabled="!is_ready",
@@ -152,8 +152,8 @@ script#macros-template(type="text/x-template")
                         button.submit-macros(title="Save Macros",@click="saveMacros(5)",
                                 style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border-color:#add1ad;margin-top:30px") Save Macros
         
-        button.pure-button(title="Print config.", @click="printConfig",
-                                style="height:50px;width:120px;font-weight:normal;padding-top:5px") print Config
-        button.pure-button(title="Print config.", @click="flushConfig",
-                                style="height:50px;width:120px;font-weight:normal;padding-top:5px") Flush Config
+        //- button.pure-button(title="Print config.", @click="printConfig",
+        //-                         style="height:50px;width:120px;font-weight:normal;padding-top:5px") print Config
+        //- button.pure-button(title="Print config.", @click="flushConfig",
+        //-                         style="height:50px;width:120px;font-weight:normal;padding-top:5px") Flush Config