diff --git a/static/css/main.css b/static/css/main.css
index 60fc9cbb..270c85d3 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -85,4 +85,18 @@
 
   .form-label {
     padding-top:7px;
+  }
+
+  .hover {
+    visibility: visible;
+  }
+
+  .edit-button {
+    display:none;
+  }
+
+  .editable-row:hover .edit-button {
+    display : inline-block;
+    padding: 3px 6px;
+    font-size:9px;
   }
\ No newline at end of file
diff --git a/templates/users.html b/templates/users.html
index f9b1af11..98cc5c4e 100644
--- a/templates/users.html
+++ b/templates/users.html
@@ -34,11 +34,28 @@
                     </tr>
                 </thead>
                 <tbody>
-                    <tr ng-repeat="group in groups">
+                    <tr ng-repeat="group in groups" class="editable-row">
                         <td>{{group.name}}</td>
-                        <td><span ng-repeat="target in group.targets">
-                        {{target.email}}{{$last ? '' : ', '}}
-                        </span></td>
+                        <td>
+                            <span ng-repeat="target in group.targets">
+                                {{target.email}}{{$last ? '' : ', '}}
+                            </span>
+                            <div class="btn-group" style="float: right;">
+                                <button type="button" class="btn btn-primary dropdown-toggle edit-button" data-toggle="dropdown">
+                                    <span class="caret" style="border-top-color:#FFFFFF"></span>
+                                    <span class="sr-only">Toggle Dropdown</span>
+                                </button>
+                                <ul class="dropdown-menu" style="left:auto; right:0;" role="menu">
+                                    <li><a href="/settings">View</a>
+                                    </li>
+                                    <li><a href="/settings">Edit</a>
+                                    </li>
+                                    <li class="divider"></li>
+                                    <li><a href="/logout">Delete</a>
+                                    </li>
+                                </ul>
+                            </div>
+                        </td>
                         <td>{{group.modified_date | date:'medium'}}</td>
                     </tr>
                 </tbody>