diff --git a/core/modules/outside_in/css/outside_in.module.css b/core/modules/outside_in/css/outside_in.module.css
index f24309a..f9eebe0 100644
--- a/core/modules/outside_in/css/outside_in.module.css
+++ b/core/modules/outside_in/css/outside_in.module.css
@@ -92,15 +92,29 @@
 /* Change background when in edit mode an over editable item. */
 #main-canvas.js-outside-in-edit-mode .outside-in-editable:hover,
 #main-canvas.js-outside-in-edit-mode .outside-in-editable:focus {
-    background-color: rgba(0,0,0,0.1);
+  background-color: rgba(0,0,0,0.1);
 }
 
 /* Highlight editable regions in edit mode
 @tod Clean up this css.
 */
 #main-canvas.js-outside-in-edit-mode .outside-in-editable {
-    outline: -webkit-focus-ring-color auto 2px;
-    outline-color: -webkit-focus-ring-color;
-    outline-style: dashed;
-    outline-width: 1px;
+  outline: -webkit-focus-ring-color auto 2px;
+  outline-color: -webkit-focus-ring-color;
+  outline-style: dashed;
+  outline-width: 1px;
 }
+
+.toolbar .toolbar-bar .contextual-toolbar-tab.toolbar-tab {
+  float: left;
+}
+#toolbar-bar.js-outside-in-edit-mode {
+  background-color: white;
+  color: black;
+}
+#toolbar-bar.js-outside-in-edit-mode a,
+#toolbar-bar.js-outside-in-edit-mode button
+{
+  color: black;
+}
+
diff --git a/core/modules/outside_in/js/outside_in.js b/core/modules/outside_in/js/outside_in.js
index 3f9bedd..a1db6a6 100644
--- a/core/modules/outside_in/js/outside_in.js
+++ b/core/modules/outside_in/js/outside_in.js
@@ -85,7 +85,7 @@
 
   /**
    * Gets all items that should be toggled with class during edit mode.
-   * 
+   *
    * @returns {*}
    *   Items that should be toggled.
    */
diff --git a/core/modules/outside_in/outside_in.module b/core/modules/outside_in/outside_in.module
index c7d5ca8..f41b8be 100644
--- a/core/modules/outside_in/outside_in.module
+++ b/core/modules/outside_in/outside_in.module
@@ -115,6 +115,7 @@ function outside_in_preprocess_block(&$variables) {
  */
 function outside_in_toolbar_alter(&$items) {
   if (isset($items['contextual']['tab'])) {
+    $items['contextual']['#weight'] = -1000;
     $items['contextual']['#attached']['library'][] = 'outside_in/drupal.outside_in';
 
     // Set a class on items to mark whether they should be active in edit mode.