diff --git a/public/app/features/admin/partials/orgs.html b/public/app/features/admin/partials/orgs.html
index 14a9ad931a2..e03849a2338 100644
--- a/public/app/features/admin/partials/orgs.html
+++ b/public/app/features/admin/partials/orgs.html
@@ -9,68 +9,19 @@
 		<h2>
 			Organizations
 		</h2>
-
-		<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">Id</li>
-          <li><!-- <value-select-dropdown></value-select-dropdown> --></li>
-          <li class="tight-form-item">Name</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 style="width: 48px;"></th>
 					<th>Id</th>
 					<th>Name</th>
+          <th></th>
 				</tr>
 			</thead>
 			<tbody>
 				<tr ng-repeat="org in orgs">
-					<td>
-						<input class="cr1" id="alert1" type="checkbox">
-            <label for="alert1" class="cr1"></label>
-					</td>
+          <td>{{org.id}}</td>
 					<td>{{org.name}}</td>
-					<td>
+					<td class="text-right">
 						<a href="admin/orgs/edit/{{org.id}}" class="btn btn-inverse btn-small">
 							<i class="fa fa-edit"></i>
 							Edit
diff --git a/public/app/features/admin/partials/users.html b/public/app/features/admin/partials/users.html
index 7273be6079f..c7839b755e0 100644
--- a/public/app/features/admin/partials/users.html
+++ b/public/app/features/admin/partials/users.html
@@ -11,55 +11,9 @@
 			Users
 		</h2>
 
-		<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">Id</li>
-          <li><!-- <value-select-dropdown></value-select-dropdown> --></li>
-          <li class="tight-form-item">Name</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 style="width: 48px;"></th>
 					<th>Id</th>
 					<th>Name</th>
 					<th>Login</th>
@@ -70,10 +24,6 @@
 			</thead>
 			<tbody>
 				<tr ng-repeat="user in users">
-					<td>
-						<input class="cr1" id="alert1" type="checkbox">
-            <label for="alert1" class="cr1"></label>
-					</td>
 					<td>{{user.id}}</td>
 					<td>{{user.name}}</td>
 					<td>{{user.login}}</td>
diff --git a/public/app/features/org/partials/datasources.html b/public/app/features/org/partials/datasources.html
index 3897b3ecd3d..4a857845a0a 100644
--- a/public/app/features/org/partials/datasources.html
+++ b/public/app/features/org/partials/datasources.html
@@ -9,14 +9,15 @@
 	<div class="page-wide">
 		<h2>Data sources</h2>
 
+    <!--
 		<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">Name</li>
-          <li><!-- <value-select-dropdown></value-select-dropdown> --></li>
+          <li><value-select-dropdown></value-select-dropdown></li>
           <li class="tight-form-item">URL</li>
-          <li><!-- <value-select-dropdown></value-select-dropdown> --></li>
+          <li><value-select-dropdown></value-select-dropdown></li>
           <li class="tight-form-item">
             <a class="pointer">
               <i class="fa fa-pencil"></i>
@@ -53,6 +54,7 @@
         <span class="filter-controls-actions-selected">0 selected, showing 2 of 2 total</span>
       </li>
     </ul>
+    -->
 
 		<div ng-if="datasources.length === 0">
 			<em>No datasources defined</em>
@@ -61,7 +63,6 @@
 		<table class="filter-table" ng-if="datasources.length > 0">
 			<thead>
 				<tr>
-					<th style="width: 48px;"></th>
 					<th><strong>Name</strong></th>
 					<th><strong>Url</strong></th>
 					<th style="width: 60px;"></th>
@@ -71,10 +72,6 @@
 			</thead>
 			<tbody>
 				<tr ng-repeat="ds in datasources">
-					<td>
-						<input class="cr1" id="alert1" type="checkbox">
-            <label for="alert1" class="cr1"></label>
-					</td>
 					<td>
 						<i class="fa fa-database"></i> &nbsp; {{ds.name}}
 					</td>
diff --git a/public/app/features/org/partials/orgApiKeys.html b/public/app/features/org/partials/orgApiKeys.html
index cb1c13f64a1..cf1bedd7877 100644
--- a/public/app/features/org/partials/orgApiKeys.html
+++ b/public/app/features/org/partials/orgApiKeys.html
@@ -31,55 +31,9 @@
 			</ul>
 		</form>
 
-		<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">Name</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 2 of 2 total</span>
-      </li>
-    </ul>
-
 		<table class="filter-table">
 			<thead>
 				<tr>
-					<th style="width: 48px;"></th>
 					<th>Name</th>
 					<th>Role</th>
 					<th style="width: 34px;"></th>
@@ -87,10 +41,6 @@
 			</thead>
 			<tbody>
 				<tr ng-repeat="t in tokens">
-					<td>
-						<input class="cr1" id="alert1" type="checkbox">
-            <label for="alert1" class="cr1"></label>
-					</td>
 					<td>{{t.name}}</td>
 					<td>{{t.role}}</td>
 					<td>
diff --git a/public/app/features/org/partials/orgUsers.html b/public/app/features/org/partials/orgUsers.html
index dc0ad562b4f..ea193694e19 100644
--- a/public/app/features/org/partials/orgUsers.html
+++ b/public/app/features/org/partials/orgUsers.html
@@ -18,56 +18,9 @@
 
 		<tabset>
 			<tab heading="Users ({{users.length}})">
-
-				<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 style="width: 48px;"></th>
 							<th>Login</th>
 							<th>Email</th>
 							<th>Role</th>
@@ -75,10 +28,6 @@
 						</tr>
 					</thead>
 					<tr ng-repeat="user in users">
-						<td>
-							<input class="cr1" id="alert1" type="checkbox">
-	            <label for="alert1" class="cr1"></label>
-						</td>
 						<td>{{user.login}}</td>
 						<td><span class="ellipsis">{{user.email}}</span></td>
 						<td>
@@ -94,56 +43,9 @@
 				</table>
 			</tab>
 			<tab heading="Pending Invitations ({{pendingInvites.length}})">
-
-			<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">Email</li>
-		          <li><!-- <value-select-dropdown></value-select-dropdown> --></li>
-		          <li class="tight-form-item">Name</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 style="width: 48px;"></th>
 							<th>Email</th>
 							<th>Name</th>
 							<th></th>
@@ -151,14 +53,10 @@
 					</thead>
 					<tbody ng-repeat="invite in pendingInvites">
 						<tr ng-click="invite.expanded = !invite.expanded" ng-class="{'expanded': invite.expanded}">
-							<td>
-								<input class="cr1" id="alert1" type="checkbox">
-		            <label for="alert1" class="cr1"></label>
-							</td>
 							<td>{{invite.email}}</td>
 							<td ng-show="invite.name">{{invite.name}}</td>
 							<td class="text-right">
-								<button class="btn btn-inverse btn-mini " data-clipboard-text="{{invite.url}}" clipboard-button ng-click="copyInviteToClipboard($event)"
+								<button class="btn btn-inverse btn-mini " data-clipboard-text="{{invite.url}}" clipboard-button ng-click="copyInviteToClipboard($event)">
 									<i class="fa fa-clipboard"></i> Copy Invite
 								</button>
 								&nbsp;
diff --git a/public/less/filter-table.less b/public/less/filter-table.less
index 99b7a3463d8..6729b425e51 100644
--- a/public/less/filter-table.less
+++ b/public/less/filter-table.less
@@ -14,7 +14,7 @@
 .filter-table {
   width: 100%;
   border-collapse: collapse;
-  table-layout: fixed;
+  // table-layout: fixed;
 }
 
 .filter-table tr {