-<h2><%=l(:label_custom_field)%> (<%=l(@custom_field.type_name)%>)</h2>
+<h2><%= link_to l(:label_custom_field_plural), :controller => 'custom_fields', :action => 'index', :tab => @custom_field.type %>
+ » <%=h @custom_field.name %> (<%=l(@custom_field.type_name)%>)</h2>
<% labelled_tabular_form_for :custom_field, @custom_field, :url => { :action => "edit", :id => @custom_field } do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %>
-<h2><%=l(:label_custom_field_new)%> (<%=l(@custom_field.type_name)%>)</h2>
+<h2><%= link_to l(:label_custom_field_plural), :controller => 'custom_fields', :action => 'index', :tab => @custom_field.type %>
+ » <%=l(:label_custom_field_new)%> (<%=l(@custom_field.type_name)%>)</h2>
<% labelled_tabular_form_for :custom_field, @custom_field, :url => { :action => "new" } do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %>
-<h2><%=l(:label_enumerations)%></h2>
+<h2><%= link_to l(@enumeration.option_name), :controller => 'enumerations', :action => 'index' %> » <%=h @enumeration %></h2>
<% form_tag({:action => 'update', :id => @enumeration}, :class => "tabular") do %>
<%= render :partial => 'form' %>
-<h2><%= l(@enumeration.option_name) %>: <%=l(:label_enumeration_new)%></h2>
+<h2><%= link_to l(@enumeration.option_name), :controller => 'enumerations', :action => 'index' %> » <%=l(:label_enumeration_new)%></h2>
<% form_tag({:action => 'create'}, :class => "tabular") do %>
<%= render :partial => 'form' %>
-<h2><%=l(:label_issue_status)%></h2>
+<h2><%= link_to l(:label_issue_status_plural), :controller => 'issue_statuses', :action => 'index' %> » <%=h @issue_status %></h2>
<% form_tag({:action => 'update', :id => @issue_status}, :class => "tabular") do %>
<%= render :partial => 'form' %>
-<h2><%=l(:label_issue_status_new)%></h2>
+<h2><%= link_to l(:label_issue_status_plural), :controller => 'issue_statuses', :action => 'index' %> » <%=l(:label_issue_status_new)%></h2>
<% form_tag({:action => 'create'}, :class => "tabular") do %>
<%= render :partial => 'form' %>
-<h2><%=l(:label_role)%>: <%= @role.name %></h2>
+<h2><%= link_to l(:label_role_plural), :controller => 'roles', :action => 'index' %> » <%= @role.name %></h2>
<% labelled_tabular_form_for :role, @role, :url => { :action => 'edit' }, :html => {:id => 'role_form'} do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %>
-<h2><%=l(:label_role_new)%></h2>
+<h2><%= link_to l(:label_role_plural), :controller => 'roles', :action => 'index' %> » <%=l(:label_role_new)%></h2>
<% labelled_tabular_form_for :role, @role, :url => { :action => 'new' }, :html => {:id => 'role_form'} do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %>
-<h2><%=l(:label_permissions_report)%></h2>
+<h2><%= link_to l(:label_role_plural), :controller => 'roles', :action => 'index' %> » <%=l(:label_permissions_report)%></h2>
<% form_tag({:action => 'report'}, :id => 'permissions_form') do %>
<%= hidden_field_tag 'permissions[0]', '', :id => nil %>
-<h2><%=l(:label_tracker)%></h2>
+<h2><%= link_to l(:label_tracker_plural), :controller => 'trackers', :action => 'index' %> » <%=h @tracker %></h2>
<% form_for :tracker, @tracker, :url => { :action => 'edit' }, :builder => TabularFormBuilder do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %>
-<h2><%=l(:label_tracker_new)%></h2>
+<h2><%= link_to l(:label_tracker_plural), :controller => 'trackers', :action => 'index' %> » <%=l(:label_tracker_new)%></h2>
<% form_for :tracker, @tracker, :url => { :action => 'new' }, :builder => TabularFormBuilder do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %>
-<h2><%=l(:label_user_new)%></h2>
+<h2><%= link_to l(:label_user_plural), :controller => 'users', :action => 'index' %> » <%=l(:label_user_new)%></h2>
<% labelled_tabular_form_for :user, @user, :url => { :action => "add" } do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %>
<%= change_status_link(@user) %>
</div>
-<h2><%=l(:label_user)%>: <%=h @user.login %></h2>
+<h2><%= link_to l(:label_user_plural), :controller => 'users', :action => 'index' %> » <%=h @user.login %></h2>
<% selected_tab = params[:tab] ? params[:tab].to_s : user_settings_tabs.first[:name] %>