diff --git a/static/js/app/campaigns.js b/static/js/app/campaigns.js
index cf6cfacb..fcf638a3 100644
--- a/static/js/app/campaigns.js
+++ b/static/js/app/campaigns.js
@@ -25,6 +25,11 @@ function save(){
     })
 }
 
+function dismiss(){
+    $("#modal\\.flashes").empty()
+    $("#modal").modal('hide')
+}
+
 function groupAdd(name){
     groups.append({
         name: name
diff --git a/static/js/app/partials/modals/userModal.html b/static/js/app/partials/modals/userModal.html
index f3ce3747..2d1cfde2 100644
--- a/static/js/app/partials/modals/userModal.html
+++ b/static/js/app/partials/modals/userModal.html
@@ -42,7 +42,7 @@
         </table>
     </div>
     <div class="modal-footer">
-        <button type="button" class="btn btn-default" ng-click="cancel()">Cancel</button>
-        <button type="button" class="btn btn-primary" ng-click="ok(group)" data-dismiss="modal">Save Group</button>
+        <button type="button" class="btn btn-default" onclick="dismiss()">Cancel</button>
+        <button type="button" class="btn btn-primary" onclick="save()">Save Group</button>
     </div>
 </div>
diff --git a/static/js/app/users.js b/static/js/app/users.js
index 26f32171..97b9ed27 100644
--- a/static/js/app/users.js
+++ b/static/js/app/users.js
@@ -10,6 +10,7 @@ function save(){
     .success(function(data){
         successFlash("Campaign successfully launched!")
         load()
+        dismiss()
     })
     .error(function(data){
         $("#modal\\.flashes").empty().append("<div style=\"text-align:center\" class=\"alert alert-danger\">\
@@ -17,12 +18,47 @@ function save(){
     })
 }
 
+function dismiss(){
+    $("#modal\\.flashes").empty()
+    $("#modal").modal('hide')
+}
+
 function groupAdd(name){
     groups.append({
         name: name
     })
 }
 
+function edit(group){
+    if (group == "new") {
+        console.log("new")
+        group = {}
+    }
+    targets = $("#targetsTable").dataTable()
+    // Handle Addition
+    $("#targetForm").submit(function(){
+        targets.DataTable()
+        .row.add([
+            $("#firstName").val(),
+            $("#lastName").val(),
+            $("#email").val(),
+            $("#position").val(),
+            '<span><i class="fa fa-trash-o"></i></span>'
+        ])
+        .draw()
+        $("#targetForm>div>input").val('')
+        $("#firstName").focus()
+        return false
+    })
+    // Handle Deletion
+    $("#targetsTable").on("click", "span>i.fa-trash-o", function(){
+        targets.DataTable()
+        .row( $(this).parents('tr') )
+        .remove()
+        .draw();
+    })
+}
+
 function load(){
     api.groups.get()
     .success(function(groups){
diff --git a/templates/campaigns.html b/templates/campaigns.html
index 5c113b16..9501f052 100644
--- a/templates/campaigns.html
+++ b/templates/campaigns.html
@@ -27,7 +27,7 @@
     </h1>
     <div id="flashes" class="row"></div>
     <div class="row">
-        <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#campaignModal"><i class="fa fa-plus"></i> New Campaign</button>
+        <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#modal"><i class="fa fa-plus"></i> New Campaign</button>
     </div>
     &nbsp;
     <div id="emptyMessage" class="row">
@@ -74,7 +74,7 @@
     </div>
 </div>
 <!-- Modal -->
-<div class="modal fade" id="campaignModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+<div class="modal fade" id="modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
   <div class="modal-dialog" role="document">
     <div class="modal-content">
       <div class="modal-header">
diff --git a/templates/users.html b/templates/users.html
index 455a309e..eff525c8 100644
--- a/templates/users.html
+++ b/templates/users.html
@@ -27,7 +27,7 @@
     </h1>
     <div id="flashes" class="row"></div>
     <div class="row">
-        <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#groupModal"><i class="fa fa-plus"></i> New Group</button>
+        <button type="button" class="btn btn-primary" onclick="edit('new')" data-toggle="modal" data-target="#modal"><i class="fa fa-plus"></i> New Group</button>
     </div>
     &nbsp;
     <div id="emptyMessage" class="row">
@@ -76,7 +76,7 @@
     </div> -->
 </div>
 <!-- Modal -->
-<div class="modal fade" id="groupModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+<div class="modal fade" id="modal" tabindex="-1" role="dialog" aria-labelledby="modalLabel">
   <div class="modal-dialog" role="document">
     <div class="modal-content">
       <div class="modal-header">
@@ -94,29 +94,46 @@
                   <input type="file" ng-file-select="onFileSelect($files)">
               </span>
           </div>
-          <label class="control-label" for="users">Users:</label>
-          <form ng:submit="addTarget()">
-              <div class="input-group">
-                  <input type="email" class="form-control" placeholder="test@example.com" id="users" ng-model="newTarget.email" />
-                  <span class="input-group-btn">
-                      <button class="btn btn-primary"><i class="fa fa-plus"></i> Add</button>
-                  </span>
-              </div>
-          </form>
+          <div class="row">
+              <form id="targetForm">
+                  <div class="col-sm-2">
+                      <input type="text" class="form-control" placeholder="First Name" id="firstName">
+                  </div>
+                  <div class="col-sm-2">
+                      <input type="text" class="form-control" placeholder="Last Name" id="lastName">
+                  </div>
+                  <div class="col-sm-3">
+                      <input type="email" class="form-control" placeholder="Email" id="email" required>
+                  </div>
+                  <div class="col-sm-3">
+                      <input type="text" class="form-control" placeholder="Position" id="position">
+                  </div>
+                  <div class="col-sm-1">
+                      <button type="submit" class="btn btn-danger btn-lg"><i class="fa fa-plus"></i> Add</button>
+                  </div>
+              </form>
+          </div>
           <br />
-          <table ng-table="editGroupTableParams" class="table table-hover table-striped table-condensed">
+          <table id="targetsTable" class="table table-hover table-striped">
+              <thead>
+                  <tr>
+                      <th>First Name</th>
+                      <th>Last Name</th>
+                      <th>Email</th>
+                      <th>Position</th>
+                      <th></th>
               <tbody>
-                  <tr ng-repeat="target in $data" class="editable-row">
+                  <!-- <tr ng-repeat="target in $data" class="editable-row">
                       <td>target.email
-                          <span ng-click="removeTarget(target)" class="remove-row"><i class="fa fa-trash-o"></i>
+                          <span onclick="removeTarget()" class="remove-row"><i class="fa fa-trash-o"></i>
                           </span>
                       </td>
-                  </tr>
+                  </tr> -->
               </tbody>
           </table>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+        <button type="button" class="btn btn-default" onclick="dismiss()">Close</button>
         <button type="button" class="btn btn-primary" onclick="save()">Save changes</button>
       </div>
     </div>