diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnodepreview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnodepreview.directive.js
index a326c0f697..d98246ac42 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnodepreview.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnodepreview.directive.js
@@ -115,8 +115,7 @@
                 allowEdit: "=?",
                 onOpen: "&?",
                 onRemove: "&?",
-                onEdit: "&?",
-                editLabelKey: "=?"
+                onEdit: "&?"
             },
             link: link
         };
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
index 37bf1caec2..65d34ba693 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
@@ -41,7 +41,7 @@
 
 .umb-node-preview__name {
     color: @black;
-    margin-top: 2px;
+    margin-top: 3px;
 }
 
 .umb-node-preview__description {
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/usergrouppicker/usergrouppicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/usergrouppicker/usergrouppicker.html
index 45a9041d2b..665645ad17 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/usergrouppicker/usergrouppicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/usergrouppicker/usergrouppicker.html
@@ -38,16 +38,16 @@
                     <div class="umb-user-group-picker-list-item__permission">
                         <span>
                             <span class="bold"><localize key="user_startnode">Content start node</localize>:</span>
+                            <span ng-if="!userGroup.contentStartNode"><localize key="user_noStartNode">No start node selected</localize></span>
                             <span ng-if="userGroup.contentStartNode">{{ userGroup.contentStartNode.name }}</span>
-                            <span ng-if="!userGroup.contentStartNode">Content root</span>
                         </span>
                     </div>
                     
                     <div class="umb-user-group-picker-list-item__permission">
                         <span>
                             <span class="bold"><localize key="user_mediastartnode">Media start node</localize>:</span>
+                            <span ng-if="!userGroup.mediaStartNode"><localize key="user_noStartNode">No start node selected</localize></span>
                             <span ng-if="userGroup.mediaStartNode">{{ userGroup.mediaStartNode.name }}</span>
-                            <span ng-if="!userGroup.mediaStartNode">Media root</span>
                         </span>
                     </div>
                 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html
index 05714214aa..a06a48d43c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html
@@ -13,7 +13,7 @@
         </div>
     </div>
     <div class="umb-node-preview__actions">
-        <a class="umb-node-preview__action" title="Open" href="" ng-if="allowEdit"  ng-click="onEdit()"><localize key="{{editLabelKey}}">Edit</localize></a>
+        <a class="umb-node-preview__action" title="Open" href="" ng-if="allowEdit"  ng-click="onEdit()"><localize key="general_edit">Edit</localize></a>
         <a class="umb-node-preview__action" title="Open" href="" ng-if="allowOpen"  ng-click="onOpen()"><localize key="general_open">Open</localize></a>
         <a class="umb-node-preview__action umb-node-preview__action--red" title="Remove" href="" ng-if="allowRemove" ng-click="onRemove()"><localize key="general_remove">Remove</localize></i></a>
     <div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-group-preview.html b/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-group-preview.html
index f6c84ef361..a4efc9194c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-group-preview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-group-preview.html
@@ -17,8 +17,7 @@
             <span>
                 <span class="bold"><localize key="user_startnode">Content start node</localize>:</span>
                 <span ng-if="!contentStartNode"><localize key="user_noStartNode">No start node selected</localize></span>
-                <span ng-if="contentStartNode && contentStartNode != -1">{{ contentStartNode.name }}</span>
-                <span ng-if="contentStartNode == -1">Content root</span>
+                <span ng-if="contentStartNode">{{ contentStartNode.name }}</span>
             </span>
         </div>
         
@@ -26,8 +25,7 @@
             <span>
                 <span class="bold"><localize key="user_mediastartnode">Media start node</localize>:</span>
                 <span ng-if="!mediaStartNode"><localize key="user_noStartNode">No start node selected</localize></span>
-                <span ng-if="mediaStartNode && mediaStartNode != -1">{{ mediaStartNode.name }}</span>
-                <span ng-if="mediaStartNode == -1">Media root</span>
+                <span ng-if="mediaStartNode">{{ mediaStartNode.name }}</span>
             </span>
         </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/group.html b/src/Umbraco.Web.UI.Client/src/views/users/group.html
index 4e71fc88a6..a9df8afcd3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/group.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/group.html
@@ -52,39 +52,44 @@
                                             style="max-width: 100%;"
                                             icon="vm.userGroup.contentStartNode.icon"
                                             name="vm.userGroup.contentStartNode.name"
+                                            allow-edit="true"
                                             allow-remove="true"
+                                            on-edit="vm.openContentPicker()"
                                             on-remove="vm.clearStartNode('content')">
                                         </umb-node-preview>
 
-                                        <umb-node-preview
+                                        <a href=""
                                             ng-if="!vm.userGroup.contentStartNode"
                                             style="max-width: 100%;"
-                                            name="vm.labels.noStartNode"
-                                            allow-edit="true"
-                                            edit-label-key="'general_add'"
-                                            on-edit="vm.openContentPicker()">
-                                        </umb-node-preview>
+                                            class="umb-node-preview-add"
+                                            ng-click="vm.openContentPicker()"
+                                            prevent-default>
+                                            <localize key="general_add">Add</localize>
+                                        </a>
 
                                     </umb-control-group>
 
                                     <umb-control-group label="@user_mediastartnode" description="@user_mediastartnodehelp">
+                                        
                                         <umb-node-preview
                                             ng-if="vm.userGroup.mediaStartNode.id"
                                             style="max-width: 100%;"
                                             icon="vm.userGroup.mediaStartNode.icon"
                                             name="vm.userGroup.mediaStartNode.name"
+                                            allow-edit="true"
                                             allow-remove="true"
+                                            on-edit="vm.openMediaPicker()"
                                             on-remove="vm.clearStartNode('media')">
                                         </umb-node-preview>
 
-                                        <umb-node-preview
+                                        <a href=""
                                             ng-if="!vm.userGroup.mediaStartNode"
                                             style="max-width: 100%;"
-                                            name="vm.labels.noStartNode"
-                                            allow-edit="true"
-                                            edit-label-key="'general_add'"
-                                            on-edit="vm.openMediaPicker()">
-                                        </umb-node-preview>
+                                            class="umb-node-preview-add"
+                                            ng-click="vm.openMediaPicker()"
+                                            prevent-default>
+                                            <localize key="general_add">Add</localize>
+                                        </a>
 
                                     </umb-control-group>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
index 7bce340cbf..768a425df6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
@@ -38,10 +38,6 @@
 
             vm.loading = true;
 
-            localizationService.localize("user_noStartNode").then(function (name) {
-                vm.page.noStartNodeLabel = name;
-            });
-
             var labelKeys = [
                 "general_saving",
                 "general_cancel",
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/user.html b/src/Umbraco.Web.UI.Client/src/views/users/user.html
index a0c68dab13..5a32f9ec82 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/user.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/user.html
@@ -106,13 +106,6 @@
                       allow-remove="!vm.user.isCurrentUser"
                       on-remove="vm.removeSelectedItem($index, vm.user.startContentIds)">
                     </umb-node-preview>
-                    
-                    <umb-node-preview
-                      ng-if="vm.user.startContentIds.length === 0"
-                      style="max-width: 100%;"
-                      name="vm.page.noStartNodeLabel"
-                      allow-remove="false">
-                    </umb-node-preview>
 
                     <a href=""
                        ng-if="!vm.user.isCurrentUser"
@@ -136,13 +129,6 @@
                       on-remove="vm.removeSelectedItem($index, vm.user.startMediaIds)">
                     </umb-node-preview>
 
-                    <umb-node-preview
-                      ng-if="vm.user.startMediaIds.length === 0"
-                      style="max-width: 100%;"
-                      name="vm.page.noStartNodeLabel"
-                      allow-remove="false">
-                    </umb-node-preview>
-
                     <a href=""
                        ng-if="!vm.user.isCurrentUser"
                        style="max-width: 100%;"
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
index eb900d28e2..b783e250a5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
@@ -317,8 +317,8 @@
                                   icon="group.icon"
                                   name="group.name"
                                   sections="group.sections"
-                                  content-start-nodes="group.startNodesContent"
-                                  media-start-nodes="group.startNodesMedia"
+                                  content-start-node="group.contentStartNode"
+                                  media-start-node="group.mediaStartNode"
                                   allow-remove="true"
                                   on-remove="vm.removeSelectedUserGroup($index, vm.newUser.userGroups)">
           </umb-user-group-preview>