diff --git a/Gemfile.lock b/Gemfile.lock
index d6fb9c7037..65469940dc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -71,10 +71,10 @@ GIT
 
 GIT
   remote: https://github.com/opf/openproject-translations.git
-  revision: 48de77103ac4ce2e20b26e3867c00d7053eb13b9
+  revision: a9056536ff7ba39af18de01fe38328fe42d130fd
   branch: stable/5
   specs:
-    openproject-translations (5.0.16)
+    openproject-translations (5.0.17)
       crowdin-api (~> 0.4.0)
       mixlib-shellout (~> 2.1.0)
       rails (~> 4.2.3)
diff --git a/app/assets/javascripts/tab_handling.js b/app/assets/javascripts/tab_handling.js
index 1e5a952a6b..585ce0ef7f 100644
--- a/app/assets/javascripts/tab_handling.js
+++ b/app/assets/javascripts/tab_handling.js
@@ -36,6 +36,8 @@
 // Responsible to hide the old selected tab and show the content
 // of the currently selected tab.
 function showTab(name, url) {
+  jQuery('div#content .tabs .a .position-label').hide();
+  jQuery('div#content .tabs #tab-' + name + ' .position-label').show();
   jQuery('div#content .tab-content').hide();
   jQuery('div.tabs a').removeClass('selected');
   jQuery('#tab-content-' + name).show();
diff --git a/app/assets/stylesheets/content/_simple_filters.sass b/app/assets/stylesheets/content/_simple_filters.sass
index 2cc6a98661..cd2dd32a42 100644
--- a/app/assets/stylesheets/content/_simple_filters.sass
+++ b/app/assets/stylesheets/content/_simple_filters.sass
@@ -82,9 +82,15 @@ $filters--border-color: $gray !default
       max-width: 100%
 
     .simple-filters--filter-name
-      flex-basis: 20%
+      flex-basis: 25%
+      max-width: 25%
+      padding-right: 0
+      margin-right: 1rem
+      overflow: hidden
+      text-overflow: ellipsis
     .simple-filters--filter-value
-      flex-basis: 75%
+      flex-basis: 70%
+      max-width: 70%
       // important for consistent padding between input and select fields
       padding-right: 0.375rem
 
diff --git a/app/helpers/accessibility_helper.rb b/app/helpers/accessibility_helper.rb
index acbc932e5f..29304297e2 100644
--- a/app/helpers/accessibility_helper.rb
+++ b/app/helpers/accessibility_helper.rb
@@ -28,10 +28,14 @@
 #++
 
 module AccessibilityHelper
-  def you_are_here_info(condition = true)
-    condition ?
-      "<span class = 'hidden-for-sighted'>#{l(:description_current_position)}</span>".html_safe :
+  def you_are_here_info(condition = true, disabled = nil)
+    if condition && !disabled
+      "<span style = 'display: block' class = 'position-label hidden-for-sighted'>#{l(:description_current_position)}</span>".html_safe
+    elsif condition && disabled
+      "<span style = 'display: none' class = 'position-label hidden-for-sighted'>#{l(:description_current_position)}</span>".html_safe
+    else
       ''
+    end
   end
 
   def empty_element_tag
diff --git a/app/views/common/_tabs.html.erb b/app/views/common/_tabs.html.erb
index 2a90076db4..f2912b74f7 100644
--- a/app/views/common/_tabs.html.erb
+++ b/app/views/common/_tabs.html.erb
@@ -31,7 +31,7 @@ See doc/COPYRIGHT.rdoc for more details.
   <ul>
     <% tabs.each do |tab| %>
       <li><%=
-    position_span = you_are_here_info(tab[:name] == selected_tab)
+    position_span = you_are_here_info(tab[:name], tab[:name] != selected_tab)
     caption = case tab[:label]
     when Proc
       tab[:label].call