diff --git a/biofriction-theme/archive.php b/biofriction-theme/archive.php
index 55e0ae33..4449e8f3 100644
--- a/biofriction-theme/archive.php
+++ b/biofriction-theme/archive.php
@@ -26,13 +26,6 @@ get_header(); ?>
 					<?php echo category_description(); ?>
 				</div>
 			<?php endif; ?>
-			<?php if (is_category('peephole')) : ?>
-				<div class="bfr_category_tags">
-
-					<?php // wp_tag_cloud( 'unit=rem&smallest=1&largest=1&number=0&orderby=name' ); ?>
-
-				</div>
-			<?php endif; ?>
 			<div class="bfr_category_archive">
 				<?php if ( have_posts() ) : ?>
 					<?php /* Start the Loop */ ?>
diff --git a/biofriction-theme/header.php b/biofriction-theme/header.php
index f165be0e..c4269b2f 100644
--- a/biofriction-theme/header.php
+++ b/biofriction-theme/header.php
@@ -28,13 +28,14 @@
 			<!--nav class="site-top-widgets"--><?php //dynamic_sidebar( 'header-widgets' ); ?><!--/nav-->
 			<nav class="site-center-top-nav medium-6 grid-x align-center">
 				<?php foundationpress_top_bar_c(); ?>
-
-				<aside class="bfr_category_tags">
-    			<?php if (is_category('peephole') || is_tag() ) : ?>
-          	<?php wp_tag_cloud( 'unit=rem&smallest=1&largest=1&number=0&orderby=name' ); ?>
-					<?php endif; ?>
-				</aside>
 			</nav>
 			<nav class="site-top-nav menu"><?php foundationpress_top_bar_r(); ?></nav>
 		</content>
+
+		<aside class="bfr_category_tags">
+		  <?php if (is_category('peephole') || is_tag() ) : ?>
+		  <?php wp_tag_cloud( 'unit=rem&smallest=1&largest=1&number=0&orderby=name' ); ?>
+		  <?php endif; ?>
+		</aside>
+
 	</header>
diff --git a/biofriction-theme/src/assets/scss/components/_tags.scss b/biofriction-theme/src/assets/scss/components/_tags.scss
index c110e652..18742ee7 100644
--- a/biofriction-theme/src/assets/scss/components/_tags.scss
+++ b/biofriction-theme/src/assets/scss/components/_tags.scss
@@ -1,7 +1,8 @@
 .bfr_category_tags {
+  font-family: $header-font-family;
   .tag-cloud-link::before {
       content: '#';
-      display: inline-block;
+      // display: inline-block;
   }
   a{
     padding:0;
@@ -12,4 +13,3 @@
     }
   }
 }
-
diff --git a/biofriction-theme/src/assets/scss/modules/_header.scss b/biofriction-theme/src/assets/scss/modules/_header.scss
index 6532731f..3a7e936a 100644
--- a/biofriction-theme/src/assets/scss/modules/_header.scss
+++ b/biofriction-theme/src/assets/scss/modules/_header.scss
@@ -19,11 +19,10 @@
       }
 
       .bfr_category_tags {
-        min-height: $global-margin * 6.5;
-        margin-bottom: -($global-margin * 6.5);
-        padding-top: $global-padding;
-        display:flex;
-        justify-content:center;
+        // display:flex;
+        // justify-content:center;
+        max-width: calc(66vw - 4rem);
+        margin: 0 auto;
         a {
           display:inline-block;
           margin-bottom: auto;
diff --git a/biofriction-theme/src/assets/scss/modules/_navigation.scss b/biofriction-theme/src/assets/scss/modules/_navigation.scss
index b5bff2f8..62ed6cfc 100644
--- a/biofriction-theme/src/assets/scss/modules/_navigation.scss
+++ b/biofriction-theme/src/assets/scss/modules/_navigation.scss
@@ -46,9 +46,6 @@
         color:$primary-color;
       }
     }
-    li.current-menu-item.is-active > a {
-//      color:$secondary-color;
-    }
     li.is-dropdown-submenu-parent > a::after {
       border-color: $primary-color transparent transparent;
     }