diff --git a/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-preview.html b/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-preview.html
index 32aa5ed1a2..014297ae51 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-preview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-preview.html
@@ -1,12 +1,11 @@
 <div class="umb-user-preview">
 
     <div class="umb-user-preview__avatar">
-        <umb-avatar
-            size="xxs"
-            color="secondary"
-            name="{{name}}"
-            img-src="{{avatars[0]}}"
-            img-srcset="{{avatars[1]}} 2x, {{avatars[2]}} 3x">
+        <umb-avatar size="xxs"
+                    color="secondary"
+                    name="{{name}}"
+                    img-src="{{avatars[0]}}"
+                    img-srcset="{{avatars[1]}} 2x, {{avatars[2]}} 3x">
         </umb-avatar>
     </div>
 
@@ -15,7 +14,6 @@
     </div>
 
     <div class="umb-user-preview__actions">
-        <a class="umb-user-preview__action umb-user-preview__action--red" title="Remove" href="" ng-if="allowRemove" ng-click="onRemove()"><localize key="general_remove">Remove</localize></a>
-    <div>
-
-</div>
\ No newline at end of file
+        <button type="button" class="umb-user-preview__action umb-user-preview__action--red btn-link" title="Remove" ng-if="allowRemove" ng-click="onRemove()"><localize key="general_remove">Remove</localize></button>
+    </div>
+</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 8333528ddd..eae6dbd75c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/group.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/group.html
@@ -60,6 +60,7 @@
                                             on-remove="vm.clearStartNode('content')">
                                         </umb-node-preview>
 
+
                                         <button type="button"
                                                 ng-if="!vm.userGroup.contentStartNode"
                                                 class="umb-node-preview-add"
@@ -67,6 +68,7 @@
                                                 ng-click="vm.openContentPicker()">
                                             <localize key="general_add">Add</localize>
                                         </button>
+
                                     </umb-control-group>
 
                                     <umb-control-group label="@user_mediastartnode" description="@user_mediastartnodehelp">
@@ -82,6 +84,7 @@
                                             on-remove="vm.clearStartNode('media')">
                                         </umb-node-preview>
 
+
                                         <button type="button"
                                                 ng-if="!vm.userGroup.mediaStartNode"
                                                 class="umb-node-preview-add"