diff --git a/Gruntfile.js b/Gruntfile.js
index 4d31d0d..b3d5e78 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -159,7 +159,6 @@ module.exports = function(grunt) {
                         'test/unit/util/dialog-test.js',
                         'test/unit/util/connection-doctor-test.js',
                         'test/unit/util/update-handler-test.js',
-                        'test/unit/util/backbutton-handler-test.js',
                         'test/unit/util/status-display-test.js',
                         'test/unit/crypto/pgp-test.js',
                         'test/unit/crypto/crypto-test.js',
diff --git a/src/js/controller/app/about.js b/src/js/controller/app/about.js
index b5f1269..bdec213 100644
--- a/src/js/controller/app/about.js
+++ b/src/js/controller/app/about.js
@@ -2,6 +2,10 @@
 
 var AboutCtrl = function($scope, appConfig) {
 
+    //
+    // scope state
+    //
+
     $scope.state.about = {
         toggle: function(to) {
             $scope.state.lightbox = (to) ? 'about' : undefined;
@@ -15,9 +19,6 @@ var AboutCtrl = function($scope, appConfig) {
     $scope.version = appConfig.config.appVersion + ' (beta)';
     $scope.date = new Date();
 
-    //
-    // scope functions
-    //
 };
 
 module.exports = AboutCtrl;
\ No newline at end of file
diff --git a/src/js/controller/app/account.js b/src/js/controller/app/account.js
index 2e4270e..0ad4204 100644
--- a/src/js/controller/app/account.js
+++ b/src/js/controller/app/account.js
@@ -6,6 +6,10 @@ var AccountCtrl = function($scope, auth, keychain, pgp, appConfig, download, dia
         return;
     }
 
+    //
+    // scope state
+    //
+
     $scope.state.account = {
         toggle: function(to) {
             $scope.state.lightbox = (to) ? 'account' : undefined;
@@ -46,6 +50,7 @@ var AccountCtrl = function($scope, auth, keychain, pgp, appConfig, download, dia
             });
         });
     };
+
 };
 
 module.exports = AccountCtrl;
\ No newline at end of file
diff --git a/src/js/controller/app/contacts.js b/src/js/controller/app/contacts.js
index b957ca3..7286199 100644
--- a/src/js/controller/app/contacts.js
+++ b/src/js/controller/app/contacts.js
@@ -6,10 +6,13 @@
 
 var ContactsCtrl = function($scope, keychain, pgp, dialog) {
 
+    //
+    // scope state
+    //
+
     $scope.state.contacts = {
         toggle: function(to) {
             $scope.state.lightbox = (to) ? 'contacts' : undefined;
-
             $scope.listKeys();
         }
     };
@@ -93,6 +96,7 @@ var ContactsCtrl = function($scope, keychain, pgp, dialog) {
             $scope.listKeys();
         });
     };
+
 };
 
 //
diff --git a/src/js/controller/app/dialog.js b/src/js/controller/app/dialog.js
index 880c332..e9d5779 100644
--- a/src/js/controller/app/dialog.js
+++ b/src/js/controller/app/dialog.js
@@ -2,6 +2,10 @@
 
 var DialogCtrl = function($scope, dialog) {
 
+    //
+    // scope state
+    //
+
     $scope.state.dialog = {
         open: false
     };
diff --git a/src/js/controller/app/privatekey-upload.js b/src/js/controller/app/privatekey-upload.js
index eb70450..f8c8f9d 100644
--- a/src/js/controller/app/privatekey-upload.js
+++ b/src/js/controller/app/privatekey-upload.js
@@ -4,6 +4,10 @@ var util = require('crypto-lib').util;
 
 var PrivateKeyUploadCtrl = function($scope, keychain, pgp, dialog, auth) {
 
+    //
+    // scope state
+    //
+
     $scope.state.privateKeyUpload = {
         toggle: function(to) {
             // open lightbox
@@ -33,6 +37,10 @@ var PrivateKeyUploadCtrl = function($scope, keychain, pgp, dialog, auth) {
         }
     };
 
+    //
+    // scope functions
+    //
+
     $scope.checkServerForKey = function(callback) {
         var keyParams = pgp.getKeyParams();
         keychain.hasPrivateKey({