diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 98a77263f..ecae745d4 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,12 +1,12 @@
 module ApplicationHelper
-  def menu_item where
-    if where[:controller] == root_path
-      destination = root_path
-    else
-      destination = (root_path = "/" ? where[:controller] : root_path + "/" + where[:controller])
+  def menu_item title, where
+    li_class = ""
+    link = link_to_unless_current(title, where) do
+      li_class = " class=\"topmenu-active\""
+      title
     end
-
-    "<li class=\"#{"topmenu-active" if is_current_menu_item?(where[:controller])}\">#{link_to(where[:title], destination)}</li>"
+    "<li#{li_class}>#{link}</li>"
+    #"<li class=\"#{"topmenu-active" if is_current_menu_item?(where[:controller])}\">#{link_to(where[:title], destination)}</li>"
   end
 
   def tab_link tab
@@ -141,4 +141,16 @@ def is_current_menu_item? item
   def is_current_tab? tab
     true if params[:action] == tab.downcase
   end
+  
+  def current_page
+    params[:page].blank? ? 1 : params[:page].to_i
+  end
+  
+  def next_page
+    current_page + 1
+  end
+  
+  def previous_page
+    current_page <= 2 ? 1 : current_page - 1
+  end
 end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index f53c080dc..e96ee738c 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -36,12 +36,12 @@
     </div>
     <%= link_to image_tag("graylog.png", :id => "toplogo"), (permitted_to?(:index, :messages) ? messages_path : streams_path)%>
     <ul id="topmenu">
-      <% permitted_to? :index, :messages do %><%=raw menu_item({ :title => "Messages", :controller => "messages" }) %><% end %>
-      <% permitted_to? :index, :streams do %><%=raw menu_item({ :title => "Streams", :controller => "streams" }) %><% end %>
-      <% permitted_to? :index, :hosts do %><%=raw menu_item({ :title => "Hosts", :controller => "hosts" }) %><% end %>
-      <% permitted_to? :index, :blacklists do %><%=raw menu_item({ :title => "Blacklists", :controller => "blacklists" }) %><% end %>
-      <% permitted_to? :index, :settings do %><%=raw menu_item({ :title => "Settings", :controller => "settings" }) %><% end %>
-      <% permitted_to? :index, :users do %><%=raw menu_item({ :title => "Users", :controller => "users" }) %><% end %>
+      <% permitted_to? :index, :messages do %><%=raw menu_item("Messages", messages_path) %><% end %>
+      <% permitted_to? :index, :streams do %><%=raw menu_item("Streams", streams_path) %><% end %>
+      <% permitted_to? :index, :hosts do %><%=raw menu_item("Hosts", hosts_path) %><% end %>
+      <% permitted_to? :index, :blacklists do %><%=raw menu_item("Blacklists", {:controller => :blacklists}) %><% end %>
+      <% permitted_to? :index, :settings do %><%=raw menu_item("Settings", {:controller => :settings}) %><% end %>
+      <% permitted_to? :index, :users do %><%=raw menu_item("Users", {:controller => :users}) %><% end %>
     </ul>
 
     <% message_count_interval = Setting.get_message_count_interval(current_user) %>
diff --git a/app/views/messages/_table.html.erb b/app/views/messages/_table.html.erb
index 10c1cf623..2f401ea5f 100644
--- a/app/views/messages/_table.html.erb
+++ b/app/views/messages/_table.html.erb
@@ -33,20 +33,14 @@
   </tbody>
 </table>
 
-<%
-  params[:page].blank? ? current_page = 1 : current_page = params[:page].to_i;
-  next_page = current_page+1;
-  current_page <= 1 ? previous_page = 1 : previous_page = current_page-1;
-%>
-
 <% unless defined? @inline_version %>
 <div id="messages-bottom">
   <% unless current_page <= 1 %>
-    <a href="<%=h build_controller_action_uri 'page' %><%= previous_page %>" class="previous-page">previous page</a>
+    <%= link_to "previous page", {:page => previous_page}, {:class => "previous-page"} %>
   <% end %>
 
   <% if total_messages > (Message::LIMIT*current_page) %>
-    <a href="<%=h build_controller_action_uri 'page' %><%= next_page  %>" class="next-page">next page</a>
+    <%= link_to "next page", {:page => next_page}, {:class => "next-page"} %>
   <% end %>
 </div>
 
diff --git a/app/views/streams/show.html.erb b/app/views/streams/show.html.erb
index 9cc0d2a74..f5125e5cd 100644
--- a/app/views/streams/show.html.erb
+++ b/app/views/streams/show.html.erb
@@ -70,7 +70,7 @@
 </div>
 
 <a href="#" id="streams-show-statistics">&raquo; Show statistics</a>
-
+<%= link_to raw("&raquo; back"), :back %>
 <div id="blocks-statistics" style="display: none;">
   <div class="loading"></div>
 </div>