diff --git a/userhandler/templates/modal/user_edit.html b/userhandler/templates/modal/user_edit.html
new file mode 100644
index 0000000..b278e22
--- /dev/null
+++ b/userhandler/templates/modal/user_edit.html
@@ -0,0 +1,53 @@
+<div class="modal" id="modal_edit_user" xmlns="http://www.w3.org/1999/html">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">×</span></button>
+                <h4 class="modal-title">New User</h4>
+            </div>
+            <form id="formCreateNS" action='{% url "users:update"   %}'
+                  class="form-horizontal"
+                  method="post" enctype="multipart/form-data">
+                {% csrf_token %}
+                <div class="modal-body" id="modal_edit_user_body">
+                    <div class="form-group">
+                        <label for="username" class="col-sm-3 control-label">Username *</label>
+                        <div class="col-sm-6">
+                            <input class="form-control" id="username" name="username"
+                                   placeholder="Username" required>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label for="password" class="col-sm-3 control-label">Password *</label>
+                        <div class="col-sm-6">
+                           <input class="form-control" id="password" name="password" type="password"
+                                   placeholder="Password" required>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for=projects" class="col-sm-3 control-label">Projects *</label>
+                        <div class="col-sm-6">
+                            <select required id="projects" class="js-example-basic-multiple form-control" name="projects"
+                            multiple="multiple">
+                            </select>
+                        </div>
+                    </div>
+
+
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default pull-left" data-dismiss="modal">Cancel</button>
+                    <button class="btn btn-primary"
+                            data-loading-text="<i class='fa fa-circle-o-notch fa-spin'></i> Editing..."
+                            id="create_edit_user">Apply
+                    </button>
+
+                </div>
+            </form>
+        </div>
+        <!-- /.modal-content -->
+    </div>
+    <!-- /.modal-dialog -->
+</div>
diff --git a/userhandler/templates/user_list.html b/userhandler/templates/user_list.html
index 03ae70f..f8fa6ac 100644
--- a/userhandler/templates/user_list.html
+++ b/userhandler/templates/user_list.html
@@ -65,12 +65,20 @@
                                 <td>{{ s|get_sub:"_admin,created"|get_date}}</td>
 
                                 <td>
-                                    <div class="btn-group">
 
-                                        <button type="button" class="btn btn-default"
-                                                onclick="javascript:deleteUser('{% url "users:delete" user_id=s|get:"_id"  %}')" data-toggle="tooltip" data-placement="top" data-container="body" title="Delete"><i
-                                                class="far fa-trash-alt" ></i></button>
-                                    </div>
+                                    <div class="btn-group">
+                            <button type="button" class="btn btn-default dropdown-toggle"
+                                    data-toggle="dropdown" aria-expanded="false">Actions
+                                <span class="fa fa-caret-down"></span></button>
+                            <ul class="dropdown-menu">
+
+                                <li>
+                                    <a href="#" onclick="javascript:deleteUser('{% url "users:delete" user_id=s|get:"_id"  %}')" style="color:red">
+                                        <i class="fa fa-trash"  ></i> Delete</a>
+
+                                </li>
+                            </ul>
+                            </div>
                                 </td>
 
                             </tr>