$NetBSD$

--- ../FreeBSD/webui/templates/paefchen/header.inc.tpl	2011-10-16 00:52:55.000000000 +0000
+++ webui/templates/paefchen/header.inc.tpl
@@ -19,11 +19,6 @@ if (preg_match('@<!-- (\w+):(\w+);(\w+):
 		<div class="left">
 			<h1><a href="index.php"><?php echo $tinderbox_title?></a><?php if (! empty($header_title)) print " - ".$header_title; ?></h1>
 		</div>
-		<div class="right">
-		<?php if (! empty($user_name)) { ?>
-			<h1>Welcome <?php echo $user_name?>!</h1>
-		<?php } ?>
-		</div>
 	</div>
 	<div id="topmenu">
 		<a id="top"></a>
@@ -46,7 +41,7 @@ if (preg_match('@<!-- (\w+):(\w+);(\w+):
 				<li><a href="index.php?action=display_add_user">Add User</a></li>
 	<?php } ?>
 				<li><a href="index.php?action=display_modify_user&amp;modify_user_id=<?php echo $user_id?>">Modify Me</a></li>
-				<li><input type="submit" name="do_logout" value="Logout" /></li>
+				<li><input type="submit" name="do_logout" value="Logout" id="logout_ctrl"/><span id="member"><?php echo $user_name ?></span></li>
 <?php } ?>
 			</ul>	
 			</form>
