diff --git a/website/styles/adminpanel.css b/website/styles/adminpanel.css
index 0bd8f1c..15ecfdc 100644
--- a/website/styles/adminpanel.css
+++ b/website/styles/adminpanel.css
@@ -6,7 +6,10 @@
     box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
 }
 
-.admin-options {
+.admin-actions {
+    display: inline-block;
+    margin: 10px;
+    vertical-align: top;
 }
 
 .admin-searchbar {
@@ -28,11 +31,6 @@
     margin-right: 100px;
 }
 
-.admin-actions {
-    display: inline-block;
-    margin: 10px;
-    vertical-align: top;
-}
 
 .admin-users {
     margin: 10px;
diff --git a/website/views/adminpanel.php b/website/views/adminpanel.php
index 1d7b509..1a9d90b 100644
--- a/website/views/adminpanel.php
+++ b/website/views/adminpanel.php
@@ -4,6 +4,17 @@
         <meta charset="utf-8">
         <link rel="stylesheet" type="text/css" href="astyle.css">
         <title>Admin Panel</title>
+        <script type="text/javascript">
+        function checkAll(allbox) {
+            var checkboxes = document.getElementsByName('check1');
+
+            for (var i = 0; i < checkboxes.length; i++) {
+                if (checkboxes[i].type == 'checkbox') {
+                    checkboxes[i].checked = allbox.checked;
+                }
+            }
+        }
+        </script>
     </head>
     <body>
         <div class="content">
@@ -30,15 +41,18 @@
                             <input type="radio" name="actions" value="unban"> Unban <br> <br>
                             <input type="submit" value="Confirm">
                         </div>
-                </div>
+                    </div>
+                    <br>
                     <div class="admin-users">
                         <h2>Users:</h2>
                         <table class="usertable">
-                            <tr style="text-align: left;">
-                                <th><input type="checkbox" name="checkall"></th>
-                                <th>User</th>
-                                <th>Ban reason</th>
-                                <th style="width: 200px;">Action</th>
+                            <tr>
+                                <th class="table-checkbox">
+                                    <input type="checkbox" name="checkall" onchange="checkAll(this)">
+                                </th>
+                                <th class="table-username">User</th>
+                                <th class="table-comment">Ban reason</th>
+                                <th class="table-action">Action</th>
                             </tr>
                             <tr>
                                 <td><input type="checkbox" name="check1"></td>
