diff --git a/userManagment/templates/userManagment/listUsersV2.html b/userManagment/templates/userManagment/listUsersV2.html
index dd4c410ee..707f852f9 100644
--- a/userManagment/templates/userManagment/listUsersV2.html
+++ b/userManagment/templates/userManagment/listUsersV2.html
@@ -68,14 +68,246 @@
                            class="bg-orange-500 px-2 py-1 text-white" href="#"
                            ng-click="controlUserState(record.name, 'ACTIVATE')"
                            title=""><span>{% trans 'Activate' %}</span></a>
-                        <button class="bg-orange-500 px-2 py-1 text-white ml-2">Edit</button>
-                        <button class="bg-orange-500 px-2 py-1 text-white ml-2">Delete</button>
+                        <button ng-click="deleteUserInitial(record.name)" data-modal-target="DeleteListUser"
+                                data-modal-toggle="DeleteListUser"
+                                class="bg-orange-500 px-2 py-1 text-white"
+                                type="button">
+                            Delete
+                        </button>
+
+                        <div id="DeleteListUser" tabindex="-1"
+                             class="hidden overflow-y-auto overflow-x-hidden fixed top-0 right-0 left-0 z-50 justify-center items-center w-full md:inset-0 h-[calc(100%-1rem)] max-h-full">
+                            <div class="relative p-4 w-full max-w-md max-h-full">
+                                <div class="relative bg-white rounded-lg shadow dark:bg-gray-700">
+                                    <button type="button" data-modal-toggle="DeleteListUser"
+                                            class="absolute top-3 end-2.5 text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm w-8 h-8 ms-auto inline-flex justify-center items-center dark:hover:bg-gray-600 dark:hover:text-white"
+                                            data-modal-hide="DeleteListUser">
+                                        <svg class="w-3 h-3" aria-hidden="true"
+                                             xmlns="http://www.w3.org/2000/svg" fill="none"
+                                             viewBox="0 0 14 14">
+                                            <path stroke="currentColor" stroke-linecap="round"
+                                                  stroke-linejoin="round" stroke-width="2"
+                                                  d="m1 1 6 6m0 0 6 6M7 7l6-6M7 7l-6 6"/>
+                                        </svg>
+                                        <span class="sr-only">Close modal</span>
+                                    </button>
+                                    <div class="p-4 md:p-5 text-center">
+                                        <svg class="mx-auto mb-4 text-gray-400 w-12 h-12 dark:text-gray-200"
+                                             aria-hidden="true"
+                                             xmlns="http://www.w3.org/2000/svg" fill="none"
+                                             viewBox="0 0 20 20">
+                                            <path stroke="currentColor" stroke-linecap="round"
+                                                  stroke-linejoin="round" stroke-width="2"
+                                                  d="M10 11V6m0 8h.01M19 10a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z"/>
+                                        </svg>
+                                        <h3 class="mb-5 text-lg font-normal text-gray-500 dark:text-gray-400">
+                                            Are you sure you want to
+                                            delete this user {$ UserToDelete $} ?</h3>
+                                        <button ng-click="deleteUserFinal()" data-modal-hide="DeleteListUser"
+                                                type="button"
+                                                data-modal-toggle="DeleteListUser"
+                                                class="text-white bg-red-600 hover:bg-red-800 focus:ring-4 focus:outline-none focus:ring-red-300 dark:focus:ring-red-800 font-medium rounded-lg text-sm inline-flex items-center px-5 py-2.5 text-center me-2">
+                                            Yes, I'm sure
+                                        </button>
+                                        <button data-modal-hide="DeleteListUser" type="button"
+                                                data-modal-toggle="DeleteListUser"
+                                                class="text-gray-500 bg-white hover:bg-gray-100 focus:ring-4 focus:outline-none focus:ring-gray-200 rounded-lg border border-gray-200 text-sm font-medium px-5 py-2.5 hover:text-gray-900 focus:z-10 dark:bg-gray-700 dark:text-gray-300 dark:border-gray-500 dark:hover:text-white dark:hover:bg-gray-600 dark:focus:ring-gray-600">
+                                            No, cancel
+                                        </button>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <button ng-click="editInitial(record.name)" data-modal-target="EditListUser"
+                                data-modal-toggle="EditListUser"
+                                class="bg-orange-500 px-2 py-1 text-white"
+                                type="button">
+                            Edit
+                        </button>
+
+                        <div id="EditListUser" tabindex="-1"
+                             class="hidden overflow-y-auto overflow-x-hidden fixed top-0 right-0 left-0 z-50 justify-center items-center w-full md:inset-0 h-[calc(100%-1rem)] max-h-full">
+                            <div>
+                                <div class="relative bg-white rounded-lg shadow dark:bg-gray-700">
+                                    <h2 class="px-4 py-4 font-bold text-xl">Edit Users</h2>
+                                    <button type="button" data-modal-toggle="EditListUser"
+                                            class="absolute top-3 end-2.5 text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm w-8 h-8 ms-auto inline-flex justify-center items-center dark:hover:bg-gray-600 dark:hover:text-white"
+                                            data-modal-hide="EditListUser">
+                                        <svg class="w-3 h-3" aria-hidden="true"
+                                             xmlns="http://www.w3.org/2000/svg" fill="none"
+                                             viewBox="0 0 14 14">
+                                            <path stroke="currentColor" stroke-linecap="round"
+                                                  stroke-linejoin="round" stroke-width="2"
+                                                  d="m1 1 6 6m0 0 6 6M7 7l6-6M7 7l-6 6"/>
+                                        </svg>
+                                        <span class="sr-only">Close modal</span>
+                                    </button>
+                                    <div class="p-4">
+                                        <div ng-hide="installationDetailsForm" class="flex mt-4 py-2 px-6">
+                                            <div>
+                                                <p class="font-semibold w-60">Name</p>
+                                            </div>
+                                            <div>
+                                                <input name="name" type="text"
+                                                       class="w-80 bg-gray-100 rounded px-2 py-1"
+                                                       ng-model="name" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="flex py-2 px-6">
+                                            <div>
+                                                <p class="font-semibold w-60">New Owner</p>
+                                            </div>
+                                            <div>
+                                                <select ng-change="saveResellerChanges()"
+                                                        ng-model="$parent.newOwner"
+                                                        class="w-80 bg-gray-100 rounded px-2 py-1">
+                                                    {% for items in resellerPrivUsers %}
+                                                        <option>{{ items }}</option>
+                                                    {% endfor %}
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="flex py-2 px-6">
+                                            <div>
+                                                <p class="font-semibold w-60">Select ACL</p>
+                                            </div>
+                                            <div>
+                                                <select ng-change="changeACLFunc()"
+                                                        ng-model="$parent.selectedACL"
+                                                        class="w-80 bg-gray-100 rounded px-2 py-1">
+                                                    {% for items in aclNames %}
+                                                        <option>{{ items }}</option>
+                                                    {% endfor %}
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
                     </td>
                 </tr>
                 </tbody>
             </table>
         </div>
     </div>
-
-
+{#    <div>#}
+{#        <button ng-click="deleteUserInitial(record.name)" data-modal-target="DeleteListUser"#}
+{#                data-modal-toggle="DeleteListUser"#}
+{#                class="bg-orange-500 px-2 py-1 text-white"#}
+{#                type="button">#}
+{#            Delete#}
+{#        </button>#}
+{##}
+{#        <div id="DeleteListUser" tabindex="-1"#}
+{#             class="hidden overflow-y-auto overflow-x-hidden fixed top-0 right-0 left-0 z-50 justify-center items-center w-full md:inset-0 h-[calc(100%-1rem)] max-h-full">#}
+{#            <div class="relative p-4 w-full max-w-md max-h-full">#}
+{#                <div class="relative bg-white rounded-lg shadow dark:bg-gray-700">#}
+{#                    <button type="button" data-modal-toggle="DeleteListUser"#}
+{#                            class="absolute top-3 end-2.5 text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm w-8 h-8 ms-auto inline-flex justify-center items-center dark:hover:bg-gray-600 dark:hover:text-white"#}
+{#                            data-modal-hide="DeleteListUser">#}
+{#                        <svg class="w-3 h-3" aria-hidden="true"#}
+{#                             xmlns="http://www.w3.org/2000/svg" fill="none"#}
+{#                             viewBox="0 0 14 14">#}
+{#                            <path stroke="currentColor" stroke-linecap="round"#}
+{#                                  stroke-linejoin="round" stroke-width="2"#}
+{#                                  d="m1 1 6 6m0 0 6 6M7 7l6-6M7 7l-6 6"/>#}
+{#                        </svg>#}
+{#                        <span class="sr-only">Close modal</span>#}
+{#                    </button>#}
+{#                    <div class="p-4 md:p-5 text-center">#}
+{#                        <svg class="mx-auto mb-4 text-gray-400 w-12 h-12 dark:text-gray-200"#}
+{#                             aria-hidden="true"#}
+{#                             xmlns="http://www.w3.org/2000/svg" fill="none"#}
+{#                             viewBox="0 0 20 20">#}
+{#                            <path stroke="currentColor" stroke-linecap="round"#}
+{#                                  stroke-linejoin="round" stroke-width="2"#}
+{#                                  d="M10 11V6m0 8h.01M19 10a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z"/>#}
+{#                        </svg>#}
+{#                        <h3 class="mb-5 text-lg font-normal text-gray-500 dark:text-gray-400">#}
+{#                            Are you sure you want to#}
+{#                            delete this user {$ UserToDelete $} ?</h3>#}
+{#                        <button ng-click="deleteUserFinal()" data-modal-hide="DeleteListUser" type="button"#}
+{#                                data-modal-toggle="DeleteListUser"#}
+{#                                class="text-white bg-red-600 hover:bg-red-800 focus:ring-4 focus:outline-none focus:ring-red-300 dark:focus:ring-red-800 font-medium rounded-lg text-sm inline-flex items-center px-5 py-2.5 text-center me-2">#}
+{#                            Yes, I'm sure#}
+{#                        </button>#}
+{#                        <button data-modal-hide="DeleteListUser" type="button"#}
+{#                                data-modal-toggle="DeleteListUser"#}
+{#                                class="text-gray-500 bg-white hover:bg-gray-100 focus:ring-4 focus:outline-none focus:ring-gray-200 rounded-lg border border-gray-200 text-sm font-medium px-5 py-2.5 hover:text-gray-900 focus:z-10 dark:bg-gray-700 dark:text-gray-300 dark:border-gray-500 dark:hover:text-white dark:hover:bg-gray-600 dark:focus:ring-gray-600">#}
+{#                            No, cancel#}
+{#                        </button>#}
+{#                    </div>#}
+{#                </div>#}
+{#            </div>#}
+{#        </div>#}
+{#    </div>#}
+{#    <div>#}
+{#        <button ng-click="editInitial(record.name)" data-modal-target="EditListUser"#}
+{#                data-modal-toggle="EditListUser"#}
+{#                class="bg-orange-500 px-2 py-1 text-white"#}
+{#                type="button">#}
+{#            Edit#}
+{#        </button>#}
+{##}
+{#        <div id="EditListUser" tabindex="-1"#}
+{#             class="hidden overflow-y-auto overflow-x-hidden fixed top-0 right-0 left-0 z-50 justify-center items-center w-full md:inset-0 h-[calc(100%-1rem)] max-h-full">#}
+{#            <div>#}
+{#                <div class="relative bg-white rounded-lg shadow dark:bg-gray-700">#}
+{#                    <h2 class="px-4 py-4 font-bold text-xl">Edit Users</h2>#}
+{#                    <button type="button" data-modal-toggle="EditListUser"#}
+{#                            class="absolute top-3 end-2.5 text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm w-8 h-8 ms-auto inline-flex justify-center items-center dark:hover:bg-gray-600 dark:hover:text-white"#}
+{#                            data-modal-hide="EditListUser">#}
+{#                        <svg class="w-3 h-3" aria-hidden="true"#}
+{#                             xmlns="http://www.w3.org/2000/svg" fill="none"#}
+{#                             viewBox="0 0 14 14">#}
+{#                            <path stroke="currentColor" stroke-linecap="round"#}
+{#                                  stroke-linejoin="round" stroke-width="2"#}
+{#                                  d="m1 1 6 6m0 0 6 6M7 7l6-6M7 7l-6 6"/>#}
+{#                        </svg>#}
+{#                        <span class="sr-only">Close modal</span>#}
+{#                    </button>#}
+{#                    <div class="p-4">#}
+{#                        <div ng-hide="installationDetailsForm" class="flex mt-4 py-2 px-6">#}
+{#                            <div>#}
+{#                                <p class="font-semibold w-60">Name</p>#}
+{#                            </div>#}
+{#                            <div>#}
+{#                                <input name="name" type="text" class="w-80 bg-gray-100 rounded px-2 py-1"#}
+{#                                       ng-model="name" readonly>#}
+{#                            </div>#}
+{#                        </div>#}
+{#                        <div class="flex py-2 px-6">#}
+{#                            <div>#}
+{#                                <p class="font-semibold w-60">New Owner</p>#}
+{#                            </div>#}
+{#                            <div>#}
+{#                                <select ng-change="saveResellerChanges()"#}
+{#                                        ng-model="$parent.newOwner"#}
+{#                                        class="w-80 bg-gray-100 rounded px-2 py-1">#}
+{#                                    {% for items in resellerPrivUsers %}#}
+{#                                        <option>{{ items }}</option>#}
+{#                                    {% endfor %}#}
+{#                                </select>#}
+{#                            </div>#}
+{#                        </div>#}
+{#                        <div class="flex py-2 px-6">#}
+{#                            <div>#}
+{#                                <p class="font-semibold w-60">Select ACL</p>#}
+{#                            </div>#}
+{#                            <div>#}
+{#                                <select ng-change="changeACLFunc()"#}
+{#                                        ng-model="$parent.selectedACL"#}
+{#                                        class="w-80 bg-gray-100 rounded px-2 py-1">#}
+{#                                    {% for items in aclNames %}#}
+{#                                        <option>{{ items }}</option>#}
+{#                                    {% endfor %}#}
+{#                                </select>#}
+{#                            </div>#}
+{#                        </div>#}
+{#                    </div>#}
+{#                </div>#}
+{#            </div>#}
+{#        </div>#}
+{#    </div>#}
 {% endblock %}
diff --git a/websiteFunctions/templates/websiteFunctions/WPsitesListV2.html b/websiteFunctions/templates/websiteFunctions/WPsitesListV2.html
index eadfa1e42..65c5a0939 100644
--- a/websiteFunctions/templates/websiteFunctions/WPsitesListV2.html
+++ b/websiteFunctions/templates/websiteFunctions/WPsitesListV2.html
@@ -72,11 +72,11 @@
                                     <th class="w-52 pt-2 font-semibold text-sm">
                                         <div class="flex items-center justify-center">
 
-
                                             <button data-modal-target="Deletewpsite" data-modal-toggle="Deletewpsite"
-                                                    class="block text-white bg-red-700 hover:bg-red-800 focus:ring-4 focus:outline-none focus:ring-red-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-red-600 dark:hover:bg-red-700 dark:focus:ring-red-800"
-                                                    type="button" onclick="DeleteWPNowV2('{% url 'ListWPSitesV2' %}?DeleteID={{ sub.id }}')">
-                                                Deleteee
+                                                    class="block text-white bg-orange-500 hover:bg-orange-700 font-medium rounded-lg text-sm px-5 py-2.5 text-center"
+                                                    type="button"
+                                                    onclick="DeleteWPNowV2('{% url 'ListWPSitesV2' %}?DeleteID={{ sub.id }}')">
+                                                Delete
                                             </button>
 
                                             <div id="Deletewpsite" tabindex="-1"
@@ -108,7 +108,8 @@
                                                                 Are you sure you want to
                                                                 delete this WordPress site?</h3>
                                                             <button data-modal-hide="Deletewpsite" type="button"
-                                                                    data-modal-toggle="Deletewpsite" onclick="FinalDeleteWPNowV2()"
+                                                                    data-modal-toggle="Deletewpsite"
+                                                                    onclick="FinalDeleteWPNowV2()"
                                                                     class="text-white bg-red-600 hover:bg-red-800 focus:ring-4 focus:outline-none focus:ring-red-300 dark:focus:ring-red-800 font-medium rounded-lg text-sm inline-flex items-center px-5 py-2.5 text-center me-2">
                                                                 Yes, I'm sure
                                                             </button>