diff --git a/app/helpers/layouts_helper.rb b/app/helpers/layouts_helper.rb
new file mode 100644
index 000000000..c92f57898
--- /dev/null
+++ b/app/helpers/layouts_helper.rb
@@ -0,0 +1,12 @@
+module LayoutsHelper
+
+  def layout_menu_link_to(text, path, is_active, options)
+    if is_active
+      content_tag(:span, t('shared.you_are_in'), class: 'sr-only') + ' ' +
+      link_to(text, path, options.merge(class: "active"))
+    else
+      link_to(text, path, options)
+    end
+  end
+
+end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 70ae90b11..34e7776fb 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -14,7 +14,7 @@
     <%= csrf_meta_tags %>
     <%= favicon_link_tag "favicon.ico" %>
     <%= favicon_link_tag "apple-touch-icon-200.png",
-                     rel: "apple-touch-icon",
+                     rel: "icon apple-touch-icon",
                      sizes: "200x200",
                      type: "image/png" %>
     <%= content_for :social_media_meta_tags %>
diff --git a/app/views/shared/_subnavigation.html.erb b/app/views/shared/_subnavigation.html.erb
index 899125138..e8e0f1238 100644
--- a/app/views/shared/_subnavigation.html.erb
+++ b/app/views/shared/_subnavigation.html.erb
@@ -2,14 +2,23 @@
   <ul>
     <% if feature?(:debates) %>
       <li>
-        <%= link_to t("layouts.header.debates"), debates_path, class: ("active" if controller_name == "debates"), accesskey: "d" %>
+        <%= layout_menu_link_to t("layouts.header.debates"),
+                                debates_path,
+                                controller_name == 'debates',
+                                accesskey: "d" %>
       </li>
     <% end %>
     <li>
-      <%= link_to t("layouts.header.proposals"), proposals_path, class: ("active" if  controller_name == "proposals"), accesskey: "p" %>
+      <%= layout_menu_link_to t("layouts.header.proposals"),
+                                proposals_path,
+                                controller_name == 'proposals',
+                                accesskey: "p" %>
     </li>
     <li>
-      <%= link_to t("layouts.header.proposal_ballot"), proposal_ballots_path, class: ("active" if  controller_name == "proposal_ballots"), accesskey: "v" %>
+      <%= layout_menu_link_to t("layouts.header.proposal_ballot"),
+                                proposal_ballots_path,
+                                controller_name == 'proposal_ballots',
+                                accesskey: "v" %>
     </li>
     <% if feature?(:legislation) %>
       <li>
@@ -18,11 +27,11 @@
     <% end %>
     <% if feature?(:spending_proposals) %>
       <li>
-        <%= link_to t("layouts.header.spending_proposals"), spending_proposals_path, class: ("active" if controller_name == "spending_proposals"), accesskey: "s" %>
+        <%= layout_menu_link_to t("layouts.header.spending_proposals"),
+                                  spending_proposals_path,
+                                  controller_name == 'spending_proposals',
+                                  accesskey: "s" %>
       </li>
     <% end %>
-    <li>
-      <%= link_to t("layouts.header.more_information"), page_path('more_information'), class: ("active" if current_page?("/more_information")), accesskey: "i"  %>
-    </li>
   </ul>
 </div>
diff --git a/app/views/shared/_top_links.html.erb b/app/views/shared/_top_links.html.erb
index e81072ab8..f57deeebd 100644
--- a/app/views/shared/_top_links.html.erb
+++ b/app/views/shared/_top_links.html.erb
@@ -2,8 +2,26 @@
   <div class="row">
     <%= render "shared/locale_switcher" %>
     <ul class="no-bullet external-links">
-      <li class="inline-block"><%= link_to t("layouts.header.external_link_transparency"), t("layouts.header.external_link_transparency_url") %>&nbsp;|</li>
-      <li class="inline-block"><%= link_to t("layouts.header.external_link_opendata"), "/opendata", class: ("selected" if current_page?("/opendata")) %></li>
+      <li class="inline-block">
+        <%= link_to t("layouts.header.more_information"),
+                    page_path('more_information'),
+                    class: ("selected" if current_page?("/more_information")),
+                    accesskey: "i"  %>
+                    &nbsp;|
+      </li>
+      <li class="inline-block">
+        <%= link_to t("layouts.header.external_link_transparency"),
+                    t("layouts.header.external_link_transparency_url"),
+                    target: "_blank",
+                    title: t('shared.target_blank_html') %>
+                    &nbsp;|
+      </li>
+      <li class="inline-block">
+        <%= link_to t("layouts.header.external_link_opendata"),
+                    t("layouts.header.external_link_opendata_url"),
+                    target: "_blank",
+                    title: t('shared.target_blank_html') %>
+      </li>
       <% if setting['blog_url'] %>
         <li class="inline-block">|&nbsp;
           <%= link_to setting['blog_url'], title: t('shared.target_blank_html'), target: "_blank" do %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6e71969ce..4a7a46749 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -190,6 +190,7 @@ en:
       debates: Debates
       external_link_blog: Blog
       external_link_opendata: Open data
+      external_link_opendata_url: "/opendata"
       external_link_transparency: Transparency
       external_link_transparency_url: https://transparency.consul
       locale: 'Language:'
@@ -496,6 +497,7 @@ en:
       districts_list: "Districts list"
       categories: "Categories"
     target_blank_html: " (link opens in new window)"
+    you_are_in: "You are in"
     unflag: Unflag
     outline:
       debates: Debates
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 41a3361cf..f5ddb6476 100755
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -190,6 +190,7 @@ es:
       debates: Debates
       external_link_blog: Blog
       external_link_opendata: Datos abiertos
+      external_link_opendata_url: "/opendata"
       external_link_transparency: Transparencia
       external_link_transparency_url: https://transparency.consul
       locale: 'Idioma:'
@@ -496,6 +497,7 @@ es:
       districts_list: "Listado de distritos"
       categories: "Categorías"
     target_blank_html: " (se abre en ventana nueva)"
+    you_are_in: "Estás en"
     unflag: Deshacer denuncia
     outline:
       debates: Debates