diff --git a/public/app/features/org/partials/orgUsers.html b/public/app/features/org/partials/orgUsers.html
index 7c8c7e1dbc9..8a88cdc969c 100644
--- a/public/app/features/org/partials/orgUsers.html
+++ b/public/app/features/org/partials/orgUsers.html
@@ -44,20 +44,18 @@
 					<tr>
 						<th>Email</th>
 						<th>Name</th>
-						<th>Role</th>
-						<th>Invited on</th>
-						<th>By</th>
 						<th></th>
 					</tr>
 					<tr ng-repeat="invite in pendingInvites">
 						<td>{{invite.email}}</td>
 						<td>{{invite.name}}</td>
-						<td>{{invite.role}}</td>
-						<td>{{invite.createdOn | date:'shortDate'}}</td>
-						<td>{{invite.invitedBy}}</td>
 						<td style="width: 1%">
-							<a ng-click="removeInvite(invite)" class="btn btn-danger btn-mini">
-								<i class="fa fa-remove"></i>
+							<button class="btn btn-inverse btn-mini" data-clipboard-text="{{snapshotUrl}}" clipboard-button>
+								<i class="fa fa-clipboard"></i> Copy Invite
+							</button>
+							&nbsp;&nbsp;
+							<a class="pointer">
+								<i class="fa fa-caret-right"></i>
 							</a>
 						</td>
 					</tr>
diff --git a/public/css/less/tabs.less b/public/css/less/tabs.less
index 0938c853360..973f817af06 100644
--- a/public/css/less/tabs.less
+++ b/public/css/less/tabs.less
@@ -4,16 +4,21 @@
   padding-left: 10px;
 
 	& > li > a {
-		.border-radius(3px);
+	  color: darken(@linkColor, 20%);
+	}
+
+	li > a:hover {
+    border-bottom: none;
 	}
 
-	li > a:hover,
 	li.active > a,
 	li.active > a:focus,
 	li.active > a:hover {
+    .border-radius(3px);
 		border: @grafanaTriggerBorder;
 	  background-color: transparent;
 	  border-bottom: 1px solid @grafanaPanelBackground;
+	  color: @linkColor;
 	}
 
 	li.disabled > a {