diff --git a/_includes/repo-card.html b/_includes/repo-card.html
index 9fe0c93417..9e5a8ca70b 100644
--- a/_includes/repo-card.html
+++ b/_includes/repo-card.html
@@ -25,28 +25,30 @@ <h1 class="f4 lh-condensed mb-1">
         <svg class="octicon octicon-git-branch mr-1" viewBox="0 0 10 16" version="1.1" width="10" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M10 5c0-1.11-.89-2-2-2a1.993 1.993 0 0 0-1 3.72v.3c-.02.52-.23.98-.63 1.38-.4.4-.86.61-1.38.63-.83.02-1.48.16-2 .45V4.72a1.993 1.993 0 0 0-1-3.72C.88 1 0 1.89 0 3a2 2 0 0 0 1 1.72v6.56c-.59.35-1 .99-1 1.72 0 1.11.89 2 2 2 1.11 0 2-.89 2-2 0-.53-.2-1-.53-1.36.09-.06.48-.41.59-.47.25-.11.56-.17.94-.17 1.05-.05 1.95-.45 2.75-1.25S8.95 7.77 9 6.73h-.02C9.59 6.37 10 5.73 10 5zM2 1.8c.66 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2C1.35 4.2.8 3.65.8 3c0-.65.55-1.2 1.2-1.2zm0 12.41c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zm6-8c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z"></path></svg>{{ repository.forks_count }}
       </a>
     {% endif %}
-    {% if repository.license %}
+  </div>
+  {% if repository.license %}
+    <div class="d-flex flex-wrap f6">
       <span class="mr-4">
         <a href="{{ repository.license.url }}" class="d-inline-block link-gray no-wrap ellipsis-overflow">
           {% octicon law width:16 class:"mr-1" %}{{ repository.license.name }}
         </a>
       </span>
-    {% endif %}
-  </div>
-  <div class="d-flex flex-wrap f6">
-    {% if repository.topics.size > 0 %}
+    </div>
+  {% endif %}
+  {% if repository.topics.size > 0 %}
+    <div class="d-flex flex-wrap f6">
       <div class="d-inline-block mr-4">
         {% for topic in repository.topics %}
           <span class="topic-tag">{{ topic }}</span>
         {% endfor %}
       </div>
-    {% endif %}
-  </div>
-  <div class="d-flex flex-wrap f6">
-    {% if repository.homepage and repository.homepage != "" %}
+    </div>
+  {% endif %}
+  {% if repository.homepage and repository.homepage != "" %}
+    <div class="d-flex flex-wrap f6">
       <a href="{{ repository.homepage }}" class="d-inline-block link-gray mr-4 no-wrap ellipsis-overflow">
         {% octicon link width:16 class:"mr-1" %}{{ repository.homepage }}
       </a>
-    {% endif %}
-  </div>
+    </div>
+  {% endif %}
 </div>
diff --git a/assets/styles.scss b/assets/styles.scss
index dde37dc2a7..a926bbcce6 100644
--- a/assets/styles.scss
+++ b/assets/styles.scss
@@ -56,4 +56,13 @@
 .ellipsis-overflow {
   text-overflow: ellipsis;
   overflow: hidden;
+}
+.topic-tag {
+  display: inline-block;
+  padding: 0px 4px;
+  margin: 4px;
+  background-color: #0366d6;
+  color: #ffffff;
+  border-radius: 16px;
+  font-size: 12px;
 }
\ No newline at end of file