diff --git a/src/components/Router.js b/src/components/Router.js
index 3f4b6add111a2feed914e852e7adaa62baf571f6..99f8fe5b536a853ca08c40bab9de20bf7e839ec1 100644
--- a/src/components/Router.js
+++ b/src/components/Router.js
@@ -72,6 +72,7 @@ const Router = async function (state) {
       }
     }
   } else {
+    // TODO: Move some of these config data to config
     const res = await solrService.search({api: state.config.api}, {
       start: state.main.start,
       page: state.main.page,
@@ -86,6 +87,7 @@ const Router = async function (state) {
       state.main.searchText = '';
       state.facetResult = res.facets;
       const facetContent = FacetController.get({data: state.facetResult['facet_fields'][state.facets[0]], toJSON: true});
+      // TODO: Move this to config
       const facetData = FacetController.display({data: facetContent, config: {
         name: 'Dataset_author_facetmulti',
         route: '#view/',
diff --git a/src/components/views/SubDocHorizontal.js b/src/components/views/SubDocHorizontal.js
index 45c9298e5c675461fbfe0d2134171c8db31da11e..4a2c1e55f53e73a784837b3886409b99ebfb0aba 100644
--- a/src/components/views/SubDocHorizontal.js
+++ b/src/components/views/SubDocHorizontal.js
@@ -5,24 +5,28 @@ const SubDocHorizontal = function (data) {
   const div = $('<div class="row">');
   const headerDiv = $('<div class="col-sm-2">').html(data.fieldName);
   div.append(headerDiv);
+
   if (isIterable(data.value)) {
     for (let key of data.value) {
       try {
         const a = $('<a>');
-        const subDiv = $('<div class="col-sm">');
+        const subEle = $('<span class="">');
         const sub = JSON.parse(key);
         const href = `/#view/${sub['@id']}`;
         a.attr('href', href);
         a.attr('title', sub['name']);
         a.text(sub['name']);
         a.addClass("link");
-        subDiv.append(a);
-        div.append(subDiv);
+        subEle.append(a);
+        div.append(subEle);
+
       } catch (e) {
-        div.append('')
+        div.append('');
       }
     }
   }
+
+
   return div;
 }
 
diff --git a/src/index.js b/src/index.js
index abd25435272585208e20e6ef85273810ffb8ee07..35225e9cc88bc0d2dba904fd6c006c0a82693e78 100644
--- a/src/index.js
+++ b/src/index.js
@@ -38,6 +38,7 @@ let state = {
     related: [],
     viewFields: [
       {display: "SubDocHorizontal", field: "author", fieldName: 'Author/s'},
+      {display: "", field: "affiliation", fieldName: 'Affiliation'},
       {display: "", field: "license", fieldName: 'Licence'},
       {display: "SubDocDate", field: "datePublished", fieldName: 'Date Published'},
       {display: "SubDoc", field: "contactPoint", fieldName: 'Contact Point', template: '${item.name} ${item.email}'},
@@ -46,7 +47,7 @@ let state = {
   facets: ['Dataset_author_facetmulti'],
   facetsDisplay: [
     {name: 'Dataset_author_facetmulti', displayText: 'Top Authors'},
-    //{name: 'Keywords', displayText: 'Top Keywords'}
+    {name: 'Keywords', displayText: 'Top Keywords'}
   ],
   facetData: [],
   facetLimit: 5,