diff --git a/track/static/css/main.css b/track/static/css/main.css
index 6f9a310..5777d6f 100644
--- a/track/static/css/main.css
+++ b/track/static/css/main.css
@@ -46,6 +46,13 @@ th {
 .beta-badge {
   background-color: #22A7F0; }
 
+li a.myskip {
+  color: #3D4852; }
+
+li a.myskip:focus {
+  color: white;
+  text-decoration: none; }
+
 table caption {
   left: -10000px;
   height: 1px;
diff --git a/track/static/css/main.css.map b/track/static/css/main.css.map
index 4e662fe..e4bbdce 100644
--- a/track/static/css/main.css.map
+++ b/track/static/css/main.css.map
@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
 "sources": ["../scss/lib/neat/grid/_grid.scss","../scss/lib/bourbon/addons/_prefixer.scss","../scss/base/_tables.scss","../scss/base/_variables.scss","../scss/base/_base.scss","../scss/includes/datatables.scss","../scss/main.scss","../scss/lib/neat/grid/_media.scss","../scss/includes/header.scss","../scss/lib/bourbon/addons/_position.scss","../scss/lib/bourbon/addons/_size.scss"],
 "names": [],
 "file": "main.css"
diff --git a/track/static/js/https/domains.js b/track/static/js/https/domains.js
index 9471658..dafa79e 100755
--- a/track/static/js/https/domains.js
+++ b/track/static/js/https/domains.js
@@ -292,11 +292,11 @@ $(function () {
 
   var showHideText = function(show, row) {
     if (loneDomain(row))
-      return (show ? "<img src=\"/static/images/arrow.png\" aria-hidden=\"true\" class=\"rotated pb-1 mr-1 h-2\">" + text.show[language] : "<img src=\"/static/images/arrow.png\" class=\"mr-2 h-2\">" + text.hide[language]) + " " + text.details[language];
+      return (show ? "<img alt='' src=\"/static/images/arrow.png\" aria-hidden=\"true\" class=\"rotated pb-1 mr-1 h-2\">" + text.show[language] : "<img alt='' src=\"/static/images/arrow.png\" class=\"mr-2 h-2\">" + text.hide[language]) + " " + text.details[language];
     else if(row.totals.https.eligible == 1)
-      return (show ? "<img src=\"/static/images/arrow.png\" aria-hidden=\"true\" class=\"rotated pb-1 mr-1 h-2\">" + {en: "Show", fr: "Montrer le"}[language] : "<img src=\"/static/images/arrow.png\" class=\"mr-2 h-2\">" + {en: "Hide", fr: "Cacher le"}[language]) + " " + {en: "1", fr:""}[language] + text.subdomain[language];
+      return (show ? "<img alt='' src=\"/static/images/arrow.png\" aria-hidden=\"true\" class=\"rotated pb-1 mr-1 h-2\">" + {en: "Show", fr: "Montrer le"}[language] : "<img alt='' src=\"/static/images/arrow.png\" class=\"mr-2 h-2\">" + {en: "Hide", fr: "Cacher le"}[language]) + " " + {en: "1", fr:""}[language] + text.subdomain[language];
     else
-      return (show ? "<img src=\"/static/images/arrow.png\" aria-hidden=\"true\" class=\"rotated pb-1 mr-1 h-2\">" + text.show[language] : "<img src=\"/static/images/arrow.png\" class=\"mr-2 h-2\">" + text.hide[language]) + " " + row.totals.https.eligible + text.subdomains[language];
+      return (show ? "<img alt='' src=\"/static/images/arrow.png\" aria-hidden=\"true\" class=\"rotated pb-1 mr-1 h-2\">" + text.show[language] : "<img  alt=''src=\"/static/images/arrow.png\" class=\"mr-2 h-2\">" + text.hide[language]) + " " + row.totals.https.eligible + text.subdomains[language];
   };
 
   var initExpansions = function() {
@@ -321,7 +321,7 @@ $(function () {
 
         if (fetch) {
           console.log(text.fetch[language] + base_domain + "...");
-          link.addClass("loading").html("<img src=\"/static/images/arrow.png\" aria-hidden=\"true\" class=\"mr-2 h-2\">" + text.loading[language] + base_domain + " services...");
+          link.addClass("loading").html("<img alt='' src=\"/static/images/arrow.png\" aria-hidden=\"true\" class=\"mr-2 h-2\">" + text.loading[language] + base_domain + " services...");
 
           $.ajax({
             url: "/data/hosts/" + base_domain + "/https.json",
diff --git a/track/static/js/https/organizations.js b/track/static/js/https/organizations.js
index c0acc48..5290df3 100644
--- a/track/static/js/https/organizations.js
+++ b/track/static/js/https/organizations.js
@@ -86,7 +86,7 @@ $(document).ready(function () {
 
     var link = function(link_text) {
       return "" +
-        "<a href=\"/" + language + "/" + text.domains[language] + "/#" +
+        "<a aria-label=\""+data+"\" href=\"/" + language + "/" + text.domains[language] + "/#" +
           QueryString.stringify({q: row["name_" + language]}) + "\" data-domain=\""+data+"\">" +
            link_text +
         "</a>";
diff --git a/track/static/js/tables.js b/track/static/js/tables.js
index 0e6e5e9..1d69b55 100644
--- a/track/static/js/tables.js
+++ b/track/static/js/tables.js
@@ -178,5 +178,6 @@ $(function() {
     $('#DataTables_Table_0_filter label').attr('class', 'w-full md:w-2/3');
     $('#datatables-search').attr('class', 'border border-solid border-https-dark-gray bg-https-light-gray focus:border-https-blue block md:inline-block h-8 md:ml-6 mb-4 md:mb-8 w-full md:w-3/5 lg:w-3/4');
     $('.dataTables_csv').attr('class', 'text-lg md:ml-4 mt-4 md:mt-6');
+
   });
 });
diff --git a/track/static/scss/base/_base.scss b/track/static/scss/base/_base.scss
index 3f7124f..84607c0 100644
--- a/track/static/scss/base/_base.scss
+++ b/track/static/scss/base/_base.scss
@@ -24,3 +24,11 @@
 	background-color: #22A7F0;
 }
 
+li a.myskip {
+   color:$dark-gray;
+}
+li a.myskip:focus {
+    color:white;
+    text-decoration:none;
+}
+
diff --git a/track/templates/en/domains.html b/track/templates/en/domains.html
index 4b3af77..7e2af80 100644
--- a/track/templates/en/domains.html
+++ b/track/templates/en/domains.html
@@ -9,7 +9,7 @@
 
 {% include 'includes/en/modal.html' %}
 
-<section id="main-content" class="flex-1">
+<section id="main-content" class="flex-1" aria-label="main content">
 
 	<header class="bg-https-light-gray pt-6">
 
diff --git a/track/templates/en/guidance.html b/track/templates/en/guidance.html
index 4c45ac6..fdcce96 100644
--- a/track/templates/en/guidance.html
+++ b/track/templates/en/guidance.html
@@ -6,9 +6,9 @@
 {% block description %}Read guidance.{% endblock description %}
 
 {% block content %}
-<section id="main-content" class="flex-1">
+<section id="main-content" class="flex-1" aria-labelledby="readguidance">
     <div class="container mx-auto items-center sm:w-4/5 xl:w-3/5 mt-6 mb-6">
-        <h1>Read guidance</h1>
+        <h1 id='readguidance'>Read guidance</h1>
         <p>Help us make government websites more secure. Please complete the following steps to become compliant with the Government of Canada's web security standards. If you have any questions about this process, please <a href="/en/help">contact us</a>.</p>
         <br/>
         
diff --git a/track/templates/en/help.html b/track/templates/en/help.html
index ce3ad42..3d3afc5 100644
--- a/track/templates/en/help.html
+++ b/track/templates/en/help.html
@@ -6,7 +6,7 @@
 {% block description %}For interpretation of any aspect of Implementing HTTPS for Secure Web Connections: Information Technology Policy Implementation Notice (ITPIN), contact Treasury Board of Canada Secretariat through Public Enquiries.{% endblock description %}
 
 {% block content %}
-<section id="main-content" class="flex-1">
+<section id="main-content" class="flex-1" aria-label="Get help">
 	<div class="container mx-auto items-center sm:w-4/5 xl:w-3/5 mt-6">
 		<h1>Get help</h1>
 		<h2 class=" mb-4">General public</h2>
diff --git a/track/templates/en/index.html b/track/templates/en/index.html
index ab474d2..d6b00f1 100644
--- a/track/templates/en/index.html
+++ b/track/templates/en/index.html
@@ -8,7 +8,7 @@
 
 {% block content %}
 
-<section id="main-content" class="flex-1 bg-https-light-gray py-6">
+<section id="main-content" class="flex-1 bg-https-light-gray py-6" role="contentinfo" aria-label="Track web security compliance">
 
 		<div class="flex flex-col lg:flex-row mx-auto items-center sm:w-4/5 xl:w-3/5">
 			<div class="flex-1 lg:mr-8 lg:pr-8 mb-4 lg:mb-0">
@@ -16,14 +16,13 @@ <h1 class="text-4xl sm:text-5xl mb-6">Track web security compliance</h1>
 				<h2 class="text-3xl mb-2">Making government websites more secure</h2>
 				<p class="text-xl">Canadians rely on the Government of Canada to provide secure digital services. A <a class="text-https-blue hover:text-black" href="https://www.canada.ca/en/treasury-board-secretariat/services/information-technology/policy-implementation-notices/implementing-https-secure-web-connections-itpin.html">new policy notice</a> guides government websites to adopt good web security practices. Track how government sites are becoming more secure.</p>
 
-              {%  if request.headers.get("app-type","internal") == "internal"  %}
-
 				<div class="flex">
-					<p class="text-xl mt-2 lg:mt-6"><a href="/en/domains/" class="text-https-blue hover:text-black">Check a government website</a></p>
-					<object class="ml-2 lg:mt-4" type="image/svg+xml" tabindex="-1" aria-hidden="true" role="none" data="/static/images/cta-arrow.svg"></object>
+					<p class="text-xl mt-2 lg:mt-6"><a href="/en/organizations/" class="text-https-blue hover:text-black">Check a government website</a></p>
+					<object class="ml-2 lg:mt-4" type="image/svg+xml" tabindex="-1" aria-hidden="true" data="/static/images/cta-arrow.svg">
+                        <p>right arrow indicating the action to check a government website</p>
+                    </object>
 				</div>
 
-              {%  endif %}
 
 			</div>
 			
diff --git a/track/templates/en/layout-en.html b/track/templates/en/layout-en.html
index 808506e..355c203 100644
--- a/track/templates/en/layout-en.html
+++ b/track/templates/en/layout-en.html
@@ -15,7 +15,7 @@
 {% set GTM_key = "GOOGLE_TAG_MANAGER" | fetch_env() %}
 {% if GTM_key %}
 <!-- Google Tag Manager (noscript) -->
-<noscript><iframe src="https://www.googletagmanager.com/ns.html?id={{ GTM_key }}"
+<noscript role="application" aria-label="script for google tag manager"><iframe src="https://www.googletagmanager.com/ns.html?id={{ GTM_key }}"
 height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
 <!-- End Google Tag Manager (noscript) -->
 {% endif %}
@@ -27,12 +27,13 @@
 
 		<!-- GOC Identity Bar -->
 
-	    <section id="goc-fip-bar">
+	    <section id="goc-fip-bar" aria-label="To go to the french page">
 	        <div class="container mx-auto flex">
 	            <div class="flex-1 pt-2 pb-2">
 	                <a href="https://www.canada.ca/en.html" aria-label="Government of Canada">
-	                    <object type="image/svg+xml" tabindex="-1" role="img" data="/static/images/fip-dark-en.svg"
-	                            aria-label="Symbol of the Government of Canada" class="h-6"></object>
+	                    <object type="image/svg+xml" tabindex="-1" role="presentation" data="/static/images/fip-dark-en.svg" class="h-6" aria-label="Symbol of the Government of Canada">
+							Symbol of the Government of Canada
+						</object>
 	                </a>
 	            </div>
 
@@ -46,13 +47,12 @@ <h2 class="sr-only">Language selection</h2>
 
 
 	     <!-- Navigation -->
-  {%  if request.headers.get("app-type","internal") == "internal"  %}
-	     <nav class="bg-white border-b border-https-dark-gray">
+	     <nav class="bg-white border-b border-https-dark-gray" aria-label="Main menu">
 			<div class="container mx-auto flex">
 				<div class="{{ self.pageid_fr() | site_title(false) }}">
 					<h2 class="py-6 text-base sm:text-lg hidden md:block"><a class="text-grey-darkest no-underline font-medium hover:underline hover:text-https-blue" href="/en/index/">Track web security compliance</a></h2>
 				</div>
-		        <div role="navigation" class="flex-1">
+		        <div class="flex-1">
 		            <ul class="list-reset flex justify-end text-base sm:text-lg font-normal">
 		                <li class="py-6 inline xl:hidden">
 		                    <a id="menu-btn" class="text-https-blue hover:text-black no-underline hover:underline" href="#">Menu</a>
@@ -70,11 +70,8 @@ <h2 class="py-6 text-base sm:text-lg hidden md:block"><a class="text-grey-darkes
 		        </div>
 		    </div>
 		</nav>
-{% endif %}
-
-
 
-	     <nav id="menu-content" class="shadow-md">
+	     <nav id="menu-content" class="shadow-md"  aria-label="Menu for mobile">
 		    <ul class="list-reset ml-4 mr-2 mt-4 font-normal">
 		        <li class="{{ self.pageid_fr() | site_title(true) }} block py-4 border-b border-https-dark-gray sm:block md:hidden"><a tabindex="-1" class="text-xl text-https-blue no-underline hover:underline" href="/en/index/">Track web security compliance</a></li>
 		        <li class="block border-b border-https-dark-gray py-4"><a tabindex="-1" class="text-xl text-https-blue hover:text-black no-underline hover:underline" href="/en/organizations/">Check compliance</a></li>
diff --git a/track/templates/en/organizations.html b/track/templates/en/organizations.html
index 267bbd9..97fd4c6 100644
--- a/track/templates/en/organizations.html
+++ b/track/templates/en/organizations.html
@@ -11,7 +11,7 @@
 
 {% include 'includes/en/modal.html' %}
 
-<section id="main-content" class="flex-1">
+<section id="main-content" class="flex-1" aria-label="HTTPS by organization">
 
 	<header class="bg-https-light-gray pt-6">
 
diff --git a/track/templates/fr/domains.html b/track/templates/fr/domains.html
index fbb7381..262bef0 100644
--- a/track/templates/fr/domains.html
+++ b/track/templates/fr/domains.html
@@ -9,7 +9,7 @@
 
 {% include 'includes/fr/modal.html' %}
 
-<section id="main-content" class="flex-1">
+<section id="main-content" class="flex-1" aria-label="contenu principal">
 
 	<header class="bg-https-light-gray pt-6">
 
diff --git a/track/templates/fr/guidance.html b/track/templates/fr/guidance.html
index 99319d8..620be3d 100644
--- a/track/templates/fr/guidance.html
+++ b/track/templates/fr/guidance.html
@@ -6,9 +6,9 @@
 {% block description %}Lires les directives.{% endblock description %}
 
 {% block content %}
-<section id="main-content" class="flex-1">
+<section id="main-content" class="flex-1" aria-labelledby="readguidance">>
 	<div class="container mx-auto items-center sm:w-4/5 xl:w-3/5 mt-6 mb-6">
-		<h1>Lires les directives</h1>
+		<h1 id="readguidance">Lires les directives</h1>
 		<p>Aidez-nous à rendre les sites web du gouvernement plus sécuritaires. Veuillez compléter les étapes suivantes afin de respecter les normes de sécurité en ligne du gouvernement du Canada. Si vous avez des questions sur ce processus, <a href="/fr/aide">contactez-nous</a>.</p>
   	<br/>
 		
diff --git a/track/templates/fr/help.html b/track/templates/fr/help.html
index 0165451..be3f639 100644
--- a/track/templates/fr/help.html
+++ b/track/templates/fr/help.html
@@ -6,7 +6,7 @@
 {% block description %}Pour des explications concernant tout aspect de l’application de l’Avis de mise en œuvre de la Politique sur la technologie de l’information (AMPTI) : Mise en œuvre de HTTPS pour les connexions Web sécurisées, veuillez communiquer avec le Secrétariat du Conseil du Trésor du Canada par l’entremise des Renseignements au public.{% endblock description %}
 
 {% block content %}
-<section id="main-content" class="flex-1">
+<section id="main-content" class="flex-1" aria-label="Obtenir de l’aide">
 	<div class="container mx-auto items-center sm:w-4/5 xl:w-3/5 mt-6">
 		<h1>Obtenir de l’aide</h1>
 		<h2 class=" mb-4">Grand public</h2>
diff --git a/track/templates/fr/index.html b/track/templates/fr/index.html
index 62764ea..b318e1a 100644
--- a/track/templates/fr/index.html
+++ b/track/templates/fr/index.html
@@ -8,7 +8,7 @@
 
 {% block content %}
 
-<section id="main-content" class="flex-1 bg-https-light-gray py-6">
+<section id="main-content" class="flex-1 bg-https-light-gray py-6" role="contentinfo" aria-label="Suivre la conformité en matière de sécurité Web">
 
 		<div class="flex flex-col lg:flex-row mx-auto items-center sm:w-4/5 xl:w-3/5">
 			<div class="flex-1 lg:mr-8 lg:pr-8 mb-4 lg:mb-0">
@@ -16,12 +16,14 @@ <h1 class="text-4xl sm:text-5xl mb-6">Suivre la conformité en matière de sécu
 				<h2 class="text-3xl mb-2">Rendre les sites gouvernementaux plus sécuritaires</h2>
 				<p class="text-xl">Les Canadiens s'attendent à ce que le gouvernement du Canada leur offre des services en ligne sécurisés. Un <a class="text-https-blue hover:text-black " href="https://www.canada.ca/fr/secretariat-conseil-tresor/services/technologie-information/avis-mise-oeuvre-politique/mise-oeuvre-https-connexions-web-securisees-ampti.html">nouvel avis de politique</a> vise à assurer que les sites gouvernementaux soient conformes aux bonnes pratiques en matière de sécurité Web. Voyez comment les sites gouvernementaux deviennent plus sécuritaires.</p>
 
-                {%  if request.headers.get("app-type","public") == "internal"  %}
+
 				<div class="flex">
-					<p class="text-xl mt-2 lg:mt-6"><a href="/fr/domaines/" class="text-https-blue hover:text-black ">Vérifier la conformité d’un site gouvernemental</a></p>
-					<object class="ml-2 lg:mt-4" type="image/svg+xml" tabindex="-1" role="img" aria-hidden="true" data="/static/images/cta-arrow.svg"></object>
+					<p class="text-xl mt-2 lg:mt-6"><a href="/fr/organisations/" class="text-https-blue hover:text-black ">Vérifier la conformité d’un site gouvernemental</a></p>
+					<object class="ml-2 lg:mt-4" type="image/svg+xml" tabindex="-1" role="img" aria-hidden="true" data="/static/images/cta-arrow.svg">
+						<p>Pour vérifier la conformité d’un site gouvernemental</p>
+					</object>
 				</div>
-                {% endif %}
+
 
 			</div>
 
diff --git a/track/templates/fr/layout-fr.html b/track/templates/fr/layout-fr.html
index a89f9ac..28719e2 100644
--- a/track/templates/fr/layout-fr.html
+++ b/track/templates/fr/layout-fr.html
@@ -15,7 +15,7 @@
 {% set GTM_key = "GOOGLE_TAG_MANAGER" | fetch_env() %}
 {% if GTM_key %}
 <!-- Google Tag Manager (noscript) -->
-<noscript><iframe src="https://www.googletagmanager.com/ns.html?id={{ GTM_key }}"
+<noscript role="application" aria-label="script for google tag manager"><iframe src="https://www.googletagmanager.com/ns.html?id={{ GTM_key }}"
 height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
 <!-- End Google Tag Manager (noscript) -->
 {% endif %}
@@ -28,12 +28,17 @@
 
 		<!-- GOC Identity Bar -->
 
-	    <section id="goc-fip-bar">
+	    <section id="goc-fip-bar" aria-label="Aller  à la page anglaise">
 	        <div class="container mx-auto flex">
 	            <div class="flex-1 pt-2 pb-2">
-	                <a href="https://www.canada.ca/fr.html" aria-label="Government of Canada">
-	                    <object type="image/svg+xml" tabindex="-1" role="img" data="/static/images/fip-dark-en.svg"
-	                            aria-label="Symbol of the Government of Canada" class="h-6"></object>
+	                <a href="https://www.canada.ca/fr.html" aria-label=" Gouvernement du Canada">
+	                    <object type="image/svg+xml" tabindex="-1" role="presentation" data="/static/images/fip-dark-en.svg"
+	                            aria-label=" Gouvernement du Canada" class="h-6">
+							     Gouvernement du Canada
+
+						</object>
+
+
 	                </a>
 	            </div>
 
@@ -45,13 +50,12 @@ <h2 class="sr-only">Sélection de la langue</h2>
 	    </section>
 
 	    <!-- Navigation -->
-  {%  if request.headers.get("app-type","internal") == "internal"  %}
-	    <nav class="bg-white border-b border-https-dark-gray">
+	    <nav class="bg-white border-b border-https-dark-gray"  aria-label="Menu principal">
 			<div class="container mx-auto flex">
 				<div class="{{ self.pageid_en() | site_title(false) }} flex-none">
 					<h2 class="mr-8 py-6 text-base sm:text-lg hidden md:block"><a class="text-grey-darkest no-underline hover:underline font-medium hover:text-https-blue" href="/fr/index/">Suivre la conformité en matière de sécurité Web</a></h2>
 				</div>
-		        <div role="navigation" class="flex-1">
+		        <div class="flex-1">
 		            <ul class="list-reset flex justify-end text-base sm:text-lg font-normal">
 		                <li class="py-6 md:py-8 lg:py-6 inline xl:hidden">
 		                    <a id="menu-btn" class="text-https-blue hover:text-black no-underline hover:underline" href="#">Menu</a>
@@ -69,8 +73,7 @@ <h2 class="mr-8 py-6 text-base sm:text-lg hidden md:block"><a class="text-grey-d
 		        </div>
 		    </div>
 		</nav>
-  {% endif %}
-	    <nav id="menu-content" class="shadow-md">
+	    <nav id="menu-content" class="shadow-md" aria-label="Menu pour mobile">
 		    <ul class="list-reset ml-4 mr-2 mt-4">
 		    	<li class="{{ self.pageid_en() | site_title(true) }} block py-4 border-b border-https-dark-gray sm:block md:hidden"><a tabindex="-1" class="text-xl text-https-blue no-underline hover:underline" href="/fr/index/">Suivre la conformité en matière de sécurité Web</a></li>
 		    	<li class="block py-4 border-b border-https-dark-gray"><a tabindex="-1" class="text-xl text-https-blue hover:text-black no-underline hover:underline" href="/fr/organisations/">Vérifier la conformité</a></li>
diff --git a/track/templates/fr/organizations.html b/track/templates/fr/organizations.html
index 6dc24d9..61d701c 100644
--- a/track/templates/fr/organizations.html
+++ b/track/templates/fr/organizations.html
@@ -10,7 +10,7 @@
 
 {% include 'includes/fr/modal.html' %}
 
-<section id="main-content" class="flex-1">
+<section id="main-content" class="flex-1" aria-label="HTTPS par organisme">
 
 	<header class="bg-https-light-gray pt-6">
 
diff --git a/track/templates/includes/en/beta-bar.html b/track/templates/includes/en/beta-bar.html
index e028ff7..dc27694 100644
--- a/track/templates/includes/en/beta-bar.html
+++ b/track/templates/includes/en/beta-bar.html
@@ -1,8 +1,19 @@
-<section class="bg-grey-darkest py-4 text-xs sm:block md:block lg:block xl:block">
+<section class="bg-grey-darkest py-4 text-xs sm:block md:block lg:block xl:block" aria-labelledby="myBeta">
     <div class="container mx-auto text-white flex items-center">
+
+
+
         <span class="flex-initial">
-            <span class="beta-badge py-2 px-2 font-bold rounded uppercase mr-4">Beta</span>
+            <span class="beta-badge py-2 px-2 font-bold rounded uppercase mr-4 text-black">Beta</span>
         </span>
-        <span class="flex-1">This is a new service, we are constantly improving.</span>
+        <span class="flex-1" id="myBeta">This is a new service, we are constantly improving.</span>
+
+        <div class="flex-1">
+        	<nav>
+                <ul class="list-reset">
+                     <li ><a class='myskip font-bold text-base'  href="#main-content">Skip to main content</a></li>
+                </ul>
+		    </nav>
+        </div>
     </div>
-</section>
\ No newline at end of file
+</section>
diff --git a/track/templates/includes/en/footer.html b/track/templates/includes/en/footer.html
index 1903a6c..1ee47d7 100644
--- a/track/templates/includes/en/footer.html
+++ b/track/templates/includes/en/footer.html
@@ -7,7 +7,9 @@
 	        </ul>
 	    </div>
         <div class="flex-1 text-center sm:text-right min-width-full mb-2 sm:mb-0">
-            <object class="h-8" type="image/svg+xml" tabindex="-1" role="img" data="/static/images/wordmark-light.svg" aria-label="Symbol of the Government of Canada"></object>
+            <object class="h-8" type="image/svg+xml" tabindex="-1" role="presentation" data="/static/images/wordmark-light.svg" aria-label="Symbol of the Government of Canada">
+                Symbol of the Government of Canada
+            </object>
         </div>
     </div>
 </footer>
diff --git a/track/templates/includes/en/modal.html b/track/templates/includes/en/modal.html
index 61133a9..ec57922 100644
--- a/track/templates/includes/en/modal.html
+++ b/track/templates/includes/en/modal.html
@@ -2,7 +2,7 @@
 <div id="modal" class="hidden fixed pin z-50">
 
 	  <!-- Modal content -->
-	  <div id="modal-content" tabindex="-1" role="dialog" aria-labelledby="table compliance definitions" class="relative bg-white w-3/4 m-auto flex-col py-2 overflow-auto flex-initial">
+	  <div id="modal-content" tabindex="-1" role="dialog" aria-label="Compliance definitions" class="relative bg-white w-3/4 m-auto flex-col py-2 overflow-auto flex-initial">
 	  	<div id="close" class="w-full text-right pr-6"><span class="close-symbol"><a id="close-btn" class="no-underline text-black text-3xl lg:text-5xl" href="#">&times;</a></span></div>
 	  	<div class="container lg:w-5/6 mx-auto">
 		    <h2 id="modal-header" tabindex="-1" class="text-3xl lg:text-5xl font-bold mb-4">Compliance definitions</h2>
diff --git a/track/templates/includes/fr/beta-bar.html b/track/templates/includes/fr/beta-bar.html
index 896e042..93d6b39 100644
--- a/track/templates/includes/fr/beta-bar.html
+++ b/track/templates/includes/fr/beta-bar.html
@@ -1,8 +1,18 @@
-<section class="bg-grey-darkest py-4 text-xs sm:block md:block lg:block xl:block">
+<section class="bg-grey-darkest py-4 text-xs sm:block md:block lg:block xl:block" aria-labelledby="myBeta">
     <div class="container mx-auto text-white flex items-center">
         <span class="flex-initial">
-            <span class="beta-badge py-2 px-2 font-bold rounded uppercase mr-4">Bêta</span>
+            <span class="beta-badge py-2 px-2 font-bold rounded uppercase mr-4 text-black">Bêta</span>
         </span>
-        <span class="flex-1">Ceci est un nouveau service, nous l’améliorons constamment.</span>
+        <span class="flex-1" id="myBeta">Ceci est un nouveau service, nous l’améliorons constamment.</span>
+
+        <div class="flex-1">
+        	<nav>
+                <ul class="list-reset">
+                   <li ><a class='myskip font-bold text-base'  href="#main-content">Passer au contenu principal</a></li>
+                </ul>
+		    </nav>
+        </div>
+
+
     </div>
 </section>
\ No newline at end of file
diff --git a/track/templates/includes/fr/footer.html b/track/templates/includes/fr/footer.html
index ef00e55..b8031fb 100644
--- a/track/templates/includes/fr/footer.html
+++ b/track/templates/includes/fr/footer.html
@@ -8,7 +8,9 @@
             </ul>
 	    </div>
         <div class="flex-1 text-center sm:text-right min-width-full mb-2 sm:mb-0">
-            <object class="h-8" type="image/svg+xml" tabindex="-1" role="img" data="/static/images/wordmark-light.svg" aria-label="Symbol of the Government of Canada"></object>
+            <object class="h-8" type="image/svg+xml" tabindex="-1" role="presentation" data="/static/images/wordmark-light.svg" aria-label="Gouvernement du Canada">
+                Gouvernement du Canada
+            </object>
         </div>
     </div>
 </footer>
diff --git a/track/templates/includes/fr/modal.html b/track/templates/includes/fr/modal.html
index 18cdc83..ba0000f 100644
--- a/track/templates/includes/fr/modal.html
+++ b/track/templates/includes/fr/modal.html
@@ -2,7 +2,7 @@
 <div id="modal" class="hidden fixed pin z-50">
 
 	  <!-- Modal content -->
-	  <div id="modal-content" tabindex="-1" role="dialog" aria-labelledby="table compliance definitions" class="relative bg-white w-3/4 m-auto flex-col py-2 overflow-auto flex-initial">
+	  <div id="modal-content" tabindex="-1" role="dialog" aria-label="Critères de conformité" class="relative bg-white w-3/4 m-auto flex-col py-2 overflow-auto flex-initial">
 	  	<div id="close" class="w-full text-right pr-6"><span class="close-symbol"><a id="close-btn" class="no-underline text-black text-3xl lg:text-5xl" href="#">&times;</a></span></div>
 	  	<div class="container lg:w-5/6 mx-auto">
 		    <h2 id="modal-header" tabindex="-1" class="text-3xl lg:text-5xl font-bold mb-4">Critères de conformité</h2>
diff --git a/track/views.py b/track/views.py
index e5fa638..5290431 100644
--- a/track/views.py
+++ b/track/views.py
@@ -37,18 +37,12 @@ def splash_page():
     @app.route("/en/organizations/")
     @app.route("/fr/organisations/")
     def organizations():
-        if request.headers.get("app-type", "internal") == "public":
-            return index()
-
         prefix = request.path[1:3]
         return render_template(generate_path(prefix, "organizations"))
 
     @app.route("/en/domains/")
     @app.route("/fr/domaines/")
     def https_domains():
-        if request.headers.get("app-type", "internal") == "public":
-            return index()
-
         prefix = request.path[1:3]
         return render_template(generate_path(prefix, "domains"))