diff --git a/src/views/_partials/admin-header.ejs b/src/views/_partials/admin-header.ejs
index 43f5118..72a1e25 100644
--- a/src/views/_partials/admin-header.ejs
+++ b/src/views/_partials/admin-header.ejs
@@ -6,7 +6,6 @@
     <style>
       .pagination {
         list-style-type: none;
-        /* margin: 0; */
         padding: 0;
       }
       .pagination li {
@@ -26,16 +25,13 @@
         border-collapse: collapse;
         border: 1px solid #ccc;
       }
-      
       table td, table th {
         border: 1px solid #ccc;
         padding: 0.25em 0.5em;
       }
-      
       th.active {
-        background-color: #ccc;
+        background-color: #e0e6f6;
       }
-      
       td.actions {
         padding: 0;
         text-align: center;
diff --git a/src/views/admin/list-users.ejs b/src/views/admin/list-users.ejs
index d31a00e..bb67f29 100644
--- a/src/views/admin/list-users.ejs
+++ b/src/views/admin/list-users.ejs
@@ -8,11 +8,11 @@
       <thead>
         <tr>
           <th>Token</th>
-          <th <% if (sort==="ip") { %>class="active"<% } %> ><a href="/admin/users?sort=ip">IPs</a></th>
-          <th <% if (sort==="promptCount") { %>class="active"<% } %> ><a href="/admin/users?sort=promptCount">Prompts</a></th>
+          <th <% if (sort.includes("ip")) { %>class="active"<% } %> ><a href="/admin/users?sort=ip">IPs</a></th>
+          <th <% if (sort.includes("promptCount")) { %>class="active"<% } %> ><a href="/admin/users?sort=promptCount">Prompts</a></th>
           <th>Type</th>
-          <th <% if (sort==="createdAt") { %>class="active"<% } %> ><a href="/admin/users?sort=createdAt">Created (UTC)</a></th>
-          <th <% if (sort==="lastUsedAt") { %>class="active"<% } %> ><a href="/admin/users?sort=lastUsedAt">Last Used (UTC)</a></th>
+          <th <% if (sort.includes("createdAt")) { %>class="active"<% } %> ><a href="/admin/users?sort=createdAt">Created (UTC)</a></th>
+          <th <% if (sort.includes("lastUsedAt")) { %>class="active"<% } %> ><a href="/admin/users?sort=lastUsedAt">Last Used (UTC)</a></th>
           <th colspan="2">Banned?</th>
         </tr>
       </thead>
@@ -39,11 +39,11 @@
 
     <ul class="pagination">
       <% if (page > 1) { %>
-      <li><a href="/admin/users?page=<%= page - 1 %>">&laquo;</a></li>
+      <li><a href="/admin/users?sort=<%= sort %>&page=<%= page - 1 %>">&laquo;</a></li>
       <% } %> <% for (var i = 1; i <= pageCount; i++) { %>
-      <li <% if (i === page) { %>class="active"<% } %>><a href="/admin/users?page=<%= i %>"><%= i %></a></li>
+      <li <% if (i === page) { %>class="active"<% } %>><a href="/admin/users?sort=<%= sort %>&page=<%= i %>"><%= i %></a></li>
       <% } %> <% if (page < pageCount) { %>
-      <li><a href="/admin/users?page=<%= page + 1 %>">&raquo;</a></li>
+      <li><a href="/admin/users?sort=<%= sort %>&page=<%= page + 1 %>">&raquo;</a></li>
       <% } %>
     </ul>
     
diff --git a/src/views/admin/login.ejs b/src/views/admin/login.ejs
index 8c35112..2c2c091 100644
--- a/src/views/admin/login.ejs
+++ b/src/views/admin/login.ejs
@@ -1,5 +1,4 @@
 <%- include("../_partials/admin-header", { title: "Login" }) %>
-  <body>
     <h1>Login</h1>
     <% if (failed) { %>
     <p style="color: red;">Please try again.</p>
