diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index 1f253421..943a29c7 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -6,6 +6,9 @@
 #
 Version 2.1.1 -- TBD
 --------------------
+  - Fixed: Overview no longer lists alias entries for mailboxes (GregC)
+  - Changed: Added exit buttons to several edit options. (GregC)
+  - Fixed: user options are a little more idiot-proof, templates are consistent (GregC)
   - Changed: Users can view and edit their vacation config (GregC)
   - Added: Slovakian language posted on SourceForge by eszabo
   - Changed: searches include mailbox.name matches (GregC)
diff --git a/languages/default.lang b/languages/default.lang
index 30e87dae..3b61bdd0 100644
--- a/languages/default.lang
+++ b/languages/default.lang
@@ -297,6 +297,7 @@ $PALANG['pUsersMenu_edit_alias'] = 'Change your forward';
 $PALANG['pUsersMenu_password'] = 'Change Password';
 
 $PALANG['pUsersMain_vacation'] = 'Set an "out of office" message or auto responder for your mail.';
+$PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' is ON, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/remove';
 $PALANG['pUsersMain_edit_alias'] = 'Change your email forwarding.';
 $PALANG['pUsersMain_password'] = 'Change your current password.';
 
diff --git a/languages/en.lang b/languages/en.lang
index 8339ce72..12967c1f 100644
--- a/languages/en.lang
+++ b/languages/en.lang
@@ -295,6 +295,7 @@ $PALANG['pUsersMenu_edit_alias'] = 'Change your forward';
 $PALANG['pUsersMenu_password'] = 'Change Password';
 
 $PALANG['pUsersMain_vacation'] = 'Set an "out of office" message or auto responder for your mail.';
+$PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' is ON, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/remove';
 $PALANG['pUsersMain_edit_alias'] = 'Change your email forwarding.';
 $PALANG['pUsersMain_password'] = 'Change your current password.';
 
diff --git a/overview.php b/overview.php
index 36540b18..80cde4a4 100644
--- a/overview.php
+++ b/overview.php
@@ -55,22 +55,11 @@ if ($_SERVER['REQUEST_METHOD'] == "GET")
 
    if (check_owner ($SESSID_USERNAME, $fDomain))
    {
-      if ($CONF['alias_control_admin'] == "YES")
-      {
-         $query = "SELECT address,goto,modified,active FROM alias WHERE domain='$fDomain' ORDER BY address LIMIT $limitSql";
-         if ('pgsql'==$CONF['database_type'])
-         {
-            $query = "SELECT address,goto,extract(epoch from modified) as modified,active FROM alias WHERE domain='$fDomain' ORDER BY address LIMIT $limitSql";
-         }
-      }
-      else
-      {
          $query = "SELECT $table_alias.address,$table_alias.goto,$table_alias.modified,$table_alias.active FROM $table_alias LEFT JOIN $table_mailbox ON $table_alias.address=$table_mailbox.username WHERE $table_alias.domain='$fDomain' AND $table_mailbox.maildir IS NULL ORDER BY $table_alias.address LIMIT $limitSql";
          if ('pgsql'==$CONF['database_type'])
          {
             $query = "SELECT address,goto,extract(epoch from modified) as modified,active FROM $table_alias WHERE domain='$fDomain' AND NOT EXISTS(SELECT 1 FROM $table_mailbox WHERE username=$table_alias.address) ORDER BY address LIMIT $limitSql";
          }
-      }
 
       $result = db_query ($query);
       if ($result['rows'] > 0)
diff --git a/templates/edit-mailbox.tpl b/templates/edit-mailbox.tpl
index 1a80abf8..4394f6a1 100644
--- a/templates/edit-mailbox.tpl
+++ b/templates/edit-mailbox.tpl
@@ -37,7 +37,10 @@
       <td>&nbsp;</td>
    </tr>
    <tr>
-      <td colspan="3" class="hlp_center"><input class="flat" type="submit" name="submit" value="<?php print $PALANG['pEdit_mailbox_button']; ?>" /></td>
+      <td colspan="3" class="hlp_center">
+        <input class="button" type="submit" name="submit" value="<?php print $PALANG['pEdit_mailbox_button']; ?>" />
+        <input class="button" type="submit" name="cancel" value="<?php print $PALANG['exit']; ?>" action="main.php" />
+     </td>
    </tr>
    <tr>
       <td colspan="3" class="standout"><?php print $tMessage; ?></td>
diff --git a/templates/users_edit-alias.tpl b/templates/users_edit-alias.tpl
index 14a438ff..9c9eeb41 100644
--- a/templates/users_edit-alias.tpl
+++ b/templates/users_edit-alias.tpl
@@ -11,7 +11,7 @@
    </tr>
    <tr>
       <td><?php print $PALANG['pEdit_alias_goto'] . ":"; ?></td>
-      <td><textarea class="flat" rows="4" cols="30" name="fGoto">
+      <td><textarea class="flat" rows="4" cols="50" name="fGoto">
 <?php
 $array = preg_split ('/,/', $tGoto);
 
@@ -50,7 +50,10 @@ for ($i = 0 ; $i < sizeof ($array) ; $i++)
       </td>
    </tr>
    <tr>
-      <td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $PALANG['pEdit_alias_button']; ?>"></td>
+      <td colspan="3" class="hlp_center">
+         <input class="button" type="submit" name="submit" value="<?php print $PALANG['pEdit_alias_button']; ?>">
+         <input class="button" type="submit" name="submit" value="<?php print $PALANG['exit']; ?>" action="main.php" >
+      </td>
    </tr>
    <tr>
       <td colspan="3" class="standout"><?php print $tMessage; ?></td>
diff --git a/templates/users_main.tpl b/templates/users_main.tpl
index 3b455ad3..0bf3836f 100644
--- a/templates/users_main.tpl
+++ b/templates/users_main.tpl
@@ -7,7 +7,7 @@
    <?php if ($CONF['vacation'] == 'YES') { ?>
    <tr>
       <td nowrap><a target="_top" href="vacation.php"><?php print $PALANG['pUsersMenu_vacation']; ?></a></td>
-      <td><?php print $PALANG['pUsersMain_vacation']; ?></td>
+      <td><?php print $tummVacationtext; ?></td>
    </tr>
    <?php } ?>
    <tr>
diff --git a/templates/users_password.tpl b/templates/users_password.tpl
index 879134f6..ea52d038 100644
--- a/templates/users_password.tpl
+++ b/templates/users_password.tpl
@@ -25,7 +25,10 @@
       <td>&nbsp;</td>
    </tr>
    <tr>
-      <td colspan="3" class="hlp_center"><input type="submit" name="submit" value="<?php print $PALANG['pPassword_button']; ?>" /></td>
+      <td colspan="3" class="hlp_center">
+        <input class="button" type="submit" name="submit" value="<?php print $PALANG['pPassword_button']; ?>" />
+        <input class="button" type="submit" name="submit" value="<?php print $PALANG['exit']; ?>" action="main.php" >
+      </td>
    </tr>
    <tr>
       <td colspan="3" class="standout"><?php print $tMessage; ?></td>
diff --git a/users/main.php b/users/main.php
index cf100376..d555e8a2 100644
--- a/users/main.php
+++ b/users/main.php
@@ -11,7 +11,7 @@
 //
 // Template Variables:
 //
-// -none-
+// tummVacationtext
 //
 // Form POST \ GET Variables:
 //
@@ -22,6 +22,16 @@ require ("../functions.inc.php");
 include ("../languages/" . check_language () . ".lang");
 
 $USERID_USERNAME = check_user_session ();
+$result = db_query("SELECT * FROM $table_vacation WHERE email='$USERID_USERNAME'");
+if ($result['rows'] == 1)
+{
+   $row = db_array($result['result']);
+   $tummVacationtext = $PALANG['pUsersMain_vacationSet'];
+}
+else
+{
+   $tummVacationtext = $PALANG['pUsersMain_vacation'];
+}
 
 if ($_SERVER["REQUEST_METHOD"] == "GET")
 {