diff --git a/src/js/control-view.js b/src/js/control-view.js
index 52d766f..7ab4729 100644
--- a/src/js/control-view.js
+++ b/src/js/control-view.js
@@ -53,7 +53,8 @@ module.exports = {
       GCodeNotFound: false,
       filesUploaded: 0,
       totalFiles: 0,
-      files_sortby: "By Date",
+      files_sortby: "By Upload Date",
+      selected_items_to_delete: [],
     };
   },
 
@@ -235,15 +236,6 @@ module.exports = {
         .filter(element => element !== "default")
         .sort();
     },
-    toggle_sorting: function () {
-      if (this.files_sortby === "By Date") {
-        this.files_sortby = "A-Z";
-      } else if (this.files_sortby === "A-Z") {
-        this.files_sortby = "Z-A";
-      } else if (this.files_sortby === "Z-A") {
-        this.files_sortby = "By Date";
-      }
-    },
   },
 
   events: {
@@ -323,6 +315,16 @@ module.exports = {
       this.$dispatch("send", msg);
     },
 
+    toggle_sorting: function () {
+      if (this.files_sortby === "By Upload Date") {
+        this.files_sortby = "A-Z";
+      } else if (this.files_sortby === "A-Z") {
+        this.files_sortby = "Z-A";
+      } else if (this.files_sortby === "Z-A") {
+        this.files_sortby = "By Upload Date";
+      }
+    },
+
     load: function () {
       const file_time = this.state.selected_time;
       const file = this.state.selected;
@@ -622,18 +624,20 @@ module.exports = {
         return;
       }
 
-      this.update_config();
+      console.log(this.selected_items_to_delete);
 
-      this.config.non_macros_list = this.config.non_macros_list.filter(item => item.file_name != this.state.selected);
-      const file_to_delete = this.config.gcode_list.find(
-        item => item.name == this.state.folder && item.type == "folder",
-      );
-      file_to_delete.files = file_to_delete.files.filter(item => item.file_name != this.state.selected);
+      // this.update_config();
 
-      if (!this.state.macros_list.find(item => item.file_name == this.state.selected)) {
-        api.delete(`file/${this.state.selected}`);
-      }
-      this.save_config(this.config);
+      // this.config.non_macros_list = this.config.non_macros_list.filter(item => item.file_name != this.state.selected);
+      // const file_to_delete = this.config.gcode_list.find(
+      //   item => item.name == this.state.folder && item.type == "folder",
+      // );
+      // file_to_delete.files = file_to_delete.files.filter(item => item.file_name != this.state.selected);
+
+      // if (!this.state.macros_list.find(item => item.file_name == this.state.selected)) {
+      //   api.delete(`file/${this.state.selected}`);
+      // }
+      // this.save_config(this.config);
       this.deleteGCode = false;
     },
 
diff --git a/src/pug/templates/control-view.pug b/src/pug/templates/control-view.pug
index 062036c..c85e198 100644
--- a/src/pug/templates/control-view.pug
+++ b/src/pug/templates/control-view.pug
@@ -322,12 +322,17 @@ script#control-view-template(type="text/x-template")
 
           message(:show.sync="deleteGCode")
             h3(slot="header") Delete G-Code?
-            p(slot="body")
+            div(slot="body")
+              p Select files to delete:
+              ul
+                li(v-for="item in gcode_files" :key="item")
+                  input(type="checkbox" :value="item" v-model="selected_items_to_delete")
+                  | {{ item }}
             div(slot="footer")
               button.pure-button(@click="deleteGCode = false") Cancel
-              button.pure-button.button-error(@click="delete_all_except_macros")
-                .fa.fa-trash
-                |  All
+              //- button.pure-button.button-error(@click="delete_all_except_macros")
+              //-   .fa.fa-trash
+              //-   |  All
               button.pure-button.button-success(@click="delete_current")
                 .fa.fa-trash
                 |  Selected
@@ -370,11 +375,11 @@ script#control-view-template(type="text/x-template")
 
             select(title="Select previously uploaded GCode programs.",
               v-model="state.selected", @change="load", :disabled="!is_ready",
-              style="max-width:100%;margin-left:5px")
+              style="max-width:300px;margin-left:5px")
               option(v-for="file in gcode_files", :value="file") {{file}}
             
             button.pure-button(@click="toggle_sorting", :disabled="!is_ready",
-              style="height:100%")
+              style="height:75%")
               | {{files_sortby}}
 
           .progress(v-if="toolpath_progress && toolpath_progress < 1",