diff --git a/src/Umbraco.Web.UI.Client/src/less/forms.less b/src/Umbraco.Web.UI.Client/src/less/forms.less
index fc4d49b75c..e29b0e22af 100644
--- a/src/Umbraco.Web.UI.Client/src/less/forms.less
+++ b/src/Umbraco.Web.UI.Client/src/less/forms.less
@@ -24,6 +24,12 @@ label.control-label {
 
 .controls-row label{padding: 0px 10px 0px 10px; vertical-align: center}
 
+
+
+//standard editor width
+.umb-editor{width: 460px;}
+
+
 //utill styll to hide child untill hover
 .hover-show{visibility: hidden;}
 *:hover > .hover-show{visibility: visible;}
diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less
index 222b4493aa..ca00e90d1d 100644
--- a/src/Umbraco.Web.UI.Client/src/less/main.less
+++ b/src/Umbraco.Web.UI.Client/src/less/main.less
@@ -147,13 +147,17 @@ div.umb-codeeditor .umb-btn-toolbar {
 }
 
 
-
-
 /* FORM GRID */
 .umb-pane {
   margin: 30px 20px;
 }
 
+.umb-control-group {
+  border-bottom: 1px solid @grayLighter;
+  padding-bottom: 30px;
+  margin-bottom: 25px !important;
+}
+
 .umb-control-group .umb-el-wrap {
   padding: 0
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/modals.less b/src/Umbraco.Web.UI.Client/src/less/modals.less
index faab7f1709..0e7ef77c62 100644
--- a/src/Umbraco.Web.UI.Client/src/less/modals.less
+++ b/src/Umbraco.Web.UI.Client/src/less/modals.less
@@ -84,6 +84,7 @@
 	transition: opacity 0.3s linear, top 0.3s ease-out;
 	height: 100% !important;
 }
+
 .umb-modal.fade.in {
 	top: 0 !important;
 	left: 100% !important;
diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index e9f7ee87a3..572660bbe6 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -1,7 +1,6 @@
 //
 // Color picker
 // --------------------------------------------------
-
 ul.color-picker li {
     padding: 2px;
     margin: 3px;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html
index 3384a18580..37e1030614 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html
@@ -1,3 +1,3 @@
-<div ng-controller="Umbraco.Editors.BooleanController">
+<div class="umb-editor umb-boolean" ng-controller="Umbraco.Editors.BooleanController">
     <input type="checkbox" ng-model="renderModel.value" id="{{model.alias}" />    
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
index 65819d3631..cfed867ae2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
@@ -1,4 +1,4 @@
-<div ng-controller="Umbraco.Editors.CheckboxListController">
+<div class="umb-editor umb-checkboxlist" ng-controller="Umbraco.Editors.CheckboxListController">
 
     <ul class="unstyled">
         <li ng-repeat="item in selectedItems">
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
index 4b6d47b459..5174b87047 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
@@ -1,4 +1,4 @@
-<div ng-controller="Umbraco.Editors.ContentPickerController" class="">
+<div ng-controller="Umbraco.Editors.ContentPickerController" class="umb-editor umb-contentpicker">
 	<ul class="nav nav-stacked">	
 		<li ng-repeat="node in renderModel">
 			<a href="#" prevent-default ng-click="remove($index)">
@@ -13,5 +13,6 @@
 				<i class="icon icon-plus"></i> Add
 			</a>
 		</li>
+		
 	</ul>
 </div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
index 25921f3c0e..bbaa8b3c23 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
@@ -1,4 +1,4 @@
-<div ng-controller="Umbraco.Editors.DatepickerController">
+<div class="umb-editor umb-datepicker" ng-controller="Umbraco.Editors.DatepickerController">
     <div class="input-append date datepicker" id="{{model.alias}}">        
         <input  name="datepicker" data-format="{{model.config.format}}" type="text" 
                 ng-model="model.value"   
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdown/dropdown.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdown/dropdown.html
index dceecd2a68..af2cdbd093 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdown/dropdown.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdown/dropdown.html
@@ -1,6 +1,7 @@
 <div ng-controller="Umbraco.Editors.DropdownController" ng-switch="model.config.multiple">
     
     <select name="dropDownList"
+        class="umb-editor umb-dropdown"
         ng-switch-default
         ng-model="model.value"
         ng-options="key as val for (key, val) in model.config.items">
@@ -8,6 +9,7 @@
     
     <!--NOTE: This ng-switch is required because ng-multiple doesn't actually support dynamic bindings with multi-select lists -->
     <select name="dropDownList"
+        class="umb-editor umb-dropdown"
         ng-switch-when="1"
         multiple
         ng-model="model.value"
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.html
index 1910e354ad..471a06f7f7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.html
@@ -1,4 +1,4 @@
-<div ng-controller="Umbraco.Editors.FileUploadController">
+<div class="umb-editor umb-fileupload" ng-controller="Umbraco.Editors.FileUploadController">
     
     <div ng-hide="clearFiles">
         <div class="file-uploader">
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.html
index a75c2e7d37..c75cc7d00d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.html
@@ -1,6 +1,9 @@
 <form ng-controller="Umbraco.Editors.FolderBrowserController" id="fileupload" 
-method="POST" enctype="multipart/form-data" 
-data-file-upload="options" data-file-upload-progress="" data-ng-class="{'fileupload-processing': processing() || loadingFiles}">
+method="POST" enctype="multipart/form-data"
+class="umb-editor umb-folderbrowser" 
+data-file-upload="options" 
+data-file-upload-progress="" 
+data-ng-class="{'fileupload-processing': processing() || loadingFiles}">
 
         <div style="height: 10px; margin: 10px 0px 10px 0px" class="umb-loader" 
         	ng-hide="active() == 0"></div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/googlemaps/googlemaps.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/googlemaps/googlemaps.html
index d660956e92..e7424bf23a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/googlemaps/googlemaps.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/googlemaps/googlemaps.html
@@ -1,3 +1,3 @@
-<div ng-controller="Umbraco.Editors.GoogleMapsController" class="">
+<div ng-controller="Umbraco.Editors.GoogleMapsController" class="umb-editor umb-googlemaps">
     <div class="" style="height: 400px;" id="{{model.alias}}_map"></div>
 </div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
index 534cc3e751..29fd896c75 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
@@ -1,3 +1,3 @@
-<div ng-controller="Umbraco.Editors.GridController" auto-scale="10">
+<div class="umb-editor umb-grid" ng-controller="Umbraco.Editors.GridController" auto-scale="10">
 	<iframe style="width: 100%; height: 100%;" src="views/propertyeditors/grid/iframe.html"></iframe>
 </div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html
index 67e9be3de5..ad5ac2d6e1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html
@@ -1,4 +1,4 @@
-<div>
+<div class="umb-editor umb-integer">
     <input name="integerField" type="text" class="umb-textstring span7 textstring"
         ng-model="model.value"
         val-regex="^\d*$"
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
index d424524ded..491ce92480 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
@@ -1,5 +1,5 @@
 
-<div class="umb-listview" ng-controller="Umbraco.Editors.ListViewController">
+<div class="umb-editor umb-listview" ng-controller="Umbraco.Editors.ListViewController">
 	<div class="row-fluid">
 		<div class="umb-sub-header">
 		    <div class="btn-group">
@@ -9,8 +9,11 @@
 		        </a>
 		        <ul class="dropdown-menu">
 		            <li ng-repeat="contentType in listViewAllowedTypes">
-		                <a href="#/content/content/edit/{{content.id}}?doctype={{contentType.alias}}&create=true">
-		                    <i class="icon-{{contentType.cssClass}}"></i> {{contentType.name}}</a>
+		                <a 
+		                	href="#/content/content/edit/{{content.id}}?doctype={{contentType.alias}}&create=true">
+		                    	<i class="icon-{{contentType.cssClass}}"></i> 
+		                    	{{contentType.name}}
+		                </a>
 		            </li>
 		        </ul>
 		    </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
index d21b95bacd..7d7a4c35d7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
@@ -1,4 +1,4 @@
-<div ng-controller="Umbraco.Editors.MediaPickerController">
+<div class="umb-editor umb-mediapicker" ng-controller="Umbraco.Editors.MediaPickerController">
 
 	<ul class="thumbnails umb-thumbnails">
 		<li class="umb-thumbnail thumbnail span2" ng-repeat="image in images">
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
index dea098a5a6..3492ac76d7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
@@ -1,4 +1,4 @@
-<div ng-controller="Umbraco.Editors.MultipleTextBoxController">
+<div class="umb-editor umb-multiple-textbox" ng-controller="Umbraco.Editors.MultipleTextBoxController">
 
     <div class="control-group" ng-repeat="item in model.value">
         <input type="text" name="item_{{$index}}" ng-model="item.value" />
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
index 3bef0f117d..c526f13b09 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
@@ -1,4 +1,4 @@
-<div>
+<div class="umb-editor umb-radiobuttons">
     <ul class="unstyled">
         <li ng-repeat="(key, val) in model.config.items">
             <label class="radio">
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/readonlyvalue/readonlyvalue.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/readonlyvalue/readonlyvalue.html
index 1ec1146875..df58ca6acc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/readonlyvalue/readonlyvalue.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/readonlyvalue/readonlyvalue.html
@@ -1,3 +1,3 @@
-<div class="umb-label" ng-controller="Umbraco.Editors.ReadOnlyValueController">
+<div class="umb-editor umb-readonlyvalue" ng-controller="Umbraco.Editors.ReadOnlyValueController">
 	{{displayvalue}}
 </div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
index d33f977fd6..51a07d5335 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
@@ -1,3 +1,3 @@
-<div ng-controller="Umbraco.Editors.RTEController" class="">
+<div ng-controller="Umbraco.Editors.RTEController" class="umb-editor umb-rte">
 	<textarea ng-model="model.value" rows="10" id="{{model.alias}}_rte"></textarea>
 </div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html
index 09b054b06e..b1df58ed91 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html
@@ -1,4 +1,4 @@
-<div ng-controller="Umbraco.Editors.TagsController" class="">
+<div ng-controller="Umbraco.Editors.TagsController" class="umb-editor umb-tags">
 	<div ng-model="model.value" id="{{model.alias}}_tags" class="tag-list">
 
 		<div class="tags">
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/templatepicker/templatepicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/templatepicker/templatepicker.html
index 53cd73a756..76c0e11ff1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/templatepicker/templatepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/templatepicker/templatepicker.html
@@ -1,4 +1,4 @@
-<div class="span7">
+<div class="umb-editor umb-templatepicker">
     <h5>TODO: Implement this picker</h5>
     <div ng-model="model.value">{{model.value | json}}</div>
 </div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
index cbea8903aa..cfe99ebccc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
@@ -1 +1 @@
-<textarea ng-model="model.value" id="{{model.alias}}" rows="10" class="umb-textarea textstring"></textarea>
\ No newline at end of file
+<textarea ng-model="model.value" id="{{model.alias}}" rows="10" class="umb-editor umb-textarea textstring"></textarea>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
index 4437cdc21b..2361896bac 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
@@ -1 +1 @@
-<input type="text" ng-model="model.value" id="{{model.alias}}" class="umb-textstring textstring" />
\ No newline at end of file
+<input type="text" ng-model="model.value" id="{{model.alias}}" class="umb-editor umb-textstring textstring" />
\ No newline at end of file