diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 5678704..de412bc 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -27,4 +27,15 @@ class AdminController < ApplicationController
     end
   end
   
+  def delete_user
+    user = User.find_by_id(params[:admin_id])
+    if user && !(current_user.id == user.id)
+      user.delete
+      message = true
+    end
+    respond_to do |format|
+      format.json { render :json => { :msg => message ? "success" : "failure"} }
+    end
+  end
+  
 end
diff --git a/app/views/admin/dashboard.html.erb b/app/views/admin/dashboard.html.erb
index a36b4e4..681b95b 100644
--- a/app/views/admin/dashboard.html.erb
+++ b/app/views/admin/dashboard.html.erb
@@ -58,14 +58,8 @@ function makeActive(){
 	$('li[id="admin"]').addClass('active');
 };
 
-function openModal(id){
- var link = '/admin/'+ id +'/get_user';
- $("#editAcct").load(link);
- $("#editAcct").modal('show');
-};
-
 function loadTable(){
-	$("#userDataTable").load("/admin/"+ <%=current_user.id %> + "/get_all_users");
+	$("#userDataTable").load("/admin/"+ <%=current_user.id %> + "/get_all_users")
 };
 
 $(document).ready(
diff --git a/app/views/layouts/admin/_get_all_users.html.erb b/app/views/layouts/admin/_get_all_users.html.erb
index 1397d49..79ab43a 100644
--- a/app/views/layouts/admin/_get_all_users.html.erb
+++ b/app/views/layouts/admin/_get_all_users.html.erb
@@ -29,15 +29,14 @@
         	    <%= u.admin ? %{<span class="fs1" aria-hidden="true" data-icon="&#xe0fe;"}.html_safe : nil %>
         	  </td>
         	  <td>
-        	    <%= link_to "Edit", "#", {:onClick => "javascript:openModal(#{u.id});" ,:role => "button", :class => "btn btn-inverse", "data-toggle" => "modal"}%>	
-				<%= link_to "Delete", "#", {:class => "btn btn-danger"}%>	
+        	    <%= link_to "Edit", "#", {:onClick => "javascript:openEditModal(#{u.id});", :role => "button", :style => "width:70px", :class => "btn btn-inverse", "data-toggle" => "modal"}%>	
         	  </td>
         	</tr>
 	   <% end %>
       </tbody>
     </table>
 	<div id="editAcct" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel1" aria-hidden="true">
-	</div>	
+	</div>
     <div class="clearfix">
     </div>
   </div>
@@ -45,6 +44,12 @@
 
 <script type="text/javascript">
 
+function openEditModal(id){
+ var link = '/admin/'+ id +'/get_user';
+ $("#editAcct").load(link);
+ $("#editAcct").modal('show');
+};
+
 function dataTablePagination(){
 	$('#data-table').dataTable({
       "sPaginationType": "full_numbers"
diff --git a/app/views/layouts/admin/_get_user.html.erb b/app/views/layouts/admin/_get_user.html.erb
index b914b5f..fbe5492 100644
--- a/app/views/layouts/admin/_get_user.html.erb
+++ b/app/views/layouts/admin/_get_user.html.erb
@@ -36,6 +36,7 @@
       <button class="btn" data-dismiss="modal" aria-hidden="true">
         Close
       </button>
+         <%= link_to "Delete", "#", {:id => "delete_button", :class => "btn btn-danger"} %>	
          <%= f.submit "Submit", {:id => 'submit_button', :class => "btn btn-primary pull-right"} %>
     </div>
  	     <% end %>
@@ -43,8 +44,8 @@
 <!-- End Modal -->
 
 <script type="text/javascript">
-//$(document).ready(alert(<%#= @id %>));
- $('#submit_button').click(function() {  
+
+$('#submit_button').click(function() {  
 	var valuesToSubmit = $("#account_edit").serialize();
 	$("#editAcct").modal('hide');
 	
@@ -62,4 +63,22 @@
 	});
 	  
 });
+
+$('#delete_button').click(function() {  
+	$("#editAcct").modal('hide');
+	
+	$.ajax({
+      url: "/admin/" +  <%= @user.id %> + "/delete_user.json",
+	  type: "GET",
+	  success: function(response) {
+	  	$('#success').show(500).delay(1500).fadeOut();
+		loadTable();
+	  },
+	  error: function(event) {
+		$('#failure').show(500).delay(1500).fadeOut();
+	  }
+	});
+	  
+});
+
 </script>
diff --git a/config/routes.rb b/config/routes.rb
index 357e7fa..1c8fa91 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -31,6 +31,7 @@ end
 resources :admin do
   get "dashboard"
   get "get_user"
+  get "delete_user"
   put "update_user"
   get "get_all_users"
 end