diff --git a/_layouts/tag_page.html b/_layouts/tag_page.html
index 24fe086..8bc65da 100644
--- a/_layouts/tag_page.html
+++ b/_layouts/tag_page.html
@@ -1,33 +1,19 @@
-<!doctype html>
-<!--[if lt IE 7]><html class="no-js lt-ie9 lt-ie8 lt-ie7" lang="en"> <![endif]-->
-<!--[if (IE 7)&!(IEMobile)]><html class="no-js lt-ie9 lt-ie8" lang="en"><![endif]-->
-<!--[if (IE 8)&!(IEMobile)]><html class="no-js lt-ie9" lang="en"><![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en"><!--<![endif]-->
-<head>
-{% include head.html %}
-</head>
-
-<body id="page">
-
-{% include browser-upgrade.html %}
-{% include navigation.html %}
-
-<div id="main" role="main">
-  <article class="hentry">
-    <header class="header-title">
-      <div class="header-title-wrap">
-        <h1 class="entry-title">Posts tagged as '{{ page.tag }}'</h1>
-      </div><!-- /.header-title-wrap -->
-    </header>
-    <div class="entry-content">
-      <ul>
-        {% for post in page.posts %}
-            <li><a href="{{ post.url }}">{{ post.title }}</a> ({{ post.date | date_to_string }} | Tags: {{ post | tags }})</li>
-        {% endfor %}
-      </ul>
-    </div><!-- /.entry-content -->
-  </article>
-</div><!-- /#main -->
-
-</body>
-</html>
\ No newline at end of file
+---
+layout: page
+comments: false
+show_meta: false
+breadcrumb: true
+header:
+    image_fullwidth: "banner.jpg"
+sidebar: right
+---
+<div id="blog-index" class="row">
+<h2 class="entry-title">Posts tagged as '{{ page.title }}'</h2>
+    <div class="small-12 columns t30">
+        <ul>
+            {% for post in page.posts %}
+                <li><a href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a> ({{ post.date | date_to_string }})</li>
+            {% endfor %}
+        </ul>
+    </div><!-- small-12columns t30 -->
+</div><!-- blog-index  -->
diff --git a/tags/index.html b/tag/index.html
similarity index 70%
rename from tags/index.html
rename to tag/index.html
index 4a833d3..f50c141 100644
--- a/tags/index.html
+++ b/tag/index.html
@@ -3,19 +3,20 @@ layout: page
 title: Tag Archive
 description: "An archive of posts sorted by tag."
 comments: false
+breadcrumb: true
 ---
 
 {% capture site_tags %}{% for tag in site.tags %}{{ tag | first }}{% unless forloop.last %},{% endunless %}{% endfor %}{% endcapture %}
 {% assign tags_list = site_tags | split:',' | sort %}
 
-<ul class="entry-meta inline-list">
+<ul class="small-block-grid-2 medium-block-grid-3 large-block-grid-5">
   {% for item in (0..site.tags.size) %}{% unless forloop.last %}
     {% capture this_word %}{{ tags_list[item] | strip_newlines }}{% endcapture %}
-  	<li><a href="#{{ this_word }}" class="tag"><span class="term">{{ this_word }}</span> <span class="count">{{ site.tags[this_word].size }}</span></a></li>
+  	<li><a href="{{ site.url }}/tag/{{ this_word | slugify }}/" class="tag"><span class="term">{{ this_word }}</span> (<span class="count">{{ site.tags[this_word].size }})</span></a></li>
   {% endunless %}{% endfor %}
 </ul>
 
-{% for item in (0..site.tags.size) %}{% unless forloop.last %}
+<!--{% for item in (0..site.tags.size) %}{% unless forloop.last %}
   {% capture this_word %}{{ tags_list[item] | strip_newlines }}{% endcapture %}
 	<article>
 	<h2 id="{{ this_word }}" class="tag-heading">{{ this_word }}</h2>
@@ -25,4 +26,4 @@ comments: false
     {% endif %}{% endfor %}
 		</ul>
 	</article><!-- /.hentry -->
-{% endunless %}{% endfor %}
+<!-- {% endunless %}{% endfor %}-->
