diff --git a/_layouts/default.html b/_layouts/default.html
index d7ae42f..38ff40e 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -63,7 +63,12 @@
           <span class="postal-code"></span>
           <span class="country-name">USA</span>
          </div>
-      </div>
+
+        <h3>Tags</h3>
+        <div id="tag-cloud">
+            {{ site | tag_cloud }}
+        </div>
+    </div>
       
       <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/prototype/1.6/prototype.js"></script>
       
diff --git a/_layouts/tag_page.html b/_layouts/tag_page.html
new file mode 100644
index 0000000..b9582f7
--- /dev/null
+++ b/_layouts/tag_page.html
@@ -0,0 +1,9 @@
+---
+layout: default
+---
+<h2>{{ page.tag }}</h2>
+<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>
diff --git a/images/tag-icon.gif b/images/tag-icon.gif
new file mode 100644
index 0000000..769cd16
Binary files /dev/null and b/images/tag-icon.gif differ