diff --git a/public/app/features/org/partials/datasources.html b/public/app/features/org/partials/datasources.html
index 6cf40deccde..3897b3ecd3d 100644
--- a/public/app/features/org/partials/datasources.html
+++ b/public/app/features/org/partials/datasources.html
@@ -62,8 +62,8 @@
 			<thead>
 				<tr>
 					<th style="width: 48px;"></th>
-					<th style="width: auto;"><strong>Name</strong></th>
-					<th style="width: auto;"><strong>Url</strong></th>
+					<th><strong>Name</strong></th>
+					<th><strong>Url</strong></th>
 					<th style="width: 60px;"></th>
 					<th style="width: 65px;"></th>
 					<th style="width: 34px;"></th>
@@ -76,10 +76,7 @@
             <label for="alert1" class="cr1"></label>
 					</td>
 					<td>
-						<span class="ellipsis">
-							<i class="fa fa-database"></i> &nbsp;
-							{{ds.name}}
-						</span>
+						<i class="fa fa-database"></i> &nbsp; {{ds.name}}
 					</td>
 					<td>
 						<span class="ellipsis">{{ds.url}}</span>
diff --git a/public/app/features/org/partials/orgUsers.html b/public/app/features/org/partials/orgUsers.html
index 355131c2dbb..3cb560bd560 100644
--- a/public/app/features/org/partials/orgUsers.html
+++ b/public/app/features/org/partials/orgUsers.html
@@ -4,7 +4,7 @@
 	</ul>
 </topnav>
 
-<div class="page-container">
+<div class="page-container" style="background: transparent; border: 0;">
 	<div class="page">
 
 		<h2>Organization users</h2>
@@ -18,21 +18,69 @@
 
 		<tabset>
 			<tab heading="Users ({{users.length}})">
-				<table class="grafana-options-table form-inline">
-					<tr>
-						<th>Login</th>
-						<th>Email</th>
-						<th>Role</th>
-						<th></th>
-					</tr>
+
+				<div class="filter-controls-filters">
+		      <div class="tight-form last">
+		        <ul class="tight-form-list">
+		          <li class="tight-form-item">Filters:</li>
+		          <li class="tight-form-item">Login</li>
+		          <li><!-- <value-select-dropdown></value-select-dropdown> --></li>
+		          <li class="tight-form-item">Role</li>
+		          <li><!-- <value-select-dropdown></value-select-dropdown> --></li>
+		          <li class="tight-form-item">
+		            <a class="pointer">
+		              <i class="fa fa-pencil"></i>
+		            </a>
+		          </li>
+		        </ul>
+		        <div class="clearfix"></div>
+		      </div>
+		    </div>
+
+		    <ul class="filter-controls-actions">
+		      <li>
+		        <div class="dropdown">
+		          <button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown">
+		            <input class="cr1" id="state-enabled" type="checkbox">
+		            <label for="state-enabled" class="cr1"></label> <span class="caret"></span>
+		          </button>
+		          <ul class="dropdown-menu" role="menu">
+		            <li><a>All</a></li>
+		          </ul>
+		        </div>
+		      </li>
+		      <li>
+		        <div class="dropdown">
+		          <button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown">
+		            Bulk Actions &nbsp; <span class="caret"></span>
+		          </button>
+		          <ul class="dropdown-menu" role="menu">
+		            <li><a>Update notifications</a></li>
+		          </ul>
+		        </div>
+		      </li>
+		      <li>
+		        <span class="filter-controls-actions-selected">0 selected, showing 1 of 1 total</span>
+		      </li>
+		    </ul>
+
+				<table class="filter-table form-inline">
+					<thead>
+						<tr>
+							<th>Login</th>
+							<th>Email</th>
+							<th>Role</th>
+							<th style="width: 34px;"></th>
+						</tr>
+					</thead>
 					<tr ng-repeat="user in users">
 						<td>{{user.login}}</td>
-						<td>{{user.email}}</td>
+						<td><span class="ellipsis">{{user.email}}</span></td>
 						<td>
 							<select type="text" ng-model="user.role" class="input-medium" ng-options="f for f in ['Viewer', 'Editor', 'Read Only Editor', 'Admin']" ng-change="updateOrgUser(user)">
 							</select>
 						</td>
-						<td style="width: 1%">
+						<td>
 							<a ng-click="removeUser(user)" class="btn btn-danger btn-mini">
 								<i class="fa fa-remove"></i>
 							</a>
diff --git a/public/less/filter-controls.less b/public/less/filter-controls.less
index f1489431a7d..287bebe3757 100644
--- a/public/less/filter-controls.less
+++ b/public/less/filter-controls.less
@@ -12,6 +12,10 @@
   margin-bottom: 40px;
 }
 
+.tab-pane > .filter-controls-filters {
+  margin-top: 20px;
+}
+
 
 
 // Actions
diff --git a/public/less/filter-table.less b/public/less/filter-table.less
index 7b9f7a47b10..765fab5662f 100644
--- a/public/less/filter-table.less
+++ b/public/less/filter-table.less
@@ -13,7 +13,7 @@
 
 .filter-table {
   width: 100%;
-  table-layout: fixed;
+  // table-layout: fixed;
   border-collapse: collapse;
 }
 
@@ -23,6 +23,7 @@
 }
 
 .filter-table th {
+  width: auto;
   padding: 10px 15px 10px 0;
   text-align: left;