diff --git a/src/js/macros.js b/src/js/macros.js
index 5db3d51..322b20f 100644
--- a/src/js/macros.js
+++ b/src/js/macros.js
@@ -138,7 +138,6 @@ module.exports = {
         await api.put("config/save", this.config);
         console.log("Successfully flushed");
         this.$dispatch("update");
-        this.confirmReset = false;
       } catch (error) {
         console.error("Restore Failed: ", error);
         alert("Restore failed");
diff --git a/src/pug/templates/macros.pug b/src/pug/templates/macros.pug
index bdade7e..d5e02b7 100644
--- a/src/pug/templates/macros.pug
+++ b/src/pug/templates/macros.pug
@@ -44,12 +44,13 @@ script#macros-template(type="text/x-template")
                                 input.input-name(type="text",minlength='1',maxlength='15',id="macros-name-0")
                         p.title G-Code
                         select(title="Select previously uploaded GCode programs.",
-                                @change="load", :disabled="!is_ready",
+                                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
 
                         form.gcode-file-input.file-upload
                                 input(type="file", @change="upload", :disabled="!is_ready",
@@ -75,6 +76,7 @@ script#macros-template(type="text/x-template")
 
                         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
 
                         form.gcode-file-input.file-upload
                                 input(type="file", @change="upload", :disabled="!is_ready",
@@ -100,6 +102,7 @@ script#macros-template(type="text/x-template")
 
                         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
 
                         form.gcode-file-input.file-upload
                                 input(type="file", @change="upload", :disabled="!is_ready",
@@ -125,6 +128,7 @@ script#macros-template(type="text/x-template")
 
                         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
 
                         form.gcode-file-input.file-upload
                                 input(type="file", @change="upload", :disabled="!is_ready",
@@ -150,6 +154,7 @@ script#macros-template(type="text/x-template")
 
                         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
 
                         form.gcode-file-input.file-upload
                                 input(type="file", @change="upload", :disabled="!is_ready",
@@ -175,6 +180,7 @@ script#macros-template(type="text/x-template")
 
                         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
 
                         form.gcode-file-input.file-upload
                                 input(type="file", @change="upload", :disabled="!is_ready",