diff --git a/websiteFunctions/templates/websiteFunctions/listWebsites.html b/websiteFunctions/templates/websiteFunctions/listWebsites.html
index 12c7ecf79..c03f721b9 100755
--- a/websiteFunctions/templates/websiteFunctions/listWebsites.html
+++ b/websiteFunctions/templates/websiteFunctions/listWebsites.html
@@ -17,31 +17,30 @@
     </script>
 
     <!-- Password Protection Modal -->
-    <div id="Passwordprotection" class="modal fade" role="dialog">
-        <div class="modal-dialog">
+    <div class="modal fade" id="passwordProtectionModal" tabindex="-1" role="dialog">
+        <div class="modal-dialog" role="document">
             <div class="modal-content">
                 <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal">&times;</button>
-                    <h4 class="modal-title">Enable Password Protection</h4>
+                    <h5 class="modal-title">Password Protection</h5>
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
                 </div>
                 <div class="modal-body">
-                    <div>
-                        <label class="col-sm-4">Username</label>
-                        <input ng-model="PPUsername" required class="col-lg-8"
-                               type="text" placeholder="Username">
-                    </div>
-                    <div style="margin-top: 36px;">
-                        <label class="col-sm-4">Password</label>
-                        <input ng-model="PPPassword" required class="col-lg-8"
-                               type="password" placeholder="*******************">
-                    </div>
+                    <form>
+                        <div class="form-group">
+                            <label>Username</label>
+                            <input type="text" class="form-control" ng-model="currentWP.PPUsername" required>
+                        </div>
+                        <div class="form-group">
+                            <label>Password</label>
+                            <input type="password" class="form-control" ng-model="currentWP.PPPassword" required>
+                        </div>
+                    </form>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-primary"
-                            ng-click="enablePasswordProtection()">Enable</button>
-                    <button type="button" class="btn btn-default" data-dismiss="modal">
-                        Cancel
-                    </button>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal" ng-click="currentWP.passwordProtection = false">Cancel</button>
+                    <button type="button" class="btn btn-primary" ng-click="submitPasswordProtection()">Enable Protection</button>
                 </div>
             </div>
         </div>
@@ -156,7 +155,7 @@
                                                 <h4><i class="fa-brands fa-wordpress" style="color: #00749C; margin-right: 8px;"></i>{$ wp.title $}</h4>
                                             </div>
                                             <div class="col-sm-4 text-right">
-                                                <button class="btn btn-outline-primary btn-sm wp-action-btn" ng-click="{% url 'WPHome' %}?ID={$ wp.id $}">
+                                                <button class="btn btn-outline-primary btn-sm wp-action-btn" ng-click="manageWP(wp.id)">
                                                     <i class="fa-solid fa-cog"></i> Manage
                                                 </button>
                                                 <button class="btn btn-outline-danger btn-sm wp-action-btn" ng-click="deleteWPSite(wp)">