diff --git a/public/app/core/components/user_group_picker.ts b/public/app/core/components/user_group_picker.ts
index 3ce990047ce..d3b9b2f8ef4 100644
--- a/public/app/core/components/user_group_picker.ts
+++ b/public/app/core/components/user_group_picker.ts
@@ -24,7 +24,7 @@ export class UserGroupPickerCtrl {
     this.userGroupId = null;
 
     const userGroupSegment = this.uiSegmentSrv.newSegment({
-      value: 'Choose User Group',
+      value: 'Choose',
       selectMode: true,
       fake: true,
       cssClass: 'gf-size-auto'
diff --git a/public/app/core/components/user_picker.ts b/public/app/core/components/user_picker.ts
index 6f9cd03f641..1ee43ff3ffe 100644
--- a/public/app/core/components/user_picker.ts
+++ b/public/app/core/components/user_picker.ts
@@ -24,7 +24,7 @@ export class UserPickerCtrl {
   resetUserSegment() {
     this.userId = null;
     const userSegment = this.uiSegmentSrv.newSegment({
-      value: 'Choose User',
+      value: 'Choose',
       selectMode: true,
       fake: true,
       cssClass: 'gf-size-auto'
diff --git a/public/app/features/dashboard/acl/acl.html b/public/app/features/dashboard/acl/acl.html
index cbb3efea1f2..f779c11a6ed 100644
--- a/public/app/features/dashboard/acl/acl.html
+++ b/public/app/features/dashboard/acl/acl.html
@@ -15,7 +15,7 @@
         <user-group-picker user-group-id="ctrl.userGroupId"></user-group-picker>
       </div>
 			<div class="gf-form">
-				<span class="gf-form-label">Role</span>
+				<span class="gf-form-label">Permission</span>
 				<select class="gf-form-input gf-size-auto" ng-model="ctrl.permission" ng-options="p.value as p.text for p in ctrl.permissionTypeOptions"></select>
 			</div>
 			<div class="gf-form">
diff --git a/public/app/features/org/partials/create_user_group.html b/public/app/features/org/partials/create_user_group.html
index 4a6911fe13d..bad08b206d9 100644
--- a/public/app/features/org/partials/create_user_group.html
+++ b/public/app/features/org/partials/create_user_group.html
@@ -6,21 +6,18 @@
 		<a class="modal-header-close" ng-click="dismiss();">
 			<i class="fa fa-remove"></i>
 		</a>
+	</div>
 
-    <div class="modal-content">
-      <div class="modal-tagline p-b-2">
-        Create User Group
-      </div>
-      <form name="createUserGroupForm" class="gf-form-group">
-        <div class="gf-form-inline">
-          <div class="gf-form max-width-21">
-            <input type="text" class="gf-form-input" ng-model='ctrl.userGroupName' placeholder="Name"></input>
-          </div>
-          <div class="gf-form">
-            <button class="btn gf-form-btn btn-success" ng-click="ctrl.createUserGroup();dismiss();">Create</button>
-          </div>
-        </div>
-      </form>
-    </div>
+	<div class="modal-content">
+		<form name="createUserGroupForm" class="gf-form-group">
+			<div class="gf-form-inline">
+				<div class="gf-form max-width-21">
+					<input type="text" class="gf-form-input" ng-model='ctrl.userGroupName' placeholder="Name"></input>
+				</div>
+				<div class="gf-form">
+					<button class="btn gf-form-btn btn-success" ng-click="ctrl.createUserGroup();dismiss();">Create</button>
+				</div>
+			</div>
+		</form>
 	</div>
 </div>
diff --git a/public/app/features/org/user_groups_ctrl.ts b/public/app/features/org/user_groups_ctrl.ts
index 48dbf16e319..547d23d896f 100644
--- a/public/app/features/org/user_groups_ctrl.ts
+++ b/public/app/features/org/user_groups_ctrl.ts
@@ -71,7 +71,7 @@ export class UserGroupsCtrl {
 
     this.$scope.appEvent('show-modal', {
       src: 'public/app/features/org/partials/create_user_group.html',
-      modalClass: 'user-group-modal',
+      modalClass: 'modal--narrow',
       scope: modalScope
     });
   }