diff --git a/addon/components/upload-button.hbs b/addon/components/upload-button.hbs
index c96e650..efe46cf 100644
--- a/addon/components/upload-button.hbs
+++ b/addon/components/upload-button.hbs
@@ -1,12 +1,12 @@
 <FileUpload @name={{@name}} @accept={{@accept}} @onFileAdded={{@onFileAdded}} as |queue|>
     <a tabindex={{0}} class="flex items-center px-0 mt-2 text-xs no-underline truncate cursor-pointer btn {{if @outline 'btn-outline'}} btn-{{or @type 'default'}} btn-{{or @size 'sm'}}" ...attributes>
         {{#if queue.files.length}}
-            <Spinner class="mr-1" />
+            <Spinner class="mr-2" />
             <span>
                 Uploading...
             </span>
         {{else}}
-            <FaIcon @icon={{or @uploadIcon "image"}} class="mr-1" />
+            <FaIcon @icon={{or @uploadIcon "image"}} class="mr-2" />
             <span>
                 {{or @buttonText "Upload new"}}
             </span>
diff --git a/addon/styles/layout/next.css b/addon/styles/layout/next.css
index e3ff6db..1d8bd80 100644
--- a/addon/styles/layout/next.css
+++ b/addon/styles/layout/next.css
@@ -96,6 +96,14 @@ body[data-theme='dark'] .fleetbase-next-container {
     @apply shadow-none;
 }
 
+.next-content-overlay.next-content-overlay-pos-right .next-content-overlay-panel-container {
+    @apply border-l border-gray-200 dark:border-gray-700 border-solid;
+}
+
+.next-content-overlay.next-content-overlay-pos-left .next-content-overlay-panel-container {
+    @apply border-r border-gray-200 dark:border-gray-700 border-solid;
+}
+
 .next-content-overlay.minimized .next-content-overlay-panel-container {
     @apply bg-transparent pointer-events-none;
 }
@@ -739,6 +747,7 @@ body[data-theme='dark'] .next-map-search-bar-container .next-map-search-results
     @apply flex;
 }
 
+.next-content-overlay > .next-content-overlay-panel-container > .next-content-overlay-panel .next-content-overlay-panel-body.no-padding,
 .next-content-overlay > .next-content-overlay-panel-container > .next-content-overlay-panel.orders-panel .next-content-overlay-panel-body {
     @apply px-0;
 }
@@ -1135,6 +1144,10 @@ body[data-theme='dark'] .next-content-panel-wrapper .next-content-panel-containe
     border-right: 2px transparent solid;
 }
 
+.next-content-overlay.next-content-overlay-pos-right  > .next-content-overlay-panel-container > .next-content-overlay-panel + .gutter {
+    margin-left: -10px;
+}
+
 .next-content-overlay > .next-content-overlay-panel-container > .next-content-overlay-panel + .gutter:hover,
 .next-sidebar > .next-sidebar-content + .gutter:hover {
     border-right: 2px #76a9fa solid;
diff --git a/package.json b/package.json
index 07dbf6d..52e6685 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/ember-ui",
-    "version": "0.1.8",
+    "version": "0.1.9",
     "description": "Fleetbase UI provides all the interface components, helpers, services and utilities for building a Fleetbase extension into the Console.",
     "keywords": [
         "fleetbase-ui",