diff --git a/app/views/custom_fields/edit.rhtml b/app/views/custom_fields/edit.rhtml
index ef056fa4..8ca7e33b 100644
--- a/app/views/custom_fields/edit.rhtml
+++ b/app/views/custom_fields/edit.rhtml
@@ -1,4 +1,5 @@
-<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 %> 
+  &#187; <%=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 } %>
diff --git a/app/views/custom_fields/new.rhtml b/app/views/custom_fields/new.rhtml
index 2e8aa275..14a35b1f 100644
--- a/app/views/custom_fields/new.rhtml
+++ b/app/views/custom_fields/new.rhtml
@@ -1,4 +1,5 @@
-<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 %>
+  &#187; <%=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 } %>
diff --git a/app/views/enumerations/edit.rhtml b/app/views/enumerations/edit.rhtml
index 7baea028..5a292550 100644
--- a/app/views/enumerations/edit.rhtml
+++ b/app/views/enumerations/edit.rhtml
@@ -1,4 +1,4 @@
-<h2><%=l(:label_enumerations)%></h2>
+<h2><%= link_to l(@enumeration.option_name), :controller => 'enumerations', :action => 'index' %> &#187; <%=h @enumeration %></h2>
 
 <% form_tag({:action => 'update', :id => @enumeration}, :class => "tabular") do %>
   <%= render :partial => 'form' %>
diff --git a/app/views/enumerations/new.rhtml b/app/views/enumerations/new.rhtml
index 5c2ccd13..34882834 100644
--- a/app/views/enumerations/new.rhtml
+++ b/app/views/enumerations/new.rhtml
@@ -1,4 +1,4 @@
-<h2><%= l(@enumeration.option_name) %>: <%=l(:label_enumeration_new)%></h2>
+<h2><%= link_to l(@enumeration.option_name), :controller => 'enumerations', :action => 'index' %> &#187; <%=l(:label_enumeration_new)%></h2>
 
 <% form_tag({:action => 'create'}, :class => "tabular") do %>
   <%= render :partial => 'form' %>
diff --git a/app/views/issue_statuses/edit.rhtml b/app/views/issue_statuses/edit.rhtml
index b81426a0..4120ad34 100644
--- a/app/views/issue_statuses/edit.rhtml
+++ b/app/views/issue_statuses/edit.rhtml
@@ -1,4 +1,4 @@
-<h2><%=l(:label_issue_status)%></h2>
+<h2><%= link_to l(:label_issue_status_plural), :controller => 'issue_statuses', :action => 'index' %> &#187; <%=h @issue_status %></h2>
 
 <% form_tag({:action => 'update', :id => @issue_status}, :class => "tabular") do %>
   <%= render :partial => 'form' %>
diff --git a/app/views/issue_statuses/new.rhtml b/app/views/issue_statuses/new.rhtml
index ede1699b..bc74c8dc 100644
--- a/app/views/issue_statuses/new.rhtml
+++ b/app/views/issue_statuses/new.rhtml
@@ -1,4 +1,4 @@
-<h2><%=l(:label_issue_status_new)%></h2>
+<h2><%= link_to l(:label_issue_status_plural), :controller => 'issue_statuses', :action => 'index' %> &#187; <%=l(:label_issue_status_new)%></h2>
 
 <% form_tag({:action => 'create'}, :class => "tabular") do %>
   <%= render :partial => 'form' %>
diff --git a/app/views/roles/edit.rhtml b/app/views/roles/edit.rhtml
index e53a0f54..df3a4f32 100644
--- a/app/views/roles/edit.rhtml
+++ b/app/views/roles/edit.rhtml
@@ -1,4 +1,4 @@
-<h2><%=l(:label_role)%>: <%= @role.name %></h2> 
+<h2><%= link_to l(:label_role_plural), :controller => 'roles', :action => 'index' %> &#187; <%= @role.name %></h2> 
 
 <% labelled_tabular_form_for :role, @role, :url => { :action => 'edit' }, :html => {:id => 'role_form'} do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
diff --git a/app/views/roles/new.rhtml b/app/views/roles/new.rhtml
index 8f03aefa..fb3e96f8 100644
--- a/app/views/roles/new.rhtml
+++ b/app/views/roles/new.rhtml
@@ -1,4 +1,4 @@
-<h2><%=l(:label_role_new)%></h2> 
+<h2><%= link_to l(:label_role_plural), :controller => 'roles', :action => 'index' %> &#187; <%=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 } %>
diff --git a/app/views/roles/report.rhtml b/app/views/roles/report.rhtml
index b30730ad..e2b01994 100644
--- a/app/views/roles/report.rhtml
+++ b/app/views/roles/report.rhtml
@@ -1,4 +1,4 @@
-<h2><%=l(:label_permissions_report)%></h2>
+<h2><%= link_to l(:label_role_plural), :controller => 'roles', :action => 'index' %> &#187; <%=l(:label_permissions_report)%></h2>
 
 <% form_tag({:action => 'report'}, :id => 'permissions_form') do %>
 <%= hidden_field_tag 'permissions[0]', '', :id => nil %>
diff --git a/app/views/trackers/edit.rhtml b/app/views/trackers/edit.rhtml
index 038acc86..b5d6f9dc 100644
--- a/app/views/trackers/edit.rhtml
+++ b/app/views/trackers/edit.rhtml
@@ -1,4 +1,4 @@
-<h2><%=l(:label_tracker)%></h2>
+<h2><%= link_to l(:label_tracker_plural), :controller => 'trackers', :action => 'index' %> &#187; <%=h @tracker %></h2>
 
 <% form_for :tracker, @tracker, :url => { :action => 'edit' }, :builder => TabularFormBuilder do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
diff --git a/app/views/trackers/new.rhtml b/app/views/trackers/new.rhtml
index 3f8384cd..6dccf0d7 100644
--- a/app/views/trackers/new.rhtml
+++ b/app/views/trackers/new.rhtml
@@ -1,4 +1,4 @@
-<h2><%=l(:label_tracker_new)%></h2>
+<h2><%= link_to l(:label_tracker_plural), :controller => 'trackers', :action => 'index' %> &#187; <%=l(:label_tracker_new)%></h2>
 
 <% form_for :tracker, @tracker, :url => { :action => 'new' }, :builder => TabularFormBuilder do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
diff --git a/app/views/users/add.rhtml b/app/views/users/add.rhtml
index 636bdcbc..56298455 100644
--- a/app/views/users/add.rhtml
+++ b/app/views/users/add.rhtml
@@ -1,4 +1,4 @@
-<h2><%=l(:label_user_new)%></h2>
+<h2><%= link_to l(:label_user_plural), :controller => 'users', :action => 'index' %> &#187; <%=l(:label_user_new)%></h2>
 
 <% labelled_tabular_form_for :user, @user, :url => { :action => "add" } do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
diff --git a/app/views/users/edit.rhtml b/app/views/users/edit.rhtml
index 4714bcec..96e089c1 100644
--- a/app/views/users/edit.rhtml
+++ b/app/views/users/edit.rhtml
@@ -2,7 +2,7 @@
 <%= change_status_link(@user) %>
 </div>
 
-<h2><%=l(:label_user)%>: <%=h @user.login %></h2>
+<h2><%= link_to l(:label_user_plural), :controller => 'users', :action => 'index' %> &#187; <%=h @user.login %></h2>
 
 <% selected_tab = params[:tab] ? params[:tab].to_s : user_settings_tabs.first[:name] %>