diff --git a/src/Umbraco.Web.UI.Client/src/less/components/html/umb-expansion-panel.less b/src/Umbraco.Web.UI.Client/src/less/components/html/umb-expansion-panel.less
index 4e7f32408e..12a260a5ab 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/html/umb-expansion-panel.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/html/umb-expansion-panel.less
@@ -22,5 +22,5 @@
 
 .umb-expansion-panel__content {
     padding: 20px;
-    border-top: 1px solid @gray-8;
+    border-top: 1px solid @gray-9;
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-box.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-box.less
index 492a257b38..b6a8f060f3 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-box.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-box.less
@@ -1,16 +1,16 @@
 .umb-box {
-    border: 1px solid @gray-8;
+    background: @white;
     border-radius: 3px;
-    margin-bottom: 30px;
+    margin-bottom: 8px;
+    box-shadow: 0 1px 1px 0 rgba(0,0,0,.16);
 }
 
 .umb-box-header {
     padding: 10px 20px;
-    background-color: @gray-10;
 }
 
 .umb-box-header-title {
-    font-size: 16px;
+    font-size: 15px;
     color: @black;
     font-weight: bold;
 }
@@ -24,4 +24,5 @@
 
 .umb-box-content {
     padding: 20px;
+    border-top: 1px solid @gray-9;
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less
index d36c156596..7d86e9639c 100644
--- a/src/Umbraco.Web.UI.Client/src/less/main.less
+++ b/src/Umbraco.Web.UI.Client/src/less/main.less
@@ -128,6 +128,12 @@ h5.-black {
   border: none;
 }
 
+.umb-property:last-of-type .umb-control-group {
+  border: none;
+  margin-bottom: 0 !important;
+  padding-bottom: 0;
+}
+
 /* BLOCK MODE */
 .block-form .umb-control-group {
   border-bottom: none;
diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html b/src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html
index 686ac2ef57..90e6244e62 100644
--- a/src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html
@@ -20,33 +20,38 @@
 
 
          <umb-editor-container class="form-horizontal">
+             
+            <umb-box>
 
-            <umb-property property="properties.selectedEditor">
-                <div>
-                    <select name="selectedEditor"
-                           ng-model="content.selectedEditor"
-                           required
-                           ng-options="e.alias as e.name for e in content.availableEditors"></select>
-                    <span class="help-inline" val-msg-for="selectedEditor" val-toggle-msg="required"><localize key="general_required">Required</localize></span>
-                </div>
+                <umb-box-content>
 
-            </umb-property>
+                    <umb-property property="properties.selectedEditor">
+                        <div>
+                            <select name="selectedEditor"
+                                ng-model="content.selectedEditor"
+                                required
+                                ng-options="e.alias as e.name for e in content.availableEditors"></select>
+                            <span class="help-inline" val-msg-for="selectedEditor" val-toggle-msg="required"><localize key="general_required">Required</localize></span>
+                        </div>
 
-            <umb-property property="properties.selectedEditorId">
-                <div>{{content.selectedEditor}}</div>
-            </umb-property>
+                    </umb-property>
 
+                    <umb-property property="properties.selectedEditorId">
+                        <div>{{content.selectedEditor}}</div>
+                    </umb-property>
 
-            <umb-property
-                property="preValue"
-                ng-repeat="preValue in preValues">
+                    <umb-property
+                        property="preValue"
+                        ng-repeat="preValue in preValues">
+                        <umb-editor model="preValue" is-pre-value="true"></umb-editor>
+                    </umb-property>
+                                
+                </umb-box-content>
 
-                <umb-editor model="preValue" is-pre-value="true"></umb-editor>
-            </umb-property>
+            </umb-box>
 
          </umb-editor-container>
 
-
          <umb-editor-footer>
 
             <umb-editor-footer-content-right>