diff --git a/website/styles/adminpanel.css b/website/styles/adminpanel.css
index e761592..edeb9c8 100644
--- a/website/styles/adminpanel.css
+++ b/website/styles/adminpanel.css
@@ -1,6 +1,6 @@
 .admin-panel {
     margin: auto;
-    min-width: 800px;
+    /*min-width: 800px;*/
 }
 
 .admin-title {
@@ -32,11 +32,12 @@
     margin-bottom: 10px;
 }
 
-.admin-filter {
+.admin-filter, .admin-filtertype {
     display: inline-block;
     margin: 10px;
     vertical-align: top;
-    margin-right: 100px;
+    margin-left: 20px;
+    margin-right: 20px;
 }
 
 .admin-users {
diff --git a/website/views/adminpanel.php b/website/views/adminpanel.php
index b789aad..96c02d3 100644
--- a/website/views/adminpanel.php
+++ b/website/views/adminpanel.php
@@ -21,26 +21,43 @@
                 <div class="admin-title">
                     <h1>User Management Panel</h1>
                 </div> <br>
-                <form action="admin.php" method="post">
+                <form class="admin-actionform" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" method="post">
                 <div class="admin-options">
-                    <form action="admin.php" method="post">
+                    <form class="admin-searchform" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" method="post">
                         <div class="admin-searchbar">
                             <h2>Search</h2>
                             <input type="text" name="search" class="admin-searchinput"> <br>
                             <input type="submit" value="Search">
                         </div>
                         <div class="admin-filter">
-                            <h2>Show users:</h2>
-                            <input type="checkbox" name="status" value="Active"> Active <br>
-                            <input type="checkbox" name="status" value="Muted"> Muted <br>
-                            <input type="checkbox" name="status" value="Banned"> Banned
+                            <h2>Show:</h2>
+                            <input type="checkbox" name="status" id="normal" value="normal">
+                            <label for="normal">Normal</label><br>
+                            <input type="checkbox" name="status" id="frozen" value="frozen">
+                            <label for="frozen">Frozen</label><br>
+                            <input type="checkbox" name="status" id="banned" value="banned">
+                            <label for="banned">Banned</label><br>
+                            <input type="checkbox" name="status" id="admin" value="admin">
+                            <label for="admin">Admin</label><br>
+                            <input type="checkbox" name="status" id="unvalidated" value="unvalidated">
+                            <label for="unvalidated">Unvalidated</label>
+                        </div>
+                        <div class="admin-filtertype">
+                            <h2>Page Type:</h2>
+                            <input type="radio" name="type" id="user" value="user">
+                            <label for="user">Users</label><br>
+                            <input type="radio" name="type" id="group" value="group">
+                            <label for="group">Groups</label>
                         </div>
                     </form>
                         <div class="admin-actions">
                             <h2>Batch Actions: </h2>
-                            <input type="radio" name="actions" value="mute"> Mute <br>
-                            <input type="radio" name="actions" value="ban"> Ban <br>
-                            <input type="radio" name="actions" value="unban"> Unban <br> <br>
+                            <input type="radio" name="actions" id="freeze" value="freeze">
+                            <label for="freeze">Freeze</label><br>
+                            <input type="radio" name="actions" id="ban" value="ban">
+                            <label for="ban">Ban</label><br>
+                            <input type="radio" name="actions" id="restore" value="unban">
+                            <label for="restore">Restore</label><br><br>
                             <input type="submit" value="Confirm">
                         </div>
                     </div>
@@ -63,11 +80,11 @@
                                 <td>Banned</td>
                                 <td>unregulated time travel</td>
                                 <td>
-                                    <form class="admin-useraction" action="index.html" method="post">
+                                    <form class="admin-useraction" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" method="post">
                                         <select class="action" name="actions">
-                                            <option value="mute">Mute</option>
+                                            <option value="freeze">Freeze</option>
                                             <option value="ban">Ban</option>
-                                            <option value="unban">Unban</option>
+                                            <option value="restore">Restore</option>
                                         </select>
                                         <input type="submit" value="Confirm">
                                     </form>
@@ -79,11 +96,11 @@
                                 <td>Banned</td>
                                 <td>l33t h4xx</td>
                                 <td>
-                                    <form class="admin-useraction" action="index.html" method="post">
+                                    <form class="admin-useraction" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" method="post">
                                         <select class="action" name="actions">
-                                            <option value="mute">Mute</option>
+                                            <option value="freeze">Freeze</option>
                                             <option value="ban">Ban</option>
-                                            <option value="unban">Unban</option>
+                                            <option value="restore">Restore</option>
                                         </select>
                                         <input type="submit" value="Confirm">
                                     </form>