diff --git a/index.php b/index.php
index f253ac120..39a73cd26 100644
--- a/index.php
+++ b/index.php
@@ -261,6 +261,11 @@ if ($page['start']==0 and !isset($page['chronology_field']) and !empty($page['co
 // include menubar
 include( PHPWG_ROOT_PATH.'include/menubar.inc.php');
 
+if ( isset($page['category']['count_categories']) and $page['category']['count_categories']==0 )
+{// count_categories might be computed by menubar - if the case unassign flat link if no sub albums
+	$template->clear_assign('U_MODE_FLAT');
+}
+
 //------------------------------------------------------ main part : thumbnails
 if ( 0==$page['start']
     and !isset($page['flat'])
diff --git a/themes/default/iconset.css b/themes/default/iconset.css
index b0452256e..3af5b40ba 100644
--- a/themes/default/iconset.css
+++ b/themes/default/iconset.css
@@ -2,6 +2,7 @@
 	display: inline-block; /*IE6 does not get this correctly*/
 	text-indent: -9999px; overflow: hidden; background-repeat: no-repeat;
 	width: 26px; height: 26px; background-image: url(s26/outline_808080.png);
+	vertical-align: bottom;
 }
 .pwg-button-text { display:none; }
 
@@ -13,7 +14,7 @@
 
 .pwg-button {
 	display: inline-block;
-	vertical-align: middle;
+	vertical-align: top;
 }
 
 .pwg-icon-home {background-position: -26px 0}
diff --git a/themes/default/template/index.tpl b/themes/default/template/index.tpl
index 14d63ab18..aabe8f2b9 100644
--- a/themes/default/template/index.tpl
+++ b/themes/default/template/index.tpl
@@ -51,12 +51,12 @@
 		</a></li>
 {/if}
 {if isset($U_MODE_POSTED)}
-		<li><a href="{$U_MODE_POSTED}" title="{'display a calendar by posted date'|@translate}" class="pwg-state-default pwg-button">
+		<li><a href="{$U_MODE_POSTED}" title="{'display a calendar by posted date'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
 			<span class="pwg-icon pwg-icon-camera-calendar">&nbsp;</span><span class="pwg-button-text">{'Calendar'|@translate}</span>
 		</a></li>
 {/if}
 {if isset($U_MODE_CREATED)}
-		<li><a href="{$U_MODE_CREATED}" title="{'display a calendar by creation date'|@translate}" class="pwg-state-default pwg-button">
+		<li><a href="{$U_MODE_CREATED}" title="{'display a calendar by creation date'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
 			<span class="pwg-icon pwg-icon-camera-calendar">&nbsp;</span><span class="pwg-button-text">{'Calendar'|@translate}</span>
 		</a></li>
 {/if}
diff --git a/themes/default/template/tags.tpl b/themes/default/template/tags.tpl
index 820e3ee69..b0f3f4d64 100644
--- a/themes/default/template/tags.tpl
+++ b/themes/default/template/tags.tpl
@@ -8,7 +8,7 @@
 		</a></li>
 {/if}
 {if $display_mode == 'cloud'}
-		<li><a href="{$U_LETTERS}" title="{'group by letters'|@translate}" class="pwg-state-default pwg-button">
+		<li><a href="{$U_LETTERS}" title="{'group by letters'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
 			<span class="pwg-icon pwg-icon-letters">&nbsp;</span><span class="pwg-button-text">{'letters'|@translate}</span>
 		</a></li>
 {/if}
diff --git a/themes/default/theme.css b/themes/default/theme.css
index e8c62dbe3..2de359b4f 100644
--- a/themes/default/theme.css
+++ b/themes/default/theme.css
@@ -132,11 +132,6 @@
 	display: inline;
 }
 
-/*following rule not used directly but it is there for plugins*/
-.categoryActions IMG {
-	margin-bottom: -5px;
-}
-
 /* begin chronology/calendar elements*/
 .content .calendarViews {
 	display: block;