diff --git a/admin/templates/default/listservers.tpl b/admin/templates/default/listservers.tpl
index 0e9007d9f7..6df33a233b 100644
--- a/admin/templates/default/listservers.tpl
+++ b/admin/templates/default/listservers.tpl
@@ -1,10 +1,10 @@
  <center>
   <table border="0" cellspacing="2" cellpadding="2">
    <tr>
-    <td colspan="5" align="center" bgcolor="#c9c9c9"><b>{title_servers}<b/></td>
+    <td colspan="6" align="center" bgcolor="#c9c9c9"><b>{title_servers}<b/></td>
    </tr>
    <tr>
-    <td colspan="5" align="left">
+    <td colspan="6" align="left">
      <table border="0" width="100%">
       <tr>
       {left}
@@ -16,38 +16,38 @@
    </tr>
    <tr>
     <td>&nbsp;</td>
-    <td colspan="4" align="right">
+    <td colspan="6" align="right">
      <form method="post" action="{actionurl}">
      <input type="text" name="query">&nbsp;<input type="submit" name="search" value="{lang_search}"></form></td>
    </tr>
    <tr bgcolor="{th_bg}">
-    <td width="20%" bgcolor="{th_bg}">{sort_name}</td>
-    <td width="32%" bgcolor="{th_bg}">{sort_url}</td>
-    <td width="8%"  bgcolor="{th_bg}" align="center">{lang_edit}</td>
-    <td width="8%"  bgcolor="{th_bg}" align="center">{lang_delete}</td>
+    <td bgcolor="{th_bg}">{sort_name}</td>
+    <td bgcolor="{th_bg}">{sort_url}</td>
+    <td bgcolor="{th_bg}">{sort_mode}</td>
+    <td bgcolor="{th_bg}">{sort_security}</td>
+    <td bgcolor="{th_bg}" align="center">{lang_edit}</td>
+    <td bgcolor="{th_bg}" align="center">{lang_delete}</td>
    </tr>
 
 <!-- BEGIN server_list -->
    <tr bgcolor="{tr_color}">
     <td>{server_name}</td>
     <td>{server_url}</td>
+    <td>{server_mode}</td>
+    <td>{server_security}&nbsp;</td>
     <td align="center"><a href="{edit}">{lang_edit_entry}</a></td>
     <td align="center"><a href="{delete}">{lang_delete_entry}</a></td>
    </tr>
 <!-- END server_list -->
 
 <!-- BEGIN add   -->
+</form>
    <tr valign="bottom">
-    <td>
      <form method="POST" action="{add_action}">
-     <input type="submit" name="add" value="{lang_add}"></form>
-    </td>
-   </tr>
-   <tr valign="bottom">
-    <td>
+     <td colspan="3"><input type="submit" name="add" value="{lang_add}"></form></td>
+     </form>
      <form method="POST" action="{doneurl}">
-     <input type="submit" name="done" value="{lang_done}"></form>
-    </td>
+     <td align="right" colspan="3"><input type="submit" name="done" value="{lang_done}"></form></td>
    </tr>
 <!-- END add -->
 
diff --git a/admin/templates/default/server_form.tpl b/admin/templates/default/server_form.tpl
index 5f66666aea..fc6dafda78 100644
--- a/admin/templates/default/server_form.tpl
+++ b/admin/templates/default/server_form.tpl
@@ -54,13 +54,11 @@
   <table width="50%" border="0" cellspacing="2" cellpadding="2">
    <tr valign="bottom">
     <td height="50" align="center">
-     {hidden_vars}
      <input type="submit" name="submit" value="{lang_add}"></td>
     <td height="50" align="center">
      <input type="reset" name="reset" value="{lang_reset}"></form></td>
     <td height="50" align="center">
      <form method="POST" action="{doneurl}">
-     {hidden_vars}
      <input type="submit" name="done" value="{lang_done}"></form></td>
    </tr>
   </table>
@@ -71,15 +69,12 @@
   <table width="50%" border="0" cellspacing="2" cellpadding="2">
    <tr valign="bottom">
     <td height="50" align="center">
-     {hidden_vars}
      <input type="submit" name="submit" value="{lang_edit}"></form></td>
     <td height="50" align="center">
      <form method="POST" action="{deleteurl}">
-     {hidden_vars}
      <input type="submit" name="delete" value="{lang_delete}"></form></td>
     <td height="50" align="center">
      <form method="POST" action="{doneurl}">
-     {hidden_vars}
      <input type="submit" name="done" value="{lang_done}"></form></td>
    </tr>
   </table>