diff --git a/src/Umbraco.Web.UI.Client/src/less/panel.less b/src/Umbraco.Web.UI.Client/src/less/panel.less
index 45acb1c145..c757dcd345 100644
--- a/src/Umbraco.Web.UI.Client/src/less/panel.less
+++ b/src/Umbraco.Web.UI.Client/src/less/panel.less
@@ -33,15 +33,6 @@
     bottom: 90px;
 }
 
-.umb-panel-header h1.umb-headline-editor {
-  cursor: text;
-}
-
-.umb-headline-editor-wrapper h1.headline{
-  height: 20px; padding: 30px 0 0 20px;
-  position: relative;
-}
-
 .umb-panel-header .umb-headline, .umb-panel-header h1 {
   font-size: 18px;
   border: none;
@@ -50,7 +41,6 @@
   padding: 0;
   height: auto;
   width: 100%;
-  border-bottom: 1px dotted #f8f8f8;
 }
 
 .umb-panel-header .umb-headline:hover,.umb-panel-header .umb-headline:active  {
@@ -58,6 +48,10 @@
   color: @black
 }
 
+.umb-headline-editor-wrapper{
+  position: relative;
+}
+
 .umb-headline-editor-wrapper .help-inline{
   right: 0px;
   top: 25px;
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/edit.html b/src/Umbraco.Web.UI.Client/src/views/content/edit.html
index c4783d17e2..a6fbdbf510 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/edit.html
@@ -8,12 +8,9 @@
         <umb-header tabs="content.tabs">
 
             <div class="span7">
-                <input type="text"
-                    class="umb-headline" 
-                    localize="placeholder"
-					select-on-focus 
-                    placeholder="@placeholders_entername" 
-                    ng-model="content.name" />
+                <umb-content-name
+                    placeholder="@placeholders_entername"
+                    ng-model="content.name"/>
             </div>
 
             <div class="span5">     
diff --git a/src/Umbraco.Web.UI.Client/src/views/datatype/edit.html b/src/Umbraco.Web.UI.Client/src/views/datatype/edit.html
index 115df8503f..bd12946a19 100644
--- a/src/Umbraco.Web.UI.Client/src/views/datatype/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/datatype/edit.html
@@ -7,15 +7,13 @@
 
         <umb-header>
 
-            <div class="span4">
-                <input type="text" 
-                    class="umb-headline" 
-                    localize="placeholder" 
-                    placeholder="@placeholders_entername" 
-                    ng-model="content.name" />
+            <div class="span7">
+                <umb-content-name
+                    placeholder="@placeholders_entername"
+                    ng-model="content.name"/>
             </div>
 
-            <div class="span8">
+            <div class="span5">
                 <div class="btn-toolbar pull-right umb-btn-toolbar">
                     
                     <umb-options-menu ng-show="currentNode"
diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/umb-content-name.html b/src/Umbraco.Web.UI.Client/src/views/directives/umb-content-name.html
index 8565faf4d0..314015f91b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/directives/umb-content-name.html
+++ b/src/Umbraco.Web.UI.Client/src/views/directives/umb-content-name.html
@@ -1,18 +1,16 @@
 <ng-form name="contentNameForm">        
     <div class="umb-headline-editor-wrapper" ng-class="{'ng-invalid': contentNameForm.name.$invalid}">
         
-        <h1 ng-click="goEdit()" ng-hide="editMode">{{model}}</h1>
-        
-        <input
-            class="input-xlarge"
-        	on-blur="exitEdit()" 
-        	ng-show="editMode" 
-        	name="name" 
-        	type="text" 
-        	placeholder="{{placeholder}}" 
-        	ng-model="model" 
+        <input type="text"
+            name="name"
+            localize="placeholder" 
+            class="umb-headline" 
+            localize="placeholder"
+            select-on-focus 
+            placeholder="{{placeholder}}" 
+            ng-model="model" 
             required   
-            val-server-field="Name" />
+            val-server-field="Name"/>
 
         <span class="help-inline" val-msg-for="name" val-toggle-msg="required">Required</span>
         <span class="help-inline" val-msg-for="name" val-toggle-msg="valServerField">{{contentNameForm.name.errorMsg}}</span>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/edit.html b/src/Umbraco.Web.UI.Client/src/views/media/edit.html
index 2df792ba14..a29ca01bf2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/edit.html
@@ -6,15 +6,13 @@
     <umb-panel>  
         <umb-header tabs="content.tabs">
             
-            <div class="span4">
-                <input type="text" 
-                                    class="umb-headline" 
-                                    localize="placeholder" 
-                                    placeholder="@placeholders_entername" 
-                                    ng-model="content.name" />
-            </div>
+            <div class="span5">
+                <umb-content-name
+                    placeholder="@placeholders_entername"
+                    ng-model="content.name"/>
+           </div>
 
-            <div class="span8">
+            <div class="span5">
                 <div class="btn-toolbar pull-right umb-btn-toolbar">
                     <div class="btn-group" ng-animate="'fade'" ng-show="formStatus">
                         <p class="btn btn-link umb-status-label">{{formStatus}}</p>
@@ -24,7 +22,6 @@
                         current-node="currentNode" 
                         current-section="{{currentSection}}">                        
                     </umb-options-menu>
-
                 </div>
             </div>
         </umb-header>
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/edit.html b/src/Umbraco.Web.UI.Client/src/views/member/edit.html
index a6c59ff566..19c589d81c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/member/edit.html
@@ -6,15 +6,13 @@
     <umb-panel>   
         <umb-header tabs="content.tabs">
             
-            <div class="span4" ng-if="content.membershipScenario == 0">
-                <input type="text" 
-                    class="umb-headline" 
-                    localize="placeholder" 
-                    placeholder="@placeholders_entername" 
-                    ng-model="content.name" />
+            <div class="span7" ng-if="content.membershipScenario == 0">
+               <umb-content-name
+               placeholder="@placeholders_entername"
+               ng-model="content.name"/>
             </div>
 
-            <div class="span8">
+            <div class="span5">
                 <div class="btn-toolbar pull-right umb-btn-toolbar">
                     <div class="btn-group" ng-animate="'fade'" ng-show="formStatus">
                         <p class="btn btn-link umb-status-label">{{formStatus}}</p>