diff --git a/pkg/api/index.go b/pkg/api/index.go
index aef0bc98fb1..d8c378b9059 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -235,12 +235,19 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
 					},
 				},
 				{
-					Text:        "Users",
+					Text:        "Members",
 					Id:          "users",
-					Description: "Manage users & user groups",
-					Icon:        "fa fa-fw fa-users",
+					Description: "Manage org members",
+					Icon:        "icon-gf icon-gf-users",
 					Url:         setting.AppSubUrl + "/org/users",
 				},
+				{
+					Text:        "Groups",
+					Id:          "users",
+					Description: "Manage org groups",
+					Icon:        "fa fa-fw fa-users",
+					Url:         setting.AppSubUrl + "/org/user-groups",
+				},
 				{
 					Text:        "API Keys",
 					Id:          "apikeys",
diff --git a/pkg/api/user.go b/pkg/api/user.go
index 60ed1609987..9a041d30272 100644
--- a/pkg/api/user.go
+++ b/pkg/api/user.go
@@ -1,6 +1,7 @@
 package api
 
 import (
+	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/middleware"
 	m "github.com/grafana/grafana/pkg/models"
@@ -247,6 +248,10 @@ func searchUser(c *middleware.Context) (*m.SearchUsersQuery, error) {
 		return nil, err
 	}
 
+	for _, user := range query.Result.Users {
+		user.AvatarUrl = dtos.GetGravatarUrl(user.Email)
+	}
+
 	query.Result.Page = page
 	query.Result.PerPage = perPage
 
diff --git a/pkg/models/user.go b/pkg/models/user.go
index bb12bc0038d..c6804a62514 100644
--- a/pkg/models/user.go
+++ b/pkg/models/user.go
@@ -197,6 +197,7 @@ type UserSearchHitDTO struct {
 	Name          string    `json:"name"`
 	Login         string    `json:"login"`
 	Email         string    `json:"email"`
+	AvatarUrl     string    `json:"avatarUrl"`
 	IsAdmin       bool      `json:"isAdmin"`
 	LastSeenAt    time.Time `json:"lastSeenAt"`
 	LastSeenAtAge string    `json:"lastSeenAtAge"`
diff --git a/public/app/features/admin/partials/users.html b/public/app/features/admin/partials/users.html
index 4b1d002d988..601e062def9 100644
--- a/public/app/features/admin/partials/users.html
+++ b/public/app/features/admin/partials/users.html
@@ -21,8 +21,7 @@
     <table class="filter-table form-inline">
       <thead>
         <tr>
-          <th>Id</th>
-          <th>Name</th>
+          <th></th>
           <th>Login</th>
           <th>Email</th>
           <th>
@@ -35,8 +34,9 @@
       </thead>
       <tbody>
         <tr ng-repeat="user in ctrl.users">
-          <td>{{user.id}}</td>
-          <td>{{user.name}}</td>
+					<td class="width-4 text-center">
+						<img class="filter-table__avatar" ng-src="{{user.avatarUrl}}"></img>
+					</td>
           <td>{{user.login}}</td>
           <td>{{user.email}}</td>
           <td>
diff --git a/public/app/features/org/partials/orgUsers.html b/public/app/features/org/partials/orgUsers.html
index fe11216f30d..eeaff564327 100644
--- a/public/app/features/org/partials/orgUsers.html
+++ b/public/app/features/org/partials/orgUsers.html
@@ -2,20 +2,18 @@
 
 <div class="page-container">
 	<div class="page-header">
-		<h1>
-			<i class="{{ctrl.navModel.node.icon}}"></i>
-			{{ctrl.navModel.node.text}}
-		</h1>
+		<page-h1 model="ctrl.navModel"></page-h1>
+
+		<button class="btn btn-success" ng-click="ctrl.openAddUsersView()" ng-hide="ctrl.externalUserMngLinkUrl">
+			<i class="fa fa-plus"></i>
+			<span>{{ctrl.addUsersBtnName}}</span>
+		</button>
 
 		<div class="page-header-tabs">
-			<button class="btn btn-success" ng-click="ctrl.openAddUsersView()" ng-hide="ctrl.externalUserMngLinkUrl">
-				<i class="fa fa-plus"></i>
-        <span>{{ctrl.addUsersBtnName}}</span>
-			</button>
 
-      <a class="btn btn-inverse" ng-href="{{ctrl.externalUserMngLinkUrl}}" target="_blank" ng-if="ctrl.externalUserMngLinkUrl">
+			<a class="btn btn-inverse" ng-href="{{ctrl.externalUserMngLinkUrl}}" target="_blank" ng-if="ctrl.externalUserMngLinkUrl">
 				<i class="fa fa-external-link-square"></i>
-        {{ctrl.addUsersBtnName}}
+				{{ctrl.addUsersBtnName}}
       </a>
 
 			<ul class="gf-tabs">
@@ -24,13 +22,8 @@
 						Users ({{ctrl.users.length}})
 					</a>
 				</li>
-				<li class="gf-tabs-item">
-					<a class="gf-tabs-link" ng-click="ctrl.editor.index = 1" ng-class="{active: ctrl.editor.index === 1}">
-						Groups (0)
-					</a>
-				</li>
 				<li class="gf-tabs-item" ng-show="ctrl.pendingInvites.length">
-					<a class="gf-tabs-link" ng-click="ctrl.editor.index = 2" ng-class="{active: ctrl.editor.index === 2}">
+					<a class="gf-tabs-link" ng-click="ctrl.editor.index = 1" ng-class="{active: ctrl.editor.index === 1}">
 						Pending Invitations ({{ctrl.pendingInvites.length}})
 					</a>
 				</li>
@@ -79,7 +72,7 @@
     </table>
   </div>
 
-  <div ng-if="ctrl.editor.index === 2">
+  <div ng-if="ctrl.editor.index === 1">
     <table class="filter-table form-inline">
       <thead>
         <tr>
diff --git a/public/app/features/org/specs/user_group_details_ctrl_specs.ts b/public/app/features/org/specs/user_group_details_ctrl_specs.ts
index 7c68d678dbd..327dad7ac83 100644
--- a/public/app/features/org/specs/user_group_details_ctrl_specs.ts
+++ b/public/app/features/org/specs/user_group_details_ctrl_specs.ts
@@ -19,7 +19,8 @@ var backendSrv = {
     ctx.ctrl = $controller(UserGroupDetailsCtrl, {
       $scope: ctx.scope,
       backendSrv: backendSrv,
-      $routeParams: {id: 1}
+      $routeParams: {id: 1},
+      navModelSrv: {getNav: sinon.stub()}
     });
   }));
 
diff --git a/public/app/features/playlist/specs/playlist_edit_ctrl_specs.ts b/public/app/features/playlist/specs/playlist_edit_ctrl_specs.ts
index e27eb53e644..b2fee5d85d0 100644
--- a/public/app/features/playlist/specs/playlist_edit_ctrl_specs.ts
+++ b/public/app/features/playlist/specs/playlist_edit_ctrl_specs.ts
@@ -6,7 +6,9 @@ describe('PlaylistEditCtrl', () => {
   var ctx: any;
   beforeEach(() => {
     let navModelSrv = {
-      getPlaylistsNav: page => {},
+      getNav: () => {
+        return { breadcrumbs: [], node: {}};
+      },
     };
 
     ctx = new PlaylistEditCtrl(null, null, null, null, { current: { params: {} } }, navModelSrv);
diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss
index f81eda65f86..0f96c23a67f 100644
--- a/public/sass/components/_gf-form.scss
+++ b/public/sass/components/_gf-form.scss
@@ -1,4 +1,4 @@
-$gf-form-margin: 0.1rem;
+$gf-form-margin: 1px;
 
 .gf-form {
   margin-bottom: $gf-form-margin;
diff --git a/public/test/test-main.js b/public/test/test-main.js
index 777e9d76afb..45077bb7b98 100644
--- a/public/test/test-main.js
+++ b/public/test/test-main.js
@@ -10,6 +10,7 @@
     baseURL: '/base/',
     defaultJSExtensions: true,
     paths: {
+      'gemini-scrollbar': 'vendor/npm/gemini-scrollbar/index.js',
       'mousetrap': 'vendor/npm/mousetrap/mousetrap.js',
       'eventemitter3': 'vendor/npm/eventemitter3/index.js',
       'remarkable': 'vendor/npm/remarkable/dist/remarkable.js',
diff --git a/tasks/options/watch.js b/tasks/options/watch.js
index c3449524243..082f97fec77 100644
--- a/tasks/options/watch.js
+++ b/tasks/options/watch.js
@@ -24,6 +24,7 @@ module.exports = function(config, grunt) {
     gaze([
       config.srcDir + '/sass/**/*',
       config.srcDir + '/app/**/*',
+      config.srcDir + '/test/**/*',
       config.srcDir + '/vendor/npm/gemini-scrollbar/*.js',
     ], function(err, watcher) {