diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index 9b430e4b..cf63e6cf 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -1,5 +1,14 @@
 CHANGE LOG
 
+2014-01-28 by alderaan
+Adv. User Search: Replace date format tooltips with "placeholder" HTML attributes
+
+2014-01-28 by alderaan
+Clear cache key "num_staff_pms_$LoggedUser[ID]" when reassigning Staff PMs
+
+2014-01-27 by alderaan
+UI improvements to the Client Whitelist Manager
+
 2014-01-27 by alderaan
 .gitattributes: set diff=html and diff=php, and clean up the file a bit
 
diff --git a/sections/staffpm/assign.php b/sections/staffpm/assign.php
index eae5d454..ae24efff 100644
--- a/sections/staffpm/assign.php
+++ b/sections/staffpm/assign.php
@@ -63,6 +63,7 @@
 					Level = $NewLevel,
 					AssignedToUser = NULL
 				WHERE ID = $ConvID");
+			$Cache->delete_value("num_staff_pms_$LoggedUser[ID]");
 		} else {
 			$UserInfo = Users::user_info($NewLevel);
 			$Level = $Classes[$UserInfo['PermissionID']]['Level'];
@@ -77,7 +78,7 @@
 					AssignedToUser = $NewLevel,
 					Level = $Level
 				WHERE ID = $ConvID");
-
+			$Cache->delete_value("num_staff_pms_$LoggedUser[ID]");
 		}
 		echo '1';
 
diff --git a/sections/tools/managers/whitelist_list.php b/sections/tools/managers/whitelist_list.php
index 46c54ca8..17e8a427 100644
--- a/sections/tools/managers/whitelist_list.php
+++ b/sections/tools/managers/whitelist_list.php
@@ -3,15 +3,36 @@
 	error(403);
 }
 
-View::show_header('Whitelist Management');
+View::show_header('Client Whitelist Manager');
 $DB->query('
 	SELECT id, vstring, peer_id
 	FROM xbt_client_whitelist
 	ORDER BY peer_id ASC');
 ?>
 <div class="header">
-	<h2>Allowed Clients</h2>
+	<h2>Client Whitelist</h2>
 </div>
+<div class="box2 pad thin">
+<form class="add_form" name="clients" action="" method="post">
+	<input type="hidden" name="action" value="whitelist_alter" />
+	<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
+	<table>
+		<tr class="colhead">
+			<td colspan="4">Add client</td>
+		</tr>
+		<tr class="rowa">
+			<td>
+				<input type="text" size="60" name="client" placeholder="Client name" />
+			</td>
+			<td>
+				<input type="text" size="10" name="peer_id" placeholder="Peer ID" />
+			</td>
+			<td>
+				<input type="submit" value="Create" />
+			</td>
+		</tr>
+	</table>
+</form>
 <table width="100%">
 	<tr class="colhead">
 		<td>Client</td>
@@ -31,7 +52,7 @@
 		<tr class="row<?=$Row?>">
 			<td>
 				<input type="hidden" name="id" value="<?=$ID?>" />
-				<input type="text" size="100" name="client" value="<?=$Client?>" />
+				<input type="text" size="60" name="client" value="<?=$Client?>" />
 			</td>
 			<td>
 				<input type="text" size="10" name="peer_id" value="<?=$Peer_ID?>" />
@@ -44,25 +65,5 @@
 	</table>
 </form>
 <? } ?>
-<form class="add_form" name="clients" action="" method="post">
-	<input type="hidden" name="action" value="whitelist_alter" />
-	<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
-	<table>
-		<tr class="colhead">
-			<td colspan="4">Add client</td>
-		</tr>
-		<tr class="rowa">
-
-			<td>
-				<input type="text" size="100" name="client" />
-			</td>
-			<td>
-				<input type="text" size="10" name="peer_id" />
-			</td>
-			<td>
-				<input type="submit" value="Create" />
-			</td>
-		</tr>
-	</table>
-</form>
+</div>
 <? View::show_footer(); ?>
diff --git a/sections/user/advancedsearch.php b/sections/user/advancedsearch.php
index 62a1cfda..ce6a1ac1 100644
--- a/sections/user/advancedsearch.php
+++ b/sections/user/advancedsearch.php
@@ -460,7 +460,7 @@ function num_compare($Field, $Operand, $Num1, $Num2 = '') {
 				<td width="24%">
 					<input type="text" name="username" size="20" value="<?=display_str($_GET['username'])?>" />
 				</td>
-				<td class="label tooltip nobr" title="Date format is YYYY-MM-DD">Joined:</td>
+				<td class="label nobr">Joined:</td>
 				<td width="24%">
 					<select name="joined">
 						<option value="on"<?      if ($_GET['joined'] === 'on')      { echo ' selected="selected"'; } ?>>On</option>
@@ -468,8 +468,8 @@ function num_compare($Field, $Operand, $Num1, $Num2 = '') {
 						<option value="after"<?   if ($_GET['joined'] === 'after')   { echo ' selected="selected"'; } ?>>After</option>
 						<option value="between"<? if ($_GET['joined'] === 'between') { echo ' selected="selected"'; } ?>>Between</option>
 					</select>
-					<input type="text" name="join1" size="6" value="<?=display_str($_GET['join1'])?>" />
-					<input type="text" name="join2" size="6" value="<?=display_str($_GET['join2'])?>" />
+					<input type="text" name="join1" size="10" value="<?=display_str($_GET['join1'])?>" placeholder="YYYY-MM-DD" />
+					<input type="text" name="join2" size="10" value="<?=display_str($_GET['join2'])?>" placeholder="YYYY-MM-DD" />
 				</td>
 				<td class="label nobr">Enabled:</td>
 				<td>
@@ -486,7 +486,7 @@ function num_compare($Field, $Operand, $Num1, $Num2 = '') {
 				<td>
 					<input type="text" name="email" size="20" value="<?=display_str($_GET['email'])?>" />
 				</td>
-				<td class="label tooltip nobr" title="Date format is YYYY-MM-DD">Last active:</td>
+				<td class="label nobr">Last active:</td>
 				<td width="30%">
 					<select name="lastactive">
 						<option value="on"<?      if ($_GET['lastactive'] === 'on')      { echo ' selected="selected"'; } ?>>On</option>
@@ -494,8 +494,8 @@ function num_compare($Field, $Operand, $Num1, $Num2 = '') {
 						<option value="after"<?   if ($_GET['lastactive'] === 'after')   { echo ' selected="selected"'; } ?>>After</option>
 						<option value="between"<? if ($_GET['lastactive'] === 'between') { echo ' selected="selected"'; } ?>>Between</option>
 					</select>
-					<input type="text" name="lastactive1" size="6" value="<?=display_str($_GET['lastactive1'])?>" />
-					<input type="text" name="lastactive2" size="6" value="<?=display_str($_GET['lastactive2'])?>" />
+					<input type="text" name="lastactive1" size="10" value="<?=display_str($_GET['lastactive1'])?>" placeholder="YYYY-MM-DD" />
+					<input type="text" name="lastactive2" size="10" value="<?=display_str($_GET['lastactive2'])?>" placeholder="YYYY-MM-DD" />
 				</td>
 				<td class="label nobr">Primary class:</td>
 				<td>