diff --git a/apps/contourclock/contourclock.settings.js b/apps/contourclock/contourclock.settings.js
index 2d8f74fc6..f2a75d9b5 100644
--- a/apps/contourclock/contourclock.settings.js
+++ b/apps/contourclock/contourclock.settings.js
@@ -10,67 +10,64 @@
     settings.hideWhenLocked=false;
     require('Storage').writeJSON("myapp.json", settings);
   }
-  E.showMenu({
-    "" : { "title" : "ContourClock" },
-    "< Back" : () => back(),
-    'Widgets': {
-      value: (settings.widgets !== undefined ? settings.widgets : true),
-      onchange : v => {settings.widgets=v; require('Storage').writeJSON('contourclock.json', settings);}
-    },
-    'hide Widgets': {
-      value: (settings.hide !== undefined ? settings.hide : false),
-      onchange : v => {settings.hide=v; require('Storage').writeJSON('contourclock.json', settings);}
-    },
-    'Weekday': {
-      value: (settings.weekday !== undefined ? settings.weekday : true),
-      onchange : v => {settings.weekday=v; require('Storage').writeJSON('contourclock.json', settings);}
-    },
-    'Date': {
-      value: (settings.date !== undefined ? settings.date : true),
-      onchange : v => {settings.date=v; require('Storage').writeJSON('contourclock.json', settings);}
-    },
-    'Hide when locked': {
-      value: (settings.hideWhenLocked !== undefined ? settings.hideWhenLocked : false),
-      onchange : v => {settings.hideWhenLocked=v; require('Storage').writeJSON('contourclock.json', settings);}
-    },
-    'set Font': function() {
-      Bangle.removeAllListeners('drag');
-      Bangle.removeAllListeners('touch');
-      require("widget_utils").hide();
-      savedIndex=settings.fontIndex;
-      saveListener = setWatch(function() {          //save changes and return to settings menu
-        require('Storage').writeJSON('contourclock.json', settings);
-        Bangle.removeAllListeners('swipe');
-        Bangle.removeAllListeners('lock');
-        clearWatch(saveListener);
-        g.clear();
-        Bangle.load();
-      }, BTN, { repeat:false, edge:'falling' });
-      lockListener = Bangle.on('lock', function () { //discard changes and return to clock
-        settings.fontIndex=savedIndex;
-        require('Storage').writeJSON('contourclock.json', settings);
-        Bangle.removeAllListeners('swipe');
-        Bangle.removeAllListeners('lock');
-        clearWatch(saveListener);
-        g.clear();
-        Bangle.load();
-      });
-      swipeListener = Bangle.on('swipe', function (direction) {
-        var fontName = require('contourclock').drawClock(settings.fontIndex+direction);
-        if (fontName) {
-          settings.fontIndex+=direction;
-          g.clearRect(0,0,g.getWidth()-1,16);
-          g.setFont('6x8:2x2').setFontAlign(0,-1).drawString(fontName,g.getWidth()/2,0);
-        } else {
-          require('contourclock').drawClock(settings.fontIndex);
-        }
-      });
-      g.reset();
-      g.clear();
-      g.setFont('6x8:2x2').setFontAlign(0,-1);
-      g.drawString(require('contourclock').drawClock(settings.fontIndex),g.getWidth()/2,0);
-      g.drawString('Swipe - change',g.getWidth()/2,g.getHeight()-36);
-      g.drawString('BTN - save',g.getWidth()/2,g.getHeight()-18);
-    }
-  });
+  function mainMenu() {
+    E.showMenu({
+      "" : { "title" : "ContourClock" },
+      "< Back" : () => back(),
+      'Widgets': {
+        value: (settings.widgets !== undefined ? settings.widgets : true),
+        onchange : v => {settings.widgets=v; require('Storage').writeJSON('contourclock.json', settings);}
+      },
+      'hide Widgets': {
+        value: (settings.hide !== undefined ? settings.hide : false),
+        onchange : v => {settings.hide=v; require('Storage').writeJSON('contourclock.json', settings);}
+      },
+      'Weekday': {
+        value: (settings.weekday !== undefined ? settings.weekday : true),
+        onchange : v => {settings.weekday=v; require('Storage').writeJSON('contourclock.json', settings);}
+      },
+      'Date': {
+        value: (settings.date !== undefined ? settings.date : true),
+        onchange : v => {settings.date=v; require('Storage').writeJSON('contourclock.json', settings);}
+      },
+      'Hide when locked': {
+        value: (settings.hideWhenLocked !== undefined ? settings.hideWhenLocked : false),
+        onchange : v => {settings.hideWhenLocked=v; require('Storage').writeJSON('contourclock.json', settings);}
+      },
+      'set Font': () => fontMenu() 
+    });
+  }
+  function fontMenu() {
+    Bangle.setUI("");
+    savedIndex=settings.fontIndex;
+    saveListener = setWatch(function() {          //save changes and return to settings menu
+      require('Storage').writeJSON('contourclock.json', settings);
+      Bangle.removeAllListeners('swipe');
+      Bangle.removeAllListeners('lock');
+      mainMenu();
+    }, BTN, { repeat:false, edge:'falling' });
+    lockListener = Bangle.on('lock', function () { //discard changes and return to clock
+      settings.fontIndex=savedIndex;
+      require('Storage').writeJSON('contourclock.json', settings);
+      Bangle.removeAllListeners('swipe');
+      Bangle.removeAllListeners('lock');
+      mainMenu();
+    });
+    swipeListener = Bangle.on('swipe', function (direction) {
+      var fontName = require('contourclock').drawClock(settings.fontIndex+direction);
+      if (fontName) {
+        settings.fontIndex+=direction;
+        g.clearRect(0,g.getHeight()-36,g.getWidth()-1,g.getHeight()-36+16);
+        g.setFont('6x8:2x2').setFontAlign(0,-1).drawString(fontName,g.getWidth()/2,g.getHeight()-36);
+      } else {
+        require('contourclock').drawClock(settings.fontIndex);
+      }
+    });
+    g.reset();
+    g.clearRect(0,24,g.getWidth()-1,g.getHeight()-1);
+    g.setFont('6x8:2x2').setFontAlign(0,-1);
+    g.drawString(require('contourclock').drawClock(settings.fontIndex),g.getWidth()/2,g.getHeight()-36);
+    g.drawString('Button to save',g.getWidth()/2,g.getHeight()-18);
+  }
+  mainMenu();
 })