diff --git a/src/partials/image-viewer.html b/src/partials/image-viewer.html
index a0eb9a5..7faadaf 100644
--- a/src/partials/image-viewer.html
+++ b/src/partials/image-viewer.html
@@ -26,7 +26,7 @@
       </div>
     </div>
   </div>
-  <a class="image-viewer__text"
+  <a tabindex=0 class="image-viewer__text"
     ><i aria-hidden="true" class="image-viewer__icon fas fa-camera"></i> View images (4)</a
   >
 </div>
diff --git a/src/partials/page/media.html b/src/partials/page/media.html
index c752b6f..684d5fd 100644
--- a/src/partials/page/media.html
+++ b/src/partials/page/media.html
@@ -32,7 +32,7 @@ <h5 class="section__subtitle">Image</h5>
               />
             </div>
           </div>
-          <a class="image-viewer__text"
+          <a tabindex=0 class="image-viewer__text"
             ><i aria-hidden="true" class="image-viewer__icon fas fa-camera"></i> View images (4)</a
           >
         </div>
diff --git a/src/scss/utils/_typography.scss b/src/scss/utils/_typography.scss
index 6b234eb..e48b02b 100755
--- a/src/scss/utils/_typography.scss
+++ b/src/scss/utils/_typography.scss
@@ -81,6 +81,11 @@ blockquote {
 /* Remove underline */
 a {
   text-decoration: none;
+  
+  &:focus,
+  &:active {
+    text-decoration: underline;
+  }
 }
 
 /* Remove italics */
diff --git a/src/service.html b/src/service.html
index 335c6ac..4922f66 100644
--- a/src/service.html
+++ b/src/service.html
@@ -36,6 +36,7 @@ <h2 class="service__title">What is this group?</h2>
             <include src="./image-viewer.html"></include>
             <!--Mobile Embeded video-->
             <iframe
+              tabindex="-1"
               title="Service video"
               class="service__video video video--mobile"
               src="https://www.youtube.com/embed/tgbNymZ7vqY"
@@ -71,6 +72,7 @@ <h2 class="service__title service__title--accordion">
           <aside class="col-xsmall-12 col-medium-4">
             <!--Dekstop Embeded video-->
             <iframe
+              tabindex="-1"
               title="Service video"
               class="service__video video"
               src="https://www.youtube.com/embed/tgbNymZ7vqY"
@@ -104,7 +106,10 @@ <h2 class="service__title service__title--accordion">
               >
                 <button class="btn btn--alt btn--alt--m">
                   Print page
-                  <i aria-hidden="true" class="btn__icon btn__icon--share fas fa-print"></i>
+                  <i
+                    aria-hidden="true"
+                    class="btn__icon btn__icon--share fas fa-print"
+                  ></i>
                 </button>
               </div>
               <div
@@ -112,7 +117,10 @@ <h2 class="service__title service__title--accordion">
               >
                 <button class="btn btn--alt btn--alt--m">
                   Add to favourites
-                  <i aria-hidden="true" class="btn__icon btn__icon--share fas fa-star"></i>
+                  <i
+                    aria-hidden="true"
+                    class="btn__icon btn__icon--share fas fa-star"
+                  ></i>
                 </button>
               </div>
               <div