diff --git a/css/bookmarks.css b/css/bookmarks.css
index 8dfdc8a0..499a4e9c 100644
--- a/css/bookmarks.css
+++ b/css/bookmarks.css
@@ -1,4 +1,7 @@
-#content { overflow: auto; }
+#content { overflow: auto; height: 100%; }
+#firstrun { width: 80%; margin: 5em auto auto auto; text-align: center; font-weight:bold; font-size:1.5em;  color:#777;}
+#firstrun small { display: block; font-weight: normal; font-size: 0.5em; }
+#firstrun #selections { font-size:0.8em;  width: 100%; margin: 2em auto auto auto; clear: both; }
 
 .bookmarks_headline {
 	font-size: large;
diff --git a/js/bookmarks.js b/js/bookmarks.js
index fadbbd55..328f88a4 100644
--- a/js/bookmarks.js
+++ b/js/bookmarks.js
@@ -35,6 +35,7 @@ function getBookmarks() {
 	
 			for(var i in bookmarks.data) {
 				updateBookmarksList(bookmarks.data[i]);
+				$("#firstrun").hide();
 			}
 
 			$('.bookmark_link').click(recordClick);
@@ -71,6 +72,8 @@ function addOrEditBookmark(event) {
 	var tags = encodeEntities($('#bookmark_add_tags').val());
 	var taglist = tags.split(' ');
 	var tagshtml = '';
+	$("#firstrun").hide();
+
 	for ( var i=0, len=taglist.length; i<len; ++i ){
 		tagshtml += '<a class="bookmark_tag" href="?tag=' + encodeURI(taglist[i]) + '">' + taglist[i] + '</a> ';
 	}
diff --git a/templates/list.php b/templates/list.php
index d44a0ecb..bd33fe45 100644
--- a/templates/list.php
+++ b/templates/list.php
@@ -21,9 +21,11 @@
 	<p><label class="bookmarks_label"></label><input type="submit" value="<?php echo $l->t('Add bookmark'); ?>" id="bookmark_add_submit" /></p>
 </div>
 <div class="bookmarks_list">
+</div>
+<div id="firstrun">
 	<?php echo $l->t('You have no bookmarks'); ?>
-</div>
-<div id="footer">
-Bookmark pages more easily. Drag this bookmarklet to the Bookmarks bar of your browser:
-<a style='background-color:#dddddd;border:1px groove #999; padding:5px;padding-top:0px;padding-bottom:2px; text-decoration:none; margin-top:5px' href='javascript:(function(){var a=window,b=document,c=encodeURIComponent,d=a.open("<?php echo OC_Helper::linkToAbsolute('bookmarks', 'addBm.php') ?>?output=popup&url="+c(b.location)+"&title="+c(b.title),"bkmk_popup","left="+((a.screenX||a.screenLeft)+10)+",top="+((a.screenY||a.screenTop)+10)+",height=510px,width=550px,resizable=1,alwaysRaised=1");a.setTimeout(function(){d.focus()},300)})();'>ownCloud bookmark</a>
+	<small><?php echo $l->t('Drag this to your browser bookmarks and click it, when you want to bookmark a webpage.'); ?></small>
+	<div id="selections">
+		<a class="button" href='javascript:(function(){var a=window,b=document,c=encodeURIComponent,d=a.open("<?php echo OC_Helper::linkToAbsolute('bookmarks', 'addBm.php') ?>?output=popup&url="+c(b.location)+"&title="+c(b.title),"bkmk_popup","left="+((a.screenX||a.screenLeft)+10)+",top="+((a.screenY||a.screenTop)+10)+",height=510px,width=550px,resizable=1,alwaysRaised=1");a.setTimeout(function(){d.focus()},300)})();'><?php echo $l->t('Add page to ownCloud'); ?></a>
+	</div>
 </div>
diff --git a/templates/settings.php b/templates/settings.php
index a985ee9d..41433d84 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -8,7 +8,7 @@
 ?>
 <form id="bookmarks">
 		<fieldset class="personalblock">
-			<span class="bold"><?php echo $l->t('Bookmarklet:');?></span>&nbsp;<a class="bookmarks_addBml" href="javascript:(function(){url=encodeURIComponent(location.href);window.open('<?php echo OC_Helper::linkToAbsolute('bookmarks', 'addBm.php'); ?>?url='+url, 'owncloud-bookmarks') })()"><?php echo $l->t('Add page to ownCloud'); ?></a>
+			<span class="bold"><?php echo $l->t('Bookmarklet:');?></span>&nbsp;<a class="bookmarks_addBml" href='javascript:(function(){var a=window,b=document,c=encodeURIComponent,d=a.open("<?php echo OC_Helper::linkToAbsolute('bookmarks', 'addBm.php') ?>?output=popup&url="+c(b.location)+"&title="+c(b.title),"bkmk_popup","left="+((a.screenX||a.screenLeft)+10)+",top="+((a.screenY||a.screenTop)+10)+",height=510px,width=550px,resizable=1,alwaysRaised=1");a.setTimeout(function(){d.focus()},300)})();'><?php echo $l->t('Add page to ownCloud'); ?></a>
 			<br/><em><?php echo $l->t('Drag this to your browser bookmarks and click it, when you want to bookmark a webpage.'); ?></em><br />
 		</fieldset>
 </form>