diff --git a/event/listener.php b/event/listener.php
index f15aa27..ef13edb 100644
--- a/event/listener.php
+++ b/event/listener.php
@@ -91,7 +91,7 @@ public function load_language_on_setup($event)
 
 	public function get_topic_data($event)
 	{
-		if ($this->user->data['is_registered'] && $this->config['allow_bookmarks'])
+		if ($this->user->data['is_registered']&& !$this->user->data['is_bot'])
 		{
 			$topic_data = $event['topic_data'];
 			$posts_bookmark = array();
@@ -118,7 +118,7 @@ public function get_topic_data($event)
 
 	public function modify_post_row($event)
 	{
-		if ($this->user->data['is_registered'] && $this->config['allow_bookmarks'])
+		if ($this->user->data['is_registered'] && !$this->user->data['is_bot'])
 		{
 			$row = $event['row'];
 			$post_row = $event['post_row'];
diff --git a/styles/prosilver/template/ucp_postbookmark_body.html b/styles/prosilver/template/ucp_postbookmark_body.html
index 6234ae2..9ddc421 100644
--- a/styles/prosilver/template/ucp_postbookmark_body.html
+++ b/styles/prosilver/template/ucp_postbookmark_body.html
@@ -12,18 +12,17 @@ <h2>{L_UCP_POSTBOOKMARK}</h2>
 <!-- IF S_NO_DISPLAY_BOOKMARKS -->
 	<p class="error">{L_BOOKMARKS_DISABLED}</p>
 <!-- ELSE -->
-
 <!-- IF .postrow -->
-	<ul class="topiclist">
+	<ul class="topiclist missing-column">
 		<li class="header">
-			<dl class="icon">
-				<dt>{L_BOOKMARKS}</dt>
-				<dd class="lastpost"><span>{L_COMMENT}</span></dd>
+			<dl>
+				<dt><div class="list-inner">{L_BOOKMARKS}</div></dt>
+				<dd class="info"><span>{L_COMMENT}</span></dd>
 				<dd class="mark">{L_MARK}</dd>
 			</dl>
 		</li>
 	</ul>
-	<ul class="topiclist cplist">
+	<ul class="topiclist cplist missing-column">
 
 	<!-- BEGIN postrow -->
 		<li class="row<!-- IF postrow.S_POST_REPORTED --> reported<!-- ELSEIF postrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
@@ -34,14 +33,16 @@ <h2>{L_UCP_POSTBOOKMARK}</h2>
 			<!-- ELSE -->
 			<dl>
 				<dt>
-					<div class="list-inner with-mark">
-						<a href="{postrow.U_VIEW_POST}" class="topictitle">{postrow.POST_TITLE}</a><br />
-						{L_POST_BY_AUTHOR} {postrow.TOPIC_AUTHOR} &raquo; {postrow.POST_TIME}
+					<div class="list-inner">
+						<a class="topictitle" href="{postrow.U_VIEW_POST}">{postrow.POST_TITLE}</a><br />
+						{L_POST_BY_AUTHOR}{L_COLON} {postrow.TOPIC_AUTHOR} &raquo; {postrow.POST_TIME}
+						<div class="responsive-show" style="display: none;">
+							{L_COMMENT}{L_COLON} {postrow.BOOKMARK_DESC}<br />
+							{L_ADDED}{L_COLON} {postrow.BOOKMARK_TIME}
+						</div>
 					</div>
 				</dt>
-				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn> {postrow.BOOKMARK_DESC}
-					<br />{L_ADDED}&raquo; {postrow.BOOKMARK_TIME}</span>
-				</dd>
+				<dd class="info"><span>{L_COMMENT}{L_COLON} {postrow.BOOKMARK_DESC}<br />{L_ADDED}{L_COLON} {postrow.BOOKMARK_TIME}</span></dd>
 				<dd class="mark"><input type="checkbox" name="t[{postrow.POST_ID}]" id="t{postrow.POST_ID}" /></dd>
 			</dl>
 			<!-- ENDIF -->