diff --git a/rhodecode/templates/journal.html b/rhodecode/templates/journal/journal.html
copy from rhodecode/templates/journal.html
copy to rhodecode/templates/journal/journal.html
--- a/rhodecode/templates/journal.html
+++ b/rhodecode/templates/journal/journal.html
@@ -1,5 +1,5 @@
 ## -*- coding: utf-8 -*-
-<%inherit file="base/base.html"/>
+<%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('Journal')} - ${c.rhodecode_name}
 </%def>
@@ -16,38 +16,16 @@
 	    <div class="title">
 	        <h5>${_('Journal')}</h5>
 	    </div>
-	    <div>
-	    %if c.journal_day_aggreagate:
-            %for day,items in c.journal_day_aggreagate:
-            <div style="font-size:20px;padding:10px 5px">${day}</div>
-	            % for entry in items:
-	            <div style="padding:10px">
-	                <div class="gravatar">
-	                    <img alt="gravatar" src="${h.gravatar_url(entry.user.email)}"/>
-	                </div>
-	                <div>${entry.user.name} ${entry.user.lastname}</div>
-	                <div style="padding-left: 45px;padding-top:5px;min-height:20px">${h.action_parser(entry)}</div>
-	                <div style="float: left; padding-top: 8px;padding-left:18px">
-	                ${h.action_parser_icon(entry)}
-	                </div>
-	                <div style="margin-left: 45px;padding-top: 10px">
-	                <span style="font-weight: bold;font-size: 1.1em">
-			        %if entry.repository:
-			          ${h.link_to(entry.repository.repo_name,
-			                      h.url('summary_home',repo_name=entry.repository.repo_name))}
-			        %else:
-			          ${entry.repository_name}
-			        %endif             
-	                </span> - <span title="${entry.action_date}">${h.age(entry.action_date)}</span>
-	                </div>
-	            </div>
-	            <div style="clear:both;border-bottom:1px dashed #DDD;padding:3px 3px;margin:0px 10px 0px 10px"></div>
-	            %endfor
-            %endfor
-        %else:
-            ${_('No entries yet')}
-        %endif   
-	    </div>
+		<script type="text/javascript">
+		function show_more_event(){
+		YUE.on(YUD.getElementsByClassName('show_more'),'click',function(e){
+		    var el = e.target;
+		    YUD.setStyle(YUD.get(el.id.substring(1)),'display','');
+		    YUD.setStyle(el.parentNode,'display','none');
+		});
+		}
+		</script> 	    
+	    <div id="journal">${c.journal_data}</div>
     </div>
     
     <div class="box box-right">
@@ -56,40 +34,31 @@
             <h5>${_('Following')}</h5>
         </div>
         <div>
-        %if c.following:
-            %for entry in c.following:
-                <div class="currently_following">
-                    %if entry.follows_user_id:
-                      <img title="${_('following user')}" alt="${_('user')}" src="/images/icons/user.png"/>
-                      ${entry.follows_user.full_contact}
-                    %endif
-                    
-                    %if entry.follows_repo_id:
-                    
-                      %if entry.follows_repository.private:
-                        <img class="icon" title="${_('private repository')}" alt="${_('private repository')}" src="/images/icons/lock.png"/>
-                      %else:
-                        <img class="icon" title="${_('public repository')}" alt="${_('public repository')}" src="/images/icons/lock_open.png"/>
-                      %endif
-                      
-                      ${h.link_to(entry.follows_repository.repo_name,h.url('summary_home',
-                        repo_name=entry.follows_repository.repo_name))}
-                      
-                    %endif
-                </div>
-            %endfor
-        %else:
-            ${_('You are not following any users or repositories')}
-        %endif               
+		%if c.following:
+		    %for entry in c.following:
+		        <div class="currently_following">
+		            %if entry.follows_user_id:
+		              <img title="${_('following user')}" alt="${_('user')}" src="/images/icons/user.png"/>
+		              ${entry.follows_user.full_contact}
+		            %endif
+		            
+		            %if entry.follows_repo_id:
+		            
+		              %if entry.follows_repository.private:
+		                <img class="icon" title="${_('private repository')}" alt="${_('private repository')}" src="/images/icons/lock.png"/>
+		              %else:
+		                <img class="icon" title="${_('public repository')}" alt="${_('public repository')}" src="/images/icons/lock_open.png"/>
+		              %endif
+		              
+		              ${h.link_to(entry.follows_repository.repo_name,h.url('summary_home',
+		                repo_name=entry.follows_repository.repo_name))}
+		              
+		            %endif
+		        </div>
+		    %endfor
+		%else:
+		    ${_('You are not following any users or repositories')}
+		%endif
         </div>
-    </div>
-    
-    <script type="text/javascript">
-    YUE.on(YUD.getElementsByClassName('show_more'),'click',function(e){
-        var el = e.target;
-        YUD.setStyle(YUD.get(el.id.substring(1)),'display','');
-        YUD.setStyle(el.parentNode,'display','none');
-    });    
-    </script>
-    
+    </div>    
 </%def>