diff --git a/app/views/layouts/admin/application.haml b/app/views/layouts/admin/application.haml
index 7ae2e84c9..92c28d24b 100644
--- a/app/views/layouts/admin/application.haml
+++ b/app/views/layouts/admin/application.haml
@@ -29,30 +29,30 @@
         .navbar-collapse.collapse
           %ul.nav.navbar-nav
             - if can? :show, Domain
-              %li= link_to t('domains'), admin_domains_path
+              %li= link_to t(:domains), admin_domains_path
             - if can? :show, Contact
-              %li= link_to t('contacts'), admin_contacts_path
+              %li= link_to t(:contacts), admin_contacts_path
             - if can? :show, Registrar
-              %li= link_to t('registrars'), admin_registrars_path
+              %li= link_to t(:registrars), admin_registrars_path
             - if can? :show, Keyrelay
-              %li= link_to t('keyrelays'), admin_keyrelays_path
+              %li= link_to t(:keyrelays), admin_keyrelays_path
             - if can?(:access, :settings_menu)
               %li.dropdown
                 %a.dropdown-toggle{"data-toggle" => "dropdown", href: "#"}
-                  = t('settings')
+                  = t(:settings)
                   %span.caret
                 %ul.dropdown-menu{role: "menu"}
-                  %li.dropdown-header= t('users')
+                  %li.dropdown-header= t(:users)
                   %li= link_to t(:api_users), admin_api_users_path
                   %li= link_to t(:admin_users), admin_admin_users_path
                   %li.divider
-                  %li.dropdown-header= t('billing')
-                  %li= link_to t('bank_statements'), admin_bank_statements_path
-                  %li= link_to t('invoices'), admin_invoices_path
+                  %li.dropdown-header= t(:billing)
+                  %li= link_to t(:bank_statements), admin_bank_statements_path
+                  %li= link_to t(:invoices), admin_invoices_path
                   %li.divider
-                  %li.dropdown-header= t('system')
-                  %li= link_to t('settings'), admin_settings_path
-                  %li= link_to t('zonefile'), admin_zonefile_settings_path
+                  %li.dropdown-header= t(:system)
+                  %li= link_to t(:settings), admin_settings_path
+                  %li= link_to t(:zonefile), admin_zonefile_settings_path
                   -# %li= link_to t(:domains_history), admin_domain_versions_path
                   %li= link_to t(:epp_logs), admin_epp_logs_path
                   %li= link_to t(:repp_logs), admin_repp_logs_path
@@ -60,11 +60,10 @@
 
           - if signed_in?
             %ul.nav.navbar-nav.navbar-right
-              %li= link_to t('log_out', user: current_user), '/admin/logout'
+              %li= link_to t(:log_out, user: current_user), '/admin/logout'
 
-        / /.nav-collapse
     .container
-      = render 'registrar/shared/flash'
+      = render 'shared/flash'
       = yield
 
       .footer.text-right
diff --git a/app/views/layouts/registrar/application.haml b/app/views/layouts/registrar/application.haml
index 4eec521ba..def11ac31 100644
--- a/app/views/layouts/registrar/application.haml
+++ b/app/views/layouts/registrar/application.haml
@@ -39,7 +39,7 @@
 
               - if can? :show, Invoice
                 - active_class = ['registrar/invoices'].include?(params[:controller]) ? 'active' :nil
-                %li{class: active_class}= link_to t('billing'), registrar_invoices_path
+                %li{class: active_class}= link_to t(:billing), registrar_invoices_path
 
               - if can? :view, :registrar_xml_console
                 - active_class = ['registrar/xml_consoles'].include?(params[:controller]) ? 'active' :nil
@@ -47,15 +47,14 @@
 
             %ul.nav.navbar-nav.navbar-right
               - if user_signed_in?
-                %li= link_to t('log_out', user: current_user), '/registrar/logout'
-        / /.nav-collapse
-    / Begin page content
+                %li= link_to t(:log_out, user: current_user), '/registrar/logout'
+
     .container
-      = render 'registrar/shared/flash'
+      = render 'shared/flash'
       - if depp_controller?
         = render 'registrar/shared/epp_results'
-
       = yield
+
     %footer.footer
       .container
         %row
diff --git a/app/views/registrar/shared/_flash.haml b/app/views/shared/_flash.haml
similarity index 100%
rename from app/views/registrar/shared/_flash.haml
rename to app/views/shared/_flash.haml