diff --git a/scuttle.css b/scuttle.css
index c2baa8f..e229140 100644
--- a/scuttle.css
+++ b/scuttle.css
@@ -346,10 +346,14 @@ form {
 	margin: 0;
 }
 form#search {
-	background: #FFF;
-	color: #555;
-	font-size: small;
-	margin-bottom: 1em;
+       margin-right: 0.75em;
+       color: #CCC;
+       font-size: small;
+       float: right;
+       margin: 0;
+       position: absolute;
+       right: 0;
+       top: 6.4em;
 }
 form label,
 form td,
@@ -376,16 +380,16 @@ p {
     margin: 1em;
 }
 p#sort {
-    color: #CCC;
+    /*color: #CCC;*/
     font-size: small;
-    float: right;
-    margin: 0;
-    position: absolute;
+    /*float: right;*/
+    /*margin: 0;*/
+    /*position: absolute;*/
     right: 0;
     top: 7em;
 }
 html > body p#sort {
-    margin-right: 0.75em;
+    /*margin-right: 0.75em;*/
 }
 p#sort a {
     background: #AAA;
diff --git a/search.inc.php b/search.inc.php
index 1c2cbc3..3900535 100644
--- a/search.inc.php
+++ b/search.inc.php
@@ -37,7 +37,7 @@
         <?php
         }
         ?>
-        <td><input type="text" name="terms" size="50" value="<?php echo filter($terms); ?>" /></td>
+        <td><input type="text" name="terms" size="30" value="<?php echo filter($terms); ?>" /></td>
         <td><input type="submit" value="<?php echo T_('Search' /* Submit button */); ?>" /></td>
     </tr>
     </table>
diff --git a/templates/sidebar.block.profile.php b/templates/sidebar.block.profile.php
index 1b8e915..4fd61ff 100644
--- a/templates/sidebar.block.profile.php
+++ b/templates/sidebar.block.profile.php
@@ -1,11 +1,15 @@
 <?php
+// Menu moved to toolbar.inc.php
+
+/*
 $userservice =& ServiceFactory::getServiceInstance('UserService');
 if (utf8_strlen($userinfo['name']) > 0) {
     $name = $userinfo['name'];
 } else {
     $name = $userinfo['username'];
 }
-?>
+
+
 <h2><?php echo $name; ?></h2>
 <div id="profile">
     <ul>
@@ -14,3 +18,6 @@ if (utf8_strlen($userinfo['name']) > 0) {
         <li><a href="<?php echo createURL('watchlist', $user); ?>"><?php echo T_('Watchlist'); ?></a> &rarr;</li>
     </ul>
 </div>
+
+*/
+?>
diff --git a/templates/toolbar.inc.php b/templates/toolbar.inc.php
index 2eb56ac..916897c 100644
--- a/templates/toolbar.inc.php
+++ b/templates/toolbar.inc.php
@@ -2,14 +2,17 @@
 $userservice =& ServiceFactory::getServiceInstance('UserService');
 if ($userservice->isLoggedOn()) {
     $cUser = $userservice->getCurrentUser();
+    $cUserId = $userservice->getCurrentUserId();
     $cUsername = $cUser[$userservice->getFieldName('username')];
 ?>
 
     <ul id="navigation">
         <li><a href="<?php echo createURL('bookmarks', $cUsername); ?>"><?php echo T_('Bookmarks'); ?></a></li>
+	<li><a href="<?php echo createURL('alltags', $cUsername); ?>"><?php echo T_('Tags'); ?></a></li>
         <li><a href="<?php echo createURL('watchlist', $cUsername); ?>"><?php echo T_('Watchlist'); ?></a></li>
+	<li><a href="<?php echo $userservice->getProfileUrl($cUserId, $cUsername); ?>"><?php echo T_('Profile'); ?></a></li>
         <li><a href="<?php echo createURL('bookmarks', $cUsername . '?action=add'); ?>"><?php echo T_('Add a Bookmark'); ?></a></li>
-        <li class="access"><a href="<?php echo $GLOBALS['root']; ?>?action=logout"><?php echo T_('Log Out'); ?></a></li>
+        <li class="access"><?php echo $cUsername?><a href="<?php echo $GLOBALS['root']; ?>?action=logout">(<?php echo T_('Log Out'); ?>)</a></li>
     </ul>
 
 <?php