diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index 73e4daaf4..070788dc4 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -570,12 +570,12 @@ define([
     };
 
     var appToolbar = function () {
-        return h('div#toolbar.toolbar-container');
+        return h('div#cp-toolbar.cp-toolbar-container');
     };
 
     Pages['/whiteboard/'] = Pages['/whiteboard/index.html'] = function () {
         return [
-            h('div#cp-toolbar.cp-toolbar-container'),
+            appToolbar(),
             h('div#cp-app-whiteboard-canvas-area', h('canvas#cp-app-whiteboard-canvas', {
                 width: 600,
                 height: 600
@@ -680,8 +680,7 @@ define([
                         ])
                     ])
                 ])
-            ]),
-            loadingScreen()
+            ])
         ];
     };
 
diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index ad5b51195..a02badebf 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -136,7 +136,7 @@ define([
         };
 
         var $root = $t.parent();
-        $t.on('tokenfield:removetoken', function (e) {
+        $t.on('tokenfield:removetoken', function () {
             $root.find('.token-input').focus();
         });
 
@@ -186,10 +186,6 @@ define([
             UI.warn(Messages._getKey('tags_duplicate', [val]));
         });
 
-        var close = Util.once(function () {
-            var $t = $(tagger).fadeOut(150, function () { $t.remove(); });
-        });
-
         var listener;
         var close = Util.once(function (result, ev) {
             var $frame = $(tagger).fadeOut(150, function () {