diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index dbec5ba2..032910eb 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -87,7 +87,8 @@ class PagesController < ApplicationController
   end
    
   def load_orbit_bar
-    render :partial => 'layouts/orbit_bar', :locals => {:referer => request.referer}
+    @referer = request.referer
+    render partial: 'layouts/orbit_bar'
   end
    
   protected
diff --git a/app/views/layouts/_orbit_bar.html.erb b/app/views/layouts/_orbit_bar.html.erb
index 2aa1228f..5fe0ad54 100644
--- a/app/views/layouts/_orbit_bar.html.erb
+++ b/app/views/layouts/_orbit_bar.html.erb
@@ -1,7 +1,7 @@
 <header id="orbit-bar" class="orbit-bar navbar">
   <div class="navbar-inner">
-    <%= render :partial => "layouts/left_menu" %>
-    <%= render :partial => "layouts/right_menu" %>
+    <%= render "layouts/left_menu" %>
+    <%= render "layouts/right_menu" %>
   </div>
 </header>
 
diff --git a/app/views/layouts/_right_menu.html.erb b/app/views/layouts/_right_menu.html.erb
index 9228006f..fba8d449 100644
--- a/app/views/layouts/_right_menu.html.erb
+++ b/app/views/layouts/_right_menu.html.erb
@@ -18,7 +18,7 @@
       <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown"><%= t(:_locale, :locale => I18n.locale) %></a>
       <ul class="dropdown-menu" role="menu" aria-labelledby="orbit-language">
         <% @site_in_use_locales.each do |locale| %>
-          <%= content_tag :li, (link_to t(:_locale, :locale => locale), add_locale(remove_locale((referer rescue request.fullpath)), locale)), :class => (I18n.locale.eql?(locale.to_sym) ? 'active' : nil), tabindex: "-1" %>
+          <%= content_tag :li, (link_to t(:_locale, :locale => locale), add_locale(remove_locale((@referer || request.fullpath)), locale)), :class => (I18n.locale.eql?(locale.to_sym) ? 'active' : nil), tabindex: "-1" %>
         <% end %>
       </ul>
     </li>