diff --git a/_config.yml b/_config.yml
index 1dffeef..86da721 100644
--- a/_config.yml
+++ b/_config.yml
@@ -25,7 +25,6 @@ markdown: kramdown
 
 # Category settings
 category_titles:
-  -
-    technology: "Anna the Technologist"
-    media: "Anna the Player of Games"
-    religion: "Anna the Mystic"
+  technology: "The Technologist"
+  media: "The Player of Games"
+  religion: "The Mystic"
diff --git a/_includes/category_list.html b/_includes/category_list.html
index fa11638..360dd40 100644
--- a/_includes/category_list.html
+++ b/_includes/category_list.html
@@ -1,5 +1,3 @@
-<h1 class="page-heading">{{ include.category | capitalize }}</h1>
-
 <ul class="post-list">
   {% for post in site.categories[include.category] limit:include.limit %}
     <li>
diff --git a/_includes/header.html b/_includes/header.html
index b3f86db..fbcc09d 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -13,13 +13,6 @@
         </svg>
       </a>
 
-      <div class="trigger">
-        {% for my_page in site.pages %}
-          {% if my_page.title %}
-          <a class="page-link" href="{{ my_page.url | prepend: site.baseurl }}">{{ my_page.title }}</a>
-          {% endif %}
-        {% endfor %}
-      </div>
     </nav>
 
   </div>
diff --git a/_layouts/category_index.html b/_layouts/category_index.html
index 83906ba..ab25861 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.data['category'] limit=0 %}
+    {% include category_list.html category=page.category limit=1000000 %}
   </div>
 
 </article>
diff --git a/_plugins/category_page.rb b/_plugins/category_page.rb
index 2bf5359..528531a 100644
--- a/_plugins/category_page.rb
+++ b/_plugins/category_page.rb
@@ -1,15 +1,15 @@
 class CategoryPage < Jekyll::Page
-  def initialize(site, base, dir, category)
+  def initialize(site, base, category)
     @site = site
     @base = base
-    @dir = dir
+    @dir = category
     @name = 'index.html'
     
     self.process(@name)
     self.read_yaml(File.join(base, '_layouts'), 'category_index.html')
     self.data['category'] = category
 
-    category_title = site.config['category_titles'][category] || category.capitalize
+    category_title = site.config["category_titles"][category] || category.capitalize
     self.data['title'] = "#{category_title}"
   end
 end
@@ -23,7 +23,7 @@ class CategoryPageGenerator < Jekyll::Generator
     end
 
     site.categories.each_key do |category|
-      site.pages << CategoryPage.new(site, site.source, category, category)
+      site.pages << CategoryPage.new(site, site.source, category)
     end
   end
   
diff --git a/index.html b/index.html
index 7bdb407..5cedcd4 100644
--- a/index.html
+++ b/index.html
@@ -4,6 +4,7 @@ layout: default
 <div class="home">
   {% for category in site.categories %}
     {% if category.first == "meta" %} {% continue %} {% endif %}
+    <h1 class="page-heading">{{ site.config.category_titles[category] }}</h1>
     <div class="column col-{{site.categories.size | minus: 1}}">
       {% include category_list.html category=category.first limit=5 %}
     </div>