diff --git a/app/assets/javascripts/app/controllers/editor.js b/app/assets/javascripts/app/controllers/editor.js
index 77bf2244c..30690f118 100644
--- a/app/assets/javascripts/app/controllers/editor.js
+++ b/app/assets/javascripts/app/controllers/editor.js
@@ -254,8 +254,11 @@ angular.module('app')
       }
     }
 
-    this.selectedMenuItem = function($event) {
-      this.showMenu = false;
+    this.selectedMenuItem = function($event, hide) {
+      if(hide) {
+        this.showMenu = false;
+      }
+      $event.stopPropagation();
     }
 
     this.deleteNote = function() {
diff --git a/app/assets/javascripts/app/controllers/notes.js b/app/assets/javascripts/app/controllers/notes.js
index 4b7376f8c..1fa4d95a0 100644
--- a/app/assets/javascripts/app/controllers/notes.js
+++ b/app/assets/javascripts/app/controllers/notes.js
@@ -40,7 +40,13 @@ angular.module('app')
     });
 
     this.loadPreferences = function() {
+      let prevSortValue = this.sortBy;
       this.sortBy = authManager.getUserPrefValue("sortBy", "created_at");
+      if(prevSortValue && prevSortValue != this.sortBy) {
+        $timeout(() => {
+          this.selectFirstNote();
+        })
+      }
       this.sortDescending = this.sortBy != "title";
 
       this.showArchived = authManager.getUserPrefValue("showArchived", false);
diff --git a/app/assets/javascripts/app/directives/views/menuRow.js b/app/assets/javascripts/app/directives/views/menuRow.js
index 20fc1653c..fe7a988f0 100644
--- a/app/assets/javascripts/app/directives/views/menuRow.js
+++ b/app/assets/javascripts/app/directives/views/menuRow.js
@@ -13,7 +13,8 @@ class MenuRow {
       buttonClass: "=",
       buttonAction: "&",
       spinnerClass: "=",
-      subRows: "="
+      subRows: "=",
+      faded: "="
     };
   }
 
diff --git a/app/assets/javascripts/app/services/authManager.js b/app/assets/javascripts/app/services/authManager.js
index db2c6a665..a20fad35b 100644
--- a/app/assets/javascripts/app/services/authManager.js
+++ b/app/assets/javascripts/app/services/authManager.js
@@ -316,7 +316,7 @@ angular.module('app')
       }
 
       this.getUserPrefValue = function(key, defaultValue) {
-        if(!this.userPreferences) { return; }
+        if(!this.userPreferences) { return defaultValue; }
         var value = this.userPreferences.getAppDataItem(key);
         return (value !== undefined && value != null) ? value : defaultValue;
       }
diff --git a/app/assets/javascripts/app/services/singletonManager.js b/app/assets/javascripts/app/services/singletonManager.js
index eec532375..4192bab7b 100644
--- a/app/assets/javascripts/app/services/singletonManager.js
+++ b/app/assets/javascripts/app/services/singletonManager.js
@@ -109,8 +109,6 @@ class SingletonManager {
             this.modelManager.setItemToBeDeleted(d);
           }
 
-          console.log("Syncing from SM");
-
           this.$rootScope.sync();
 
           // Send remaining item to callback
diff --git a/app/assets/javascripts/app/services/syncManager.js b/app/assets/javascripts/app/services/syncManager.js
index 4e44945bf..1002b9b5b 100644
--- a/app/assets/javascripts/app/services/syncManager.js
+++ b/app/assets/javascripts/app/services/syncManager.js
@@ -191,8 +191,6 @@ class SyncManager {
 
   sync(callback, options = {}) {
 
-    console.log("Sync");
-
     var allDirtyItems = this.modelManager.getDirtyItems();
 
     if(this.syncStatus.syncOpInProgress) {
diff --git a/app/assets/templates/directives/menu-row.html.haml b/app/assets/templates/directives/menu-row.html.haml
index f710800cc..7bbff5528 100644
--- a/app/assets/templates/directives/menu-row.html.haml
+++ b/app/assets/templates/directives/menu-row.html.haml
@@ -3,7 +3,7 @@
     .left
       .column{"ng-if" => "circle"}
         .circle.small{"ng-class" => "circle"}
-      .column
+      .column{"ng-class" => "{'faded' : faded}"}
         .label
           {{title}}
         .sublabel{"ng-if" => "subtitle"}
diff --git a/app/assets/templates/editor.html.haml b/app/assets/templates/editor.html.haml
index 515293b42..62c90f0a2 100644
--- a/app/assets/templates/editor.html.haml
+++ b/app/assets/templates/editor.html.haml
@@ -29,7 +29,7 @@
             .section{"ng-if" => "!ctrl.selectedEditor"}
               .header
                 %h4.title Display
-              %menu-row{"title" => "'Monospace Font'", "circle" => "ctrl.monospaceFont ? 'success' : 'default'", "ng-click" => "ctrl.selectedMenuItem($event); ctrl.toggleKey('monospaceFont')"}
+              %menu-row{"title" => "'Monospace Font'", "circle" => "ctrl.monospaceFont ? 'success' : 'default'", "ng-click" => "ctrl.selectedMenuItem($event, true); ctrl.toggleKey('monospaceFont')"}
 
         .item{"ng-click" => "ctrl.onEditorMenuClick()", "ng-class" => "{'selected' : ctrl.showEditorMenu}", "click-outside" => "ctrl.showEditorMenu = false;", "is-open" => "ctrl.showEditorMenu"}
           .label Editor
diff --git a/app/assets/templates/notes.html.haml b/app/assets/templates/notes.html.haml
index e9a62fdfc..67ac906ac 100644
--- a/app/assets/templates/notes.html.haml
+++ b/app/assets/templates/notes.html.haml
@@ -32,17 +32,16 @@
                 .header
                   %h4.title Display
 
-                %menu-row{"title" => "'Archived Notes'", "circle" => "ctrl.showArchived ? 'success' : 'danger'", "ng-click" => "ctrl.selectedMenuItem($event); ctrl.toggleKey('showArchived')"}
-                %menu-row{"title" => "'Pinned Notes'", "circle" => "ctrl.hidePinned ? 'danger' : 'success'", "ng-click" => "ctrl.selectedMenuItem($event); ctrl.toggleKey('hidePinned')"}
-
-                %menu-row{"title" => "'Note Preview'", "circle" => "ctrl.hideNotePreview ? 'danger' : 'success'", "ng-click" => "ctrl.selectedMenuItem($event); ctrl.toggleKey('hideNotePreview')"}
-                %menu-row{"title" => "'Date'", "circle" => "ctrl.hideDate ? 'danger' : 'success'", "ng-click" => "ctrl.selectedMenuItem($event); ctrl.toggleKey('hideDate')"}
-                %menu-row{"title" => "'Tags'", "circle" => "ctrl.hideTags ? 'danger' : 'success'", "ng-click" => "ctrl.selectedMenuItem($event); ctrl.toggleKey('hideTags')"}
+                %menu-row{"title" => "'Archived Notes'", "circle" => "ctrl.showArchived ? 'success' : 'danger'", "faded" => "!ctrl.showArchived", "ng-click" => "ctrl.selectedMenuItem($event); ctrl.toggleKey('showArchived')"}
+                %menu-row{"title" => "'Pinned Notes'", "circle" => "ctrl.hidePinned ? 'danger' : 'success'", "faded" => "ctrl.hidePinned", "ng-click" => "ctrl.selectedMenuItem($event); ctrl.toggleKey('hidePinned')"}
+                %menu-row{"title" => "'Note Preview'", "circle" => "ctrl.hideNotePreview ? 'danger' : 'success'", "faded" => "ctrl.hideNotePreview", "ng-click" => "ctrl.selectedMenuItem($event); ctrl.toggleKey('hideNotePreview')"}
+                %menu-row{"title" => "'Date'", "circle" => "ctrl.hideDate ? 'danger' : 'success'","faded" => "ctrl.hideDate", "ng-click" => "ctrl.selectedMenuItem($event); ctrl.toggleKey('hideDate')"}
+                %menu-row{"title" => "'Tags'", "circle" => "ctrl.hideTags ? 'danger' : 'success'","faded" => "ctrl.hideTags", "ng-click" => "ctrl.selectedMenuItem($event); ctrl.toggleKey('hideTags')"}
 
 
     .scrollable
       .infinite-scroll#notes-scrollable{"infinite-scroll" => "ctrl.paginate()", "can-load" => "true", "threshold" => "200"}
-        .note{"ng-repeat" => "note in (ctrl.sortedNotes = (ctrl.tag.notes | filter: ctrl.filterNotes | sortBy: ctrl.sortBy| limitTo:ctrl.notesToDisplay)) track by note.uuid",
+        .note{"ng-repeat" => "note in (ctrl.sortedNotes = (ctrl.tag.notes | filter: ctrl.filterNotes | sortBy: ctrl.sortBy | limitTo:ctrl.notesToDisplay)) track by note.uuid",
             "ng-click" => "ctrl.selectNote(note)", "ng-class" => "{'selected' : ctrl.selectedNote == note}"}
           %strong.red.medium{"ng-if" => "note.conflict_of"} Conflicted copy
           %strong.red.medium{"ng-if" => "note.errorDecrypting"} Error decrypting