diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtail-toolbar.js b/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtail-toolbar.js
index 8e93b8543..f2f282710 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtail-toolbar.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtail-toolbar.js
@@ -33,6 +33,7 @@
         }
       },
       _getPosition: function(event, selection) {
+        alert('here');
         var offset, position, width;
         if (!event) {
           return;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
index eacb8f86d..3ed3d268c 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
@@ -1,11 +1,14 @@
+"use strict";
+
 var halloPlugins = {
     'halloformat': {},
     'halloheadings': {formatBlocks: ["p", "h2", "h3", "h4", "h5"]},
     'hallolists': {},
     'hallohr': {},
     'halloreundo': {},
-    'hallowagtaillink': {},
+    'hallowagtaillink': {}
 };
+
 function registerHalloPlugin(name, opts) {
     halloPlugins[name] = (opts || {});
 }
@@ -197,7 +200,7 @@ function InlinePanel(opts) {
 
     self.updateMoveButtonDisabledStates = function() {
         if (opts.canOrder) {
-            forms = self.formsUl.children('li:visible');
+            var forms = self.formsUl.children('li:visible');
             forms.each(function(i) {
                 $('ul.controls .inline-child-move-up', this).toggleClass('disabled', i === 0).toggleClass('enabled', i !== 0);
                 $('ul.controls .inline-child-move-down', this).toggleClass('disabled', i === forms.length - 1).toggleClass('enabled', i != forms.length - 1);
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
index cfa028877..97b93a065 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
@@ -497,19 +497,22 @@ li.focused > .help{
 }
 
 
+/* This is specifically for model that are a generated set of checkboxes/radios */
+.model_multiple_choice_field .input li,
+.choice_field .input li{
+    label{
+        display:block;
+        width:auto;
+        float:none;
+    }
+}
+
 .fields > li{
     @include clearfix();
     padding-top:0.5em;
     padding-bottom:1.2em;
 }
 
-.field-content .input li{
-    label{
-        width:auto;
-        float:none;
-    }
-}
-
 .input{
     clear:both;
 }
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss
index 36db5559a..0e0b72454 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss
@@ -3,7 +3,6 @@
 
 .hallotoolbar{
     position:absolute;
-    left:$mobile-nice-padding;
     z-index:5;
     margin-top:4em;
     margin-left:0em;
@@ -150,6 +149,6 @@
 
 @media screen and (min-width: $breakpoint-mobile){
     .hallotoolbar{
-        left:$menu-width + $desktop-nice-padding;
+        
     }
 }
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
index 3ddb8c1f3..5848ca53b 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
@@ -16,7 +16,6 @@
     <script src="{{ STATIC_URL }}wagtailadmin/js/vendor/tag-it.js"></script>
     <script src="{{ STATIC_URL }}wagtailadmin/js/expanding_formset.js"></script>
     <script src="{{ STATIC_URL }}wagtailadmin/js/modal-workflow.js"></script>
-    <script src="{{ STATIC_URL }}wagtailadmin/js/hallo-plugins/hallo-wagtail-toolbar.js"></script>
     <script src="{{ STATIC_URL }}wagtailadmin/js/hallo-plugins/hallo-wagtaillink.js"></script>
     <script src="{{ STATIC_URL }}wagtailadmin/js/hallo-plugins/hallo-hr.js"></script>
     <script src="{{ STATIC_URL }}wagtailadmin/js/page-editor.js"></script>