diff --git a/src/js/macros.js b/src/js/macros.js
index 322b20f..4eb0189 100644
--- a/src/js/macros.js
+++ b/src/js/macros.js
@@ -134,6 +134,7 @@ module.exports = {
           gcode_file_time: 0,
         },
       ];
+      this.confirmReset=false;
       try {
         await api.put("config/save", this.config);
         console.log("Successfully flushed");
diff --git a/src/pug/templates/macros.pug b/src/pug/templates/macros.pug
index d5e02b7..dfff9df 100644
--- a/src/pug/templates/macros.pug
+++ b/src/pug/templates/macros.pug
@@ -43,11 +43,6 @@ script#macros-template(type="text/x-template")
                                 input.input-color(type="color",id="macros-color-0",value="#ffffff") 
                                 input.input-name(type="text",minlength='1',maxlength='15',id="macros-name-0")
                         p.title G-Code
-                        select(title="Select previously uploaded GCode programs.",
-                                v-model="state.selected",@change="load", :disabled="!is_ready",
-                                style="max-width:100%;height:40px;border-radius:5px")
-                                option(v-for="file in state.files", :value="file") {{file}}
-
                         button.pure-button(title="Upload a new GCode program.", @click="open",
                                 :disabled="!is_ready",style="height:40px;width:130px;font-weight:normal;border-radius:5px;margin-left:4px;background-color:#5a9ad7;color:#fff;display:flex;align-items:center;justify-content:space-around") Upload
                                 .fa.fa-upload
@@ -55,6 +50,11 @@ script#macros-template(type="text/x-template")
                         form.gcode-file-input.file-upload
                                 input(type="file", @change="upload", :disabled="!is_ready",
                                 accept=".nc,.ngc,.gcode,.gc")
+                        select(title="Select previously uploaded GCode programs.",
+                                v-model="state.selected",@change="load", :disabled="!is_ready",
+                                style="max-width:100%;height:40px;border-radius:5px")
+                                option(v-for="file in state.files", :value="file") {{file}}
+
                         br
                         gcode-viewer
                         button.submit-macros(title="Save Macros",@click="saveMacros(0)",