diff --git a/app/views/admin/dmptemplates/settings.html.erb b/app/views/admin/dmptemplates/settings.html.erb
index 171d5bc..c955083 100644
--- a/app/views/admin/dmptemplates/settings.html.erb
+++ b/app/views/admin/dmptemplates/settings.html.erb
@@ -4,15 +4,15 @@
 
 <%= form_for(@settings, url: update_settings_admin_dmptemplate_path(@template), method: :put, as: 'settings[export][formatting]', html: { class: 'formtastic' }) do |f| %>
   <fieldset class="inputs">
-    <legend><span><%= t("admin.formatting")%></span></legend>
+    <legend><span><%= _('Formatting') %></span></legend>
     <ol>
       <li>
-        <%= f.label(:font_face, t('helpers.settings.plans.font_face')) %>
+        <%= f.label(:font_face, _('Face')) %>
         <%= f.select(:font_face, options_for_select(Settings::Dmptemplate::VALID_FONT_FACES, @settings.formatting[:font_face]), as: 'formatting[font_face]') %>
         <%= f.select(:font_size, options_for_select((1..36).to_a, @settings.formatting[:font_size])) %>pt
       </li>
       <li>
-        <%= f.label(t('helpers.settings.plans.margin')) %>
+        <%= f.label(_('Margin')) %>
 				<% ["top", "bottom", "left", "right"].each do |pos| %>
         	<span><%= t("helpers.settings.plans.margins.#{pos}") -%></span>
         	<%= select_tag("settings[export][formatting][margin][#{pos}]", options_for_select((0..100).to_a, @settings.formatting[:margin][pos])) %>
@@ -22,17 +22,17 @@
   </fieldset>
 
   <fieldset class="inputs">
-    <legend><span><%= t("admin.max_pages")%></span></legend>
+    <legend><span><%= _('Max Pages')%></span></legend>
     <ol>
       <li>
-        <%= label_tag('settings_export_max_pages', t('helpers.settings.plans.max_pages')) %>
+        <%= label_tag('settings_export_max_pages', _('Maximum number of pages')) %>
         <%= select_tag('settings[export][max_pages]', options_for_select((1..10).to_a, @settings.max_pages)) %>
       </li>
     </ol>
   </fieldset>
 
   <fieldset class="actions">
-    <%= submit_tag(t('helpers.save'), class: 'btn btn-primary') %>
-    <%= submit_tag(t('helpers.settings.plans.reset'), class: 'btn btn-primary') %>
+    <%= submit_tag(_('Save'), class: 'btn btn-primary') %>
+    <%= submit_tag(_('Reset'), class: 'btn btn-primary') %>
   </fieldset>
 <% end %>
diff --git a/app/views/layouts/_navigation.html.erb b/app/views/layouts/_navigation.html.erb
index 15d8c1d..5400e0d 100644
--- a/app/views/layouts/_navigation.html.erb
+++ b/app/views/layouts/_navigation.html.erb
@@ -19,12 +19,8 @@
           </li>
       <% end %>
       <% if current_user.can_grant_permissions? %>
-        <% if current_path == "/org/admin/users/admin_index" || current_path == "/org/admin/users/admin_api_update" then %>
-          <li class="active">
-        <% else %>
-          <li>
-        <% end %>
-          <%= link_to _('Users'), "/org/admin/users/admin_index", class: "main_nav_last_li"%>
+          <li <%= 'class=active' if isActivePage(admin_index_users_path) %>>
+            <%= link_to _('Users'), admin_index_users_path, class: 'main_nav_last_li' %>
           </li>
       <% end %>
     <% else %>