diff --git a/assets/javascripts/discourse/components/knowledge-explorer-topic-link.js.es6 b/assets/javascripts/discourse/components/knowledge-explorer-topic-link.js.es6
index 547dd18..13e489c 100644
--- a/assets/javascripts/discourse/components/knowledge-explorer-topic-link.js.es6
+++ b/assets/javascripts/discourse/components/knowledge-explorer-topic-link.js.es6
@@ -1,7 +1,5 @@
 export default Ember.Component.extend({
   click() {
-    const topic = this.get("topic");
-
-    this.set("selectedTopic", topic.id);
+    this.set("selectedTopic", this.topic.id);
   }
 });
diff --git a/assets/javascripts/discourse/components/knowledge-explorer-topic.js.es6 b/assets/javascripts/discourse/components/knowledge-explorer-topic.js.es6
index 8f9bda0..e999dc3 100644
--- a/assets/javascripts/discourse/components/knowledge-explorer-topic.js.es6
+++ b/assets/javascripts/discourse/components/knowledge-explorer-topic.js.es6
@@ -2,8 +2,7 @@ import { default as computed } from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
   classNames: "knowledge-explorer-topic",
-  @computed("topic")
-  originalPostContent(topic) {
-    return topic.post_stream.posts[0].cooked;
-  }
+  originalPostContent: Ember.computed.readOnly(
+    "topic.post_stream.posts.firstObject.cooked"
+  )
 });
diff --git a/assets/javascripts/discourse/templates/knowledge-explorer.hbs b/assets/javascripts/discourse/templates/knowledge-explorer.hbs
index af39278..643ba74 100644
--- a/assets/javascripts/discourse/templates/knowledge-explorer.hbs
+++ b/assets/javascripts/discourse/templates/knowledge-explorer.hbs
@@ -3,12 +3,16 @@
     {{knowledge-explorer-topic topic=topic}}
   {{else}}
     <div class="knowledge-explorer-search">
-      {{knowledge-explorer-search searchResults=searchResults searchTerm=searchTerm filterTags=filterTags}}
+      {{knowledge-explorer-search 
+        searchResults=searchResults 
+        searchTerm=searchTerm 
+        filterTags=filterTags
+      }}
     </div>
     <div class="knowledge-explorer-browse">
       {{knowledge-explorer-tag-list
-          tags=tags
-          filterTags=filterTags
+        tags=tags
+        filterTags=filterTags
       }}
       <div class="knowledge-explorer-results">
       {{#if hasSearchResults}}
@@ -16,10 +20,16 @@
           <div class="result-count no-result">{{i18n 'search.no_results'}}</div>
         {{else}}
           <div class="result-count">{{i18n 'knowledge_explorer.search.results' count=searchCount}}</div>
-          {{knowledge-explorer-topic-list topics=searchResults selectedTopic=selectedTopic}}
+          {{knowledge-explorer-topic-list 
+            topics=searchResults 
+            selectedTopic=selectedTopic
+          }}
         {{/if}}
       {{else}}
-        {{knowledge-explorer-topic-list topics=topics selectedTopic=selectedTopic}}
+        {{knowledge-explorer-topic-list 
+          topics=topics 
+          selectedTopic=selectedTopic
+        }}
       {{/if}}
       </div>
     </div>
diff --git a/assets/stylesheets/common/knowledge-explorer.scss b/assets/stylesheets/common/knowledge-explorer.scss
index ae97ef1..15db5b0 100644
--- a/assets/stylesheets/common/knowledge-explorer.scss
+++ b/assets/stylesheets/common/knowledge-explorer.scss
@@ -3,21 +3,21 @@
     width: 80%;
     margin: 0 auto;
     .knowledge-explorer-nav-link {
-      font-weight: bold;
+      font-weight: 700;
       &.return {
-        font-size: .8em;
+        font-size: $font-down-1;
         &::before {
           content: "«";
-          margin-right: 3px;
+          margin-right: 5px;
         }
       }
       &.more {
         float: right;
-        font-size: 1.2em;
+        font-size: $font-up-1;
         padding: 10px 0;
         &::after {
           content: "»";
-          margin-left: 3px;
+          margin-left: 5px;
         }
       }
     }
diff --git a/assets/stylesheets/mobile/knowledge-explorer.scss b/assets/stylesheets/mobile/knowledge-explorer.scss
index 0845d14..e3278ab 100644
--- a/assets/stylesheets/mobile/knowledge-explorer.scss
+++ b/assets/stylesheets/mobile/knowledge-explorer.scss
@@ -1,7 +1,7 @@
 .mobile-view {
   .knowledge-explorer {
     .knowledge-explorer-topic {
-      width: calc(100vw - 35px);
+      width: calc(100vw - .75em);
       margin: 10px 0;
     }
     .knowledge-explorer-search {