diff --git a/snipt/media/cache/snipt.css b/snipt/media/cache/snipt.css
index 0fa0c03..b953b1e 100644
--- a/snipt/media/cache/snipt.css
+++ b/snipt/media/cache/snipt.css
@@ -420,7 +420,6 @@ html, body {
 body {
   color: #666;
   font: normal 14px 'Helvetica Neue', Helvetica, Arial, 'Liberation Sans', FreeSans, sans-serif;
-  overflow-y: scroll;
   text-rendering: optimizeLegibility;
 }
 header.main {
@@ -819,7 +818,7 @@ article.snipt div.container:after {
 }
 article.snipt aside {
   float: right;
-  margin: 29px 30px 0 0;
+  margin: 23px 30px 0 0;
   width: 100px;
 }
 article.snipt aside ul.options li {
@@ -870,8 +869,20 @@ article.snipt aside section.tags ul li {
 article.snipt aside section.tags ul li a {
   border-bottom: 1px solid #999;
   color: #999;
+  display: inline-block;
   font: normal 12px 'Helvetica Neue', Helvetica, Arial, 'Liberation Sans', FreeSans, sans-serif;
+  max-width: 72px;
+  overflow: hidden;
+  text-overflow: ellipsis;
   text-decoration: none;
+  white-space: nowrap;
+}
+article.snipt aside section.tags ul li a:hover {
+  border-color: #000;
+  color: #000;
+}
+article.snipt aside.expanded li {
+  display: block;
 }
 article.snipt footer {
   clear: both;
diff --git a/snipt/media/cache/snipt.js b/snipt/media/cache/snipt.js
index 914d5f1..1d79cb4 100644
--- a/snipt/media/cache/snipt.js
+++ b/snipt/media/cache/snipt.js
@@ -971,6 +971,7 @@ jQuery(function($) {
             this.model.view = this;
             this.$el = $(this.el);
             this.$container = $('div.container', this.$el);
+            this.$aside = $('aside', this.$el);
             this.$expand_button = $('a.expand', this.$el);
         },
         events: {
@@ -978,6 +979,7 @@ jQuery(function($) {
         },
         expand: function() {
             this.$container.toggleClass('expanded', 100);
+            this.$aside.toggleClass('expanded');
             return false;
         }
     });
diff --git a/snipt/media/css/style.css b/snipt/media/css/style.css
index 97ead45..9693f82 100644
--- a/snipt/media/css/style.css
+++ b/snipt/media/css/style.css
@@ -16,7 +16,6 @@ html, body {
 body {
   color: #666;
   font: normal 14px 'Helvetica Neue', Helvetica, Arial, 'Liberation Sans', FreeSans, sans-serif;
-  overflow-y: scroll;
   text-rendering: optimizeLegibility;
 }
 header.main {
@@ -415,7 +414,7 @@ article.snipt div.container:after {
 }
 article.snipt aside {
   float: right;
-  margin: 29px 30px 0 0;
+  margin: 23px 30px 0 0;
   width: 100px;
 }
 article.snipt aside ul.options li {
@@ -466,8 +465,20 @@ article.snipt aside section.tags ul li {
 article.snipt aside section.tags ul li a {
   border-bottom: 1px solid #999;
   color: #999;
+  display: inline-block;
   font: normal 12px 'Helvetica Neue', Helvetica, Arial, 'Liberation Sans', FreeSans, sans-serif;
+  max-width: 72px;
+  overflow: hidden;
+  text-overflow: ellipsis;
   text-decoration: none;
+  white-space: nowrap;
+}
+article.snipt aside section.tags ul li a:hover {
+  border-color: #000;
+  color: #000;
+}
+article.snipt aside.expanded li {
+  display: block;
 }
 article.snipt footer {
   clear: both;
diff --git a/snipt/snipts/templates/snipts/tags-public.html b/snipt/snipts/templates/snipts/tags-public.html
index 43ae340..c0e71fc 100644
--- a/snipt/snipts/templates/snipts/tags-public.html
+++ b/snipt/snipts/templates/snipts/tags-public.html
@@ -7,5 +7,5 @@
             </li>
         {% endfor %}
     </ul>
-    <a href="/public/tags/" class="view-all">View all public tags &raquo;</a>
+    <a href="/public/tags/" class="view-all">View all &raquo;</a>
 </section>