diff --git a/_config.yml b/_config.yml
index f77e546..14247b5 100644
--- a/_config.yml
+++ b/_config.yml
@@ -22,8 +22,11 @@ timezone: America/New_York
 # Build settings
 markdown: kramdown
 
-
 # Category settings
+main_categories:
+  - technology
+  - media
+
 category_titles:
   technology: "The Technologist"
   media: "The Player of Games"
diff --git a/_includes/category_list.html b/_includes/category_list.html
deleted file mode 100644
index 2bcb05f..0000000
--- a/_includes/category_list.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<ul class="post-list">
-  {% for post in site.categories[include.category] limit:include.limit %}
-    <li style="margin-top: 30px">
-      <h2 style="line-height: 1">
-        <a class="post-link" href="{{ post.url | prepend: site.baseurl }}">
-          {{ post.title }}
-        </a>
-        <span class="post-meta">{{ post.date | date: "%Y-%m-%d" }}</span>
-      </h2>
-      {{ post.excerpt }}
-      <p>
-        <a href="{{ post.url | prepend: site.baseurl }}">Read More...</a>
-      </p>
-    </li>
-  {% endfor %}
-</ul>
diff --git a/_includes/post_list.html b/_includes/post_list.html
new file mode 100644
index 0000000..d878155
--- /dev/null
+++ b/_includes/post_list.html
@@ -0,0 +1,18 @@
+<ul class="post-list">
+  {% for post in site.posts limit:include.limit %}
+    {% if include.categories contains post.category %}
+      <li style="margin-top: 30px">
+        <h2 style="line-height: 1">
+          <a class="post-link" href="{{ post.url | prepend: site.baseurl }}">
+            {{ post.title }}
+          </a>
+          <span class="post-meta">{{ post.date | date: "%Y-%m-%d" }}</span>
+        </h2>
+        {{ post.excerpt }}
+        <p>
+          <a href="{{ post.url | prepend: site.baseurl }}">Read More...</a>
+        </p>
+      </li>
+    {% endif %}
+  {% endfor %}
+</ul>
diff --git a/_layouts/category_index.html b/_layouts/category_index.html
index ab25861..c5efad2 100644
--- a/_layouts/category_index.html
+++ b/_layouts/category_index.html
@@ -8,7 +8,7 @@ layout: default
   </header>
 
   <div class="post-content">
-    {% include category_list.html category=page.category limit=1000000 %}
+    {% include post_list.html categories=page.category limit=1000000 %}
   </div>
 
 </article>
diff --git a/_sass/_columns.scss b/_sass/_custom.scss
similarity index 100%
rename from _sass/_columns.scss
rename to _sass/_custom.scss
diff --git a/css/main.scss b/css/main.scss
index 2ce0393..7698d96 100644
--- a/css/main.scss
+++ b/css/main.scss
@@ -51,5 +51,5 @@ $on-laptop:        800px;
         "base",
         "layout",
         "syntax-highlighting",
-        "columns"
+        "custom"
 ;
diff --git a/index.html b/index.html
index 296f3bf..e31c93b 100644
--- a/index.html
+++ b/index.html
@@ -2,6 +2,17 @@
 layout: default
 ---
 <div class="home">
+  <div class="category-menu">
+    {% for category in site.categories %}
+      {% if category.first == "meta" %} {% continue %} {% endif %}
+        <span class="category-link">
+          <a href="{{category.first | prepend: site.baseurl}}">
+            {{ site.category_titles[category.first] }}
+          </a>
+        </span>
+    {% endfor %}
+  </div>
+  
   {% assign last_meta = site.categories.meta.first %}
   {% if last_meta.active %}
     <div class="site-update">
@@ -12,13 +23,5 @@ layout: default
     </div>
   {% endif %}
     
-  {% for category in site.categories %}
-    {% if category.first == "meta" %} {% continue %} {% endif %}
-    <div class="column col-{{site.categories.size | minus: 1}}">
-      <a href="{{category.first | prepend: site.baseurl}}">
-        <h1 class="page-heading">{{ site.category_titles[category.first] }}</h1>
-      </a>
-      {% include category_list.html category=category.first limit=5 %}
-    </div>
-  {% endfor %}
+  {% include post_list.html categories=site.main_categories limit=5 %}
 </div>