diff --git a/src/components/Person.js b/src/components/Person.js
index 78a69ed7..20d22ba1 100644
--- a/src/components/Person.js
+++ b/src/components/Person.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import { name } from 'country-emoji';
 import styled from 'styled-components';
+import { Tag, Tags } from './Topics';
 import iphone from '../images/iphone.png';
 import android from '../images/android.png';
 import windows from '../images/windows.svg';
@@ -26,16 +27,13 @@ export default function Person({ person, currentTag }) {
           >{`${url.host}${url.pathname}`}</a>
         </header>
         <p>{person.description}</p>
-        <ul>
+        <Tags>
           {person.tags.map(tag => (
-            <li
-              key={tag}
-              className={`tag ${tag === currentTag ? 'currentTag' : ''}`}
-            >
+            <Tag key={tag} as="li" currentTag={tag === currentTag} small>
               {tag}
-            </li>
+            </Tag>
           ))}
-        </ul>
+        </Tags>
       </PersonInner>
       <PersonDeets>
         <span className="country" title={name(person.country)}>
@@ -88,29 +86,24 @@ const PersonInner = styled.div`
   h3 {
     margin: 0;
   }
-  ul li {
-    font-size: 1.2rem;
-    &.currentTag {
-      color: var(--yellow);
-    }
-  }
   header {
     display: grid;
     grid-template-rows: auto auto;
     grid-template-columns: auto 1fr;
     grid-gap: 0 1rem;
-  img {
-    grid-row: 1 / -1;
-    background: var(--lightblue);
-    font-size: 1rem;
-  }
-  .displayLink {
-    text-decoration: none;
-    color: var(--vape);
-    letter-spacing: 1px;
-    font-size: 1.2rem;
-    :hover {
-      color: var(--pink);
+    img {
+      grid-row: 1 / -1;
+      background: var(--lightblue);
+      font-size: 1rem;
+    }
+    .displayLink {
+      text-decoration: none;
+      color: var(--vape);
+      letter-spacing: 1px;
+      font-size: 1.2rem;
+      :hover {
+        color: var(--pink);
+      }
     }
   }
 `;
diff --git a/src/components/Topics.js b/src/components/Topics.js
index d46e0752..327e1284 100644
--- a/src/components/Topics.js
+++ b/src/components/Topics.js
@@ -10,8 +10,8 @@ export default function Topics() {
   return (
     <Tags>
       {tags.map(tag => (
-        <TagLabel
-          className={`tag ${tag.name === currentTag ? 'currentTag' : ''}`}
+        <Tag
+          currentTag={tag.name === currentTag}
           htmlFor={`filter-${tag.name}`}
           key={`filter-${tag.name}`}
         >
@@ -25,12 +25,12 @@ export default function Topics() {
           />
           {tag.name}
           <TagCount>{tag.count}</TagCount>
-        </TagLabel>
+        </Tag>
       ))}
 
       {countries.map(tag => (
-        <TagLabel
-          className={`tag ${tag.emoji === currentTag ? 'currentTag' : ''}`}
+        <Tag
+          currentTag={tag.emoji === currentTag}
           htmlFor={`filter-${tag.name}`}
           key={`filter-${tag.name}`}
           title={tag.name}
@@ -45,7 +45,7 @@ export default function Topics() {
           />
           <TagEmoji>{tag.emoji}</TagEmoji>
           <TagCount>{tag.count}</TagCount>
-        </TagLabel>
+        </Tag>
       ))}
     </Tags>
   );
@@ -60,11 +60,12 @@ const Tags = styled.div`
   flex-wrap: wrap;
 `;
 
-const TagLabel = styled.label`
+const Tag = styled.label`
   background: var(--pink);
   margin: 2px;
   border-radius: 3px;
-  font-size: 1.7rem;
+  font-size: ${props => (props.small ? `1.2rem;` : `1.7rem;`)}
+
   padding: 5px;
   color: hsla(0, 100%, 100%, 0.8);
   transition: background-color 0.2s;
@@ -75,10 +76,12 @@ const TagLabel = styled.label`
   input {
     display: none;
   }
-  &.currentTag {
+  ${props =>
+    props.currentTag &&
+    `
     background: var(--yellow);
     color: hsla(0, 100%, 0%, 0.8);
-  }
+  `}
 `;
 
 const TagEmoji = styled.span`
@@ -93,3 +96,5 @@ const TagCount = styled.span`
   border-radius: 2px;
   margin-left: 5px;
 `;
+
+export { Tag, Tags };