diff --git a/assets/css/common/_blocks.scss b/assets/css/common/_blocks.scss
index 883302a8..fbf2c7f7 100644
--- a/assets/css/common/_blocks.scss
+++ b/assets/css/common/_blocks.scss
@@ -124,6 +124,7 @@ a.block__header--single-item, .block__header a {
 .block__header--js-tabbed {
   @extend .block__header--light;
   background: transparent;
+  display: flex;
 
   border-bottom: $border;
   a {
diff --git a/assets/css/common/_header.scss b/assets/css/common/_header.scss
index e79e780a..5b159840 100644
--- a/assets/css/common/_header.scss
+++ b/assets/css/common/_header.scss
@@ -23,6 +23,11 @@
   padding-left: 6px;
 }
 
+.header__navigation {
+  display: flex;
+  flex-wrap: wrap;
+}
+
 a.header__link {
   display: inline-block;
   padding: 0 $header_spacing;
diff --git a/assets/css/views/_images.scss b/assets/css/views/_images.scss
index 76e1f74c..c3a956bd 100644
--- a/assets/css/views/_images.scss
+++ b/assets/css/views/_images.scss
@@ -92,12 +92,6 @@ div.image-container {
   overflow: hidden;
   /* prevent .media-box__overlay from overflowing the container */
   text-align: center;
-  a::before {
-    content: "";
-    display: inline-block;
-    height: 100%;
-    vertical-align: middle;
-  }
   img,
   video {
     vertical-align: middle;
@@ -105,12 +99,12 @@ div.image-container {
     max-height: 100%;
   }
   /* Make the link cover the whole container if the image is oblong */
-  a {
+  a, picture, video {
     width: 100%;
     height: 100%;
-    display: inline-block;
-    text-align: center;
-    vertical-align: middle;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
   }
 }
 
diff --git a/assets/css/views/_tags.scss b/assets/css/views/_tags.scss
index 85150789..6626dda4 100644
--- a/assets/css/views/_tags.scss
+++ b/assets/css/views/_tags.scss
@@ -70,7 +70,11 @@
 .tag > span {
   padding: 5px;
   display: table-cell;
-  white-space: pre;
+}
+
+.tag-list {
+  display: flex;
+  flex-wrap: wrap;
 }
 
 .tag a {
diff --git a/lib/philomena_web/templates/layout/_header_navigation.html.slime b/lib/philomena_web/templates/layout/_header_navigation.html.slime
index 034506f4..112b0c57 100644
--- a/lib/philomena_web/templates/layout/_header_navigation.html.slime
+++ b/lib/philomena_web/templates/layout/_header_navigation.html.slime
@@ -1,4 +1,4 @@
-.hide-mobile
+.hide-mobile.header__navigation
   .dropdown.header__dropdown
     a.header__link href="/images"
       | Images