diff --git a/rhodecode/templates/changelog/changelog.html b/rhodecode/templates/changelog/changelog.html
--- a/rhodecode/templates/changelog/changelog.html
+++ b/rhodecode/templates/changelog/changelog.html
@@ -74,17 +74,67 @@ ${self.context_bar('changelog')}
                             <div class="date">${h.age(cs.date,True)}</div>
                         </td>
                         <td class="mid">
-                            <div class="message">${h.urlify_commit(cs.message, c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>
-                            <div class="expand"><span class="expandtext">&darr; ${_('Show more')} &darr;</span></div>
-                            %if cs.branch:
-                                <div class="logtags">
-                                    <div class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}">
-                                        ${h.link_to(h.shorter(cs.branch),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
-                                    </div>
+                            <div class="log-container">
+                                <div class="message">${h.urlify_commit(cs.message, c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>
+                                <div class="expand"><span class="expandtext">&darr; ${_('Show more')} &darr;</span></div>
+                                <div class="extra-container">
+                                    %if (not c.branch_name) and cs.branch:
+                                        <div class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}">
+                                            ${h.link_to(h.shorter(cs.branch),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
+                                        </div>
+                                    %endif
+                                    %for book in cs.bookmarks:
+                                        <div class="bookbook" title="${'%s %s' % (_('bookmark'),book)}">
+                                            ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
+                                        </div>
+
+                                    %endfor
+                                    %for tag in cs.tags:
+                                        <div class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">
+                                            ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
+                                        </div>
+                                    %endfor
+                                    %if len(c.comments.get(cs.raw_id,[])) > 0:
+                                        <div class="comments-container">
+                                            <div class="comments-cnt" title="${('comments')}">
+                                                <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">
+                                                    ${len(c.comments[cs.raw_id])}
+                                                </a>
+                                            </div>
+                                        </div>
+                                    %endif
+                                    <%doc>
+                                    %if (h.is_hg(c.rhodecode_repo) and cs.bookmarks) or cs.tags:
+                                        <div class="tagcontainer">
+                                            %if h.is_hg(c.rhodecode_repo):
+                                                <ul class="logtags">
+                                                    ##%if len(cs.parents)>1:
+                                                    ##    <span class="merge">${_('merge')}</span>
+                                                    ##%endif
+                                                    
+                                                   
+                                                    %for book in cs.bookmarks:
+                                                        <li class="bookbook" title="${'%s %s' % (_('bookmark'),book)}">
+                                                            ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
+                                                        </li>
+                                                    %endfor
+                                                   
+                                                </ul>
+                                            %endif
+                                            <ul class="logtags tags">
+                                                %for tag in cs.tags:
+                                                    <li class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">
+                                                        ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
+                                                    </li>
+                                                %endfor
+                                            </ul>
+                                        </div>
+                                    %endif
+                                    </%doc>
                                 </div>
-                            %endif
+                            </div>
                         </td>
-                       
+                       <%doc>
                         <td class="right">
                             <div class="changes">
                                 <div id="changed_total_${cs.raw_id}" style="float:right;" class="changed_total tooltip" title="${h.tooltip(_('Affected number of files, click to show more details'))}">
@@ -114,36 +164,44 @@ ${self.context_bar('changelog')}
                             %else:
                                 <div class="parent">${_('No parents')}</div>
                             %endif
-                            <div class="comments-container">
-                                %if len(c.comments.get(cs.raw_id,[])) > 0:
+                            %if len(c.comments.get(cs.raw_id,[])) > 0:
+                                <div class="comments-container">
                                     <div class="comments-cnt" title="${('comments')}">
                                         <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">
                                             ${len(c.comments[cs.raw_id])}
                                         </a>
                                     </div>
-                                %endif
-                            </div>
-                            <div class="logtags">
-                                %if len(cs.parents)>1:
-                                    <span class="merge">${_('merge')}</span>
-                                %endif
-                                
-                                %if h.is_hg(c.rhodecode_repo):
-                                    %for book in cs.bookmarks:
-                                        <span class="bookbook" title="${'%s %s' % (_('bookmark'),book)}">
-                                            ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
-                                        </span>
-                                  %endfor
-                                %endif
-                                %for tag in cs.tags:
-                                    <span class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">
-                                        ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
-                                    </span>
-                                %endfor
-                            </div>
+                                </div>
+                            %endif
+                            %if (h.is_hg(c.rhodecode_repo) and cs.bookmarks) or cs.tags:
+                                <div class="tagcontainer">
+                                    %if h.is_hg(c.rhodecode_repo):
+                                        <ul class="logtags">
+                                            ##%if len(cs.parents)>1:
+                                            ##    <span class="merge">${_('merge')}</span>
+                                            ##%endif
+                                            
+                                           
+                                            %for book in cs.bookmarks:
+                                                <li class="bookbook" title="${'%s %s' % (_('bookmark'),book)}">
+                                                    ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
+                                                </li>
+                                            %endfor
+                                           
+                                        </ul>
+                                    %endif
+                                    <ul class="logtags tags">
+                                        %for tag in cs.tags:
+                                            <li class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">
+                                                ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
+                                            </li>
+                                        %endfor
+                                    </ul>
+                                </div>
+                            %endif
                         </td>
+                        </%doc>
                     </tr>
-
                 %endfor
                 </tbody>
                 </table>