diff --git a/admin/comments.php b/admin/comments.php
index 770a3f5..b804574 100644
--- a/admin/comments.php
+++ b/admin/comments.php
@@ -93,7 +93,7 @@ if ($isAdmin) {
 		<div id="div-process" style="display:none;"><?=__("Processing request&hellip;");?></div>
 		<div id="cont">
 			<div id="head">
-				<h1><a href="<?php echo $conf->urlGelato;?>/" title="gelato :: <?=__("home")?>">gelato cms</a></h1>
+				<h1><a href="<?php echo $conf->urlGelato;?>/admin/index.php" title="gelato :: <?=__("home")?>">gelato cms</a></h1>
 				<ul id="nav">
 					<li><a href="<?php echo $conf->urlGelato;?>/" title="<?=__("Take me to the tumblelog")?>"><?=__("Back to the Tumblelog")?></a></li>
 			  	</ul>
diff --git a/admin/css/style.css b/admin/css/style.css
index 9729eb3..0824191 100644
--- a/admin/css/style.css
+++ b/admin/css/style.css
@@ -61,6 +61,8 @@ body{ background: #fff; text-align:center; font-family:"Trebuchet Ms", Verdana,
 
 .manage li a{ padding:14px 6px 0 6px;}
 
+#context_help{ display:block; margin:0; padding:5px; position: absolute; border: 1px solid #222; background-color: #444; color:#fff; font-size: 12px;}
+
 form.newpost{ width:500px; margin:0 auto; padding:0;}
 form.newpost ul{ list-style-type:none; margin:20px 0 10px 0; padding:0;}
 form.newpost li{ margin:4px 0; padding:0; position:relative;}
diff --git a/admin/feeds.php b/admin/feeds.php
index addcdc7..fc2b9fe 100644
--- a/admin/feeds.php
+++ b/admin/feeds.php
@@ -75,7 +75,7 @@ if ($user->isAdmin()) {
 	<body>
 		<div id="cont">
 			<div id="head">
-				<h1><a href="<?php echo $conf->urlGelato;?>/" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
+				<h1><a href="<?php echo $conf->urlGelato;?>/admin/index.php" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
 				<ul id="nav">
 					<li><a href="<?php echo $conf->urlGelato;?>/" title="<?php echo __("Take me to the tumblelog")?>"><?php echo __("Back to the Tumblelog")?></a></li>
 			  	</ul>
diff --git a/admin/options.php b/admin/options.php
index f26c4a9..0ee7a19 100644
--- a/admin/options.php
+++ b/admin/options.php
@@ -88,7 +88,7 @@ if ($user->isAdmin()) {
 		<div id="div-process" style="display:none;"><?php echo __("Processing request&hellip;")?></div>
 		<div id="cont">
 			<div id="head">
-				<h1><a href="<?php echo $conf->urlGelato;?>/" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
+				<h1><a href="<?php echo $conf->urlGelato;?>/admin/index.php" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
 				<ul id="nav">
 					<li><a href="<?php echo $conf->urlGelato;?>/" title="<?php echo __("Take me to the tumblelog")?>"><?php echo __("Back to the Tumblelog")?></a></li>
 			  	</ul>
diff --git a/admin/scripts/tools.js b/admin/scripts/tools.js
index 34edae5..97275d9 100644
--- a/admin/scripts/tools.js
+++ b/admin/scripts/tools.js
@@ -56,3 +56,22 @@ function selectFeedType(feed_url,username){
 			$('#url_label').text(feed_url);
 		}
 }
+
+$(function(){
+	
+	// Fancy tooltip 
+	var t = '';
+	$(".help").hover(function(e){
+		t = $(this).attr('title');
+		$(this).removeAttr('title').animate({opacity:1.0},500,function(){
+			if($("#context_help").get().length < 1){
+				$('.box:last').append('<div id="context_help"></div>');
+			}
+			$('#context_help').hide().html(t).css({left:e.pageX, top:e.pageY + 20}).fadeIn('slow');
+		});
+	},function(){
+		$(this).stop().attr('title',t);
+		$('#context_help').fadeOut('fast', function(){$(this).css({left:0, top:0})});
+	});
+	
+});
\ No newline at end of file
diff --git a/admin/settings.php b/admin/settings.php
index 91a6abc..4b1b3cf 100644
--- a/admin/settings.php
+++ b/admin/settings.php
@@ -46,7 +46,7 @@ if ($user->isAdmin()) {
 		<div id="div-process" style="display:none;"><?php echo __("Processing request&hellip;")?></div>
 		<div id="cont">
 			<div id="head">
-				<h1><a href="<?php echo $conf->urlGelato;?>/" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
+				<h1><a href="<?php echo $conf->urlGelato;?>/admin/index.php" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
 				<ul id="nav">
 					<li><a href="<?php echo $conf->urlGelato;?>/" title="<?php echo __("Take me to the tumblelog")?>"><?php echo __("Back to the Tumblelog")?></a></li>
 			  	</ul>
diff --git a/admin/themes/admin/index.htm b/admin/themes/admin/index.htm
index 793983e..10e5d8b 100644
--- a/admin/themes/admin/index.htm
+++ b/admin/themes/admin/index.htm
@@ -352,10 +352,10 @@
 										&lt;code&gt; &lt;pre&gt; &lt;img&gt;
 									</code>
 									<br /><br />
-					                                Bookmarklet - <a class="bookmarklet" title="{__("Drag to the Bookmarks Toolbar")}" href="javascript:var w; setTimeout('w.focus()',100);w=window.open('{conf.urlGelato}/admin/bm.php?url='+encodeURIComponent(location.href)+'&sel='+encodeURIComponent(window.getSelection()),'bookmarklet','toolbar=0,resizable=0,status=1,width=650,height=540,dependent=yes' ); w.focus();">{__("add to gelato")}</a>
-		                			                <br /><br />
-                       				         	</span>
-                			                </p>
+									Bookmarklet - <a class="bookmarklet help" title="{__("Drag to the Bookmarks Toolbar")}" href="javascript:var w; setTimeout('w.focus()',100);w=window.open('{conf.urlGelato}/admin/bm.php?url='+encodeURIComponent(location.href)+'&sel='+encodeURIComponent(window.getSelection()),'bookmarklet','toolbar=0,resizable=0,status=1,width=650,height=540,dependent=yes' ); w.focus();">{__("add to gelato")}</a>
+										<br /><br />
+									</span>
+								</p>
 							<p>
 								<input class="btn" type="submit" name="btnAdd" value="{if {$isEdition}}Modify{else}Create{/if} post" />
 							</p>
@@ -379,7 +379,7 @@
 						{if {$Posts_Number}}
 							{block {$rows} as {$row}}
 								<div class="entry">
-									<div class="info"><span class="compact"><a href="{$row.Permalink}">Link</a>&nbsp;<a href="{conf.urlGelato}/admin/index.php?edit={$row.Id_Post}"><img src="{conf.urlGelato}/admin/css/images/edit.png" alt="" title="" /></a>&nbsp;<a href="{conf.urlGelato}/admin/index.php?delete={$row.Id_Post}"><img src="{conf.urlGelato}/admin/css/images/delete.png" alt="" title="" /></a></span>
+									<div class="info"><span class="compact"><a href="{$row.Permalink}">Link</a>&nbsp;<a href="{conf.urlGelato}/admin/index.php?edit={$row.Id_Post}" title="{__('Edit this post')}" class="help"><img src="{conf.urlGelato}/admin/css/images/edit.png" alt=""/></a>&nbsp;<a href="{conf.urlGelato}/admin/index.php?delete={$row.Id_Post}" title="{__('Delete this post')}" class="help"><img src="{conf.urlGelato}/admin/css/images/delete.png" alt="" title="" /></a></span>
 										<p>{$row.Date_Added}</p>
 									</div>
 									<div class="post">
diff --git a/admin/user.php b/admin/user.php
index 82931b8..d7f6d02 100644
--- a/admin/user.php
+++ b/admin/user.php
@@ -63,7 +63,7 @@ if ($user->isAdmin()) {
 		<div id="div-process" style="display:none;"><?php echo __("Processing request&hellip;");?></div>
 		<div id="cont">
 			<div id="head">
-				<h1><a href="<?php echo $conf->urlGelato;?>/" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
+				<h1><a href="<?php echo $conf->urlGelato;?>/admin/index.php" title="gelato :: <?php echo __("home")?>">gelato cms</a></h1>
 				<ul id="nav">
 					<li><a href="<?php echo $conf->urlGelato;?>/" title="<?php echo __("Take me to the tumblelog")?>"><?php echo __("Back to the Tumblelog")?></a></li>
 			  	</ul>