diff --git a/src/ratpack/handlebars/topic-watch.html.hbs b/src/ratpack/handlebars/topic-watch.html.hbs
index 6d6d24a..aeaf54b 100644
--- a/src/ratpack/handlebars/topic-watch.html.hbs
+++ b/src/ratpack/handlebars/topic-watch.html.hbs
@@ -40,6 +40,7 @@
         <code>{{topic}}:{{partition}}</code>
         <span class="offset">(offset: {{offset}})</span>
         <pre class="pre-scrollable message-raw">{{raw}}</pre>
+        <span class="message-show-b64"><a href="#" onClick="$('#{{message_id}}_b64').toggle();">toggle base64</a></span>
         <br/>
         <div class="message-b64" id="{{message_id}}_b64" style="display: none;">
             <pre class="pre-scrollable message-b64">{{b64}}</pre>
diff --git a/src/ratpack/public/css/offtopic.css b/src/ratpack/public/css/offtopic.css
index 970c813..9aab62c 100644
--- a/src/ratpack/public/css/offtopic.css
+++ b/src/ratpack/public/css/offtopic.css
@@ -26,3 +26,7 @@ body {
 .message-timestamp {
     float: right;
 }
+
+.message-show-b64 {
+    font-size: 0.7em;
+}
diff --git a/src/ratpack/public/js/ws.js b/src/ratpack/public/js/ws.js
index 1918272..9918891 100644
--- a/src/ratpack/public/js/ws.js
+++ b/src/ratpack/public/js/ws.js
@@ -27,10 +27,6 @@ function watchTopic(name) {
                     timestamp: moment(data.tstamp, 'x').format('MMM Do YYYY, H:mm:ss')
                 }));
 
-                $("#" + el_id).click(function(ev) {
-                    $("#"+el_id+'_b64').toggle();
-                });
-
                 // Let's only keep the last 50
                 if (messages.children().size() > 50) {
                     messages.children().last().remove();