diff --git a/apps/quicklaunch/app.js b/apps/quicklaunch/app.js
index e63e5d049..035e787cf 100644
--- a/apps/quicklaunch/app.js
+++ b/apps/quicklaunch/app.js
@@ -8,8 +8,6 @@
     storage.write("quicklaunch.json", settings);
   };
 
-  // l=left, r=right, u=up, d=down, t=tap.
-
   let touchHandler = (_,e) => {
     let R = Bangle.appRect;
     if (e.x < R.x || e.x > R.x2 || e.y < R.y || e.y > R.y2 ) return;
@@ -51,8 +49,8 @@
   
   // Draw app hints
   g.setFont("Vector", 11)
-    .setFontAlign(0,1,0).drawString(settings[qlTrace+"app"].name, R.x+R.w/2, R.y2)
-    .setFontAlign(0,1,1).drawString(settings[qlTrace+"app"].name, R.x, R.y+R.h/2)
-    .setFontAlign(0,-1,0).drawString(settings[qlTrace+"app"].name, R.x+R.w/2, R.y)
-    .setFontAlign(0,1,3).drawString(settings[qlTrace+"app"].name, R.x2, R.y+R.h/2);
+    .setFontAlign(0,1,3).drawString(settings[qlTrace+"lapp"].name, R.x2, R.y+R.h/2)
+    .setFontAlign(0,1,1).drawString(settings[qlTrace+"rapp"].name, R.x, R.y+R.h/2)
+    .setFontAlign(0,1,0).drawString(settings[qlTrace+"uapp"].name, R.x+R.w/2, R.y2)
+    .setFontAlign(0,-1,0).drawString(settings[qlTrace+"dapp"].name, R.x+R.w/2, R.y);
 }
diff --git a/apps/quicklaunch/boot.js b/apps/quicklaunch/boot.js
index f9a9cad97..77288fe85 100644
--- a/apps/quicklaunch/boot.js
+++ b/apps/quicklaunch/boot.js
@@ -1,5 +1,4 @@
 {
-  // TODO: Change the settings object and settings.js to match qlTrace.
   const storage = require("Storage");
   let settings = storage.readJSON("quicklaunch.json", true) || {};
 
diff --git a/apps/quicklaunch/settings.js b/apps/quicklaunch/settings.js
index 589dce6f3..517bbee22 100644
--- a/apps/quicklaunch/settings.js
+++ b/apps/quicklaunch/settings.js
@@ -22,7 +22,7 @@ let extension = {
     "type": "app",
     "sortorder": -11,
     "src": "quicklaunch.app.js"
-   }
+   };
 apps.push(extension);
 
 apps.sort((a,b)=>{
@@ -33,16 +33,13 @@ apps.sort((a,b)=>{
   return 0;
 });
 
-function findPath(key) {
-  let path = key.substring(0, key.lenght-3);
-  return path;
-}
+function findPath(key) {return key.substring(0, key.length-3);}
 
 function save(key, value) {
   let path = findPath(key);
   // If changing from extension app (to something else) remove downstream settings entries.
   if (settings[key].name == extension.name && value.name != extension.name) {
-      for (let c of [path+"lapp", path+"rapp", path+"uapp", path+"dapp", path+"tapapp"]) {
+      for (let c of [path+"lapp", path+"rapp", path+"uapp", path+"dapp", path+"tapp"]) {
         delete settings[c];
       }
     }
@@ -51,6 +48,7 @@ function save(key, value) {
   if (value.name == "Quick Launch Extension" && settings[key].name != extension.name) {
       for (let c of [path+"lapp", path+"rapp", path+"uapp", path+"dapp", path+"tapp"]) {
         settings[c] = {"name":"(none)"};
+        storage.write("quicklaunch.json",settings);
       }
     }
   
@@ -67,17 +65,18 @@ function showMainMenu() {
   };
 
   //List all selected apps
-  for (let key of settings.keys()) {
-    mainmenu[key+ ": "+settings[key].name] = function() {showSubMenu(key);};
-    }
+  for (let key of Object.keys(settings)) {
+    let keyCurrent = key;
+    mainmenu[key+ ": "+settings[key].name] = function() {showSubMenu(keyCurrent);};
+  }
 
   return E.showMenu(mainmenu);
 }
 
 function showSubMenu(key) {
-  //Left swipe menu
+  let path = findPath(key);
   var submenu = {
-    "" : { "title" : "path: "+findPath(key)},
+    "" : { "title" : "path: "+path},
     "< Back" : showMainMenu
   };