diff --git a/public/app/features/org/partials/datasources.html b/public/app/features/org/partials/datasources.html
index 4a857845a0a..45fe5143a18 100644
--- a/public/app/features/org/partials/datasources.html
+++ b/public/app/features/org/partials/datasources.html
@@ -9,53 +9,6 @@
 	<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 class="tight-form-item">URL</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>
-    -->
-
 		<div ng-if="datasources.length === 0">
 			<em>No datasources defined</em>
 		</div>
@@ -73,7 +26,9 @@
 			<tbody>
 				<tr ng-repeat="ds in datasources">
 					<td>
-						<i class="fa fa-database"></i> &nbsp; {{ds.name}}
+						<a href="datasources/edit/{{ds.id}}">
+							<i class="fa fa-database"></i> &nbsp; {{ds.name}}
+						</a>
 					</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 ea193694e19..2896a3e8fcf 100644
--- a/public/app/features/org/partials/orgUsers.html
+++ b/public/app/features/org/partials/orgUsers.html
@@ -54,20 +54,20 @@
 					<tbody ng-repeat="invite in pendingInvites">
 						<tr ng-click="invite.expanded = !invite.expanded" ng-class="{'expanded': invite.expanded}">
 							<td>{{invite.email}}</td>
-							<td ng-show="invite.name">{{invite.name}}</td>
+							<td>{{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)">
 									<i class="fa fa-clipboard"></i> Copy Invite
 								</button>
 								&nbsp;
-								<a class="pointer">
+								<button class="btn btn-inverse btn-mini">
+									Details
 									<i ng-show="!invite.expanded" class="fa fa-caret-right"></i>
 									<i ng-show="invite.expanded" class="fa fa-caret-down"></i>
-								</a>
+								</button>
 							</td>
 						</tr>
 						<tr ng-show="invite.expanded">
-							<td></td>
 							<td colspan="3">
 								<a href="{{invite.url}}">{{invite.url}}</a><br><br>
 								<button class="btn btn-inverse btn-mini">