diff --git a/nyaa/static/js/main.js b/nyaa/static/js/main.js
index 96c59f4..99c5355 100644
--- a/nyaa/static/js/main.js
+++ b/nyaa/static/js/main.js
@@ -77,6 +77,26 @@ document.addEventListener("DOMContentLoaded", function(event) {
 	};
 });
 
+// Initialise markdown editors on page
+document.addEventListener("DOMContentLoaded", function() {
+  var markdownEditors = Array.prototype.slice.call(document.querySelectorAll('.markdown-editor'));
+
+  markdownEditors.forEach(function (markdownEditor) {
+    var fieldName = markdownEditor.getAttribute('data-field-name');
+
+    var previewTabSelector = '#' + fieldName + '-preview-tab';
+    var targetSelector = '#' + fieldName + '-markdown-target';
+    var sourceSelector = markdownEditor.querySelector('.markdown-source');
+
+    var previewTabEl = markdownEditor.querySelector(previewTabSelector);
+    var targetEl = markdownEditor.querySelector(targetSelector);
+
+    previewTabEl.addEventListener('click', function () {
+      targetEl.innerHTML = marked(sourceSelector.value.trim());
+    });
+  });
+});
+
 // 
 // This is the unminified version of the theme changer script in the layout.html @ line: 21
 // ===========================================================
diff --git a/nyaa/templates/_formhelpers.html b/nyaa/templates/_formhelpers.html
index 5e29a43..e7abd4c 100644
--- a/nyaa/templates/_formhelpers.html
+++ b/nyaa/templates/_formhelpers.html
@@ -31,20 +31,30 @@
 {% else %}
     <div class="form-group">
 {% endif %}
-    <div class="markdown-editor" id="{{ field_name }}-markdown-editor">
+    <div class="markdown-editor" id="{{ field_name }}-markdown-editor" data-field-name="{{ field_name }}">
         <ul class="nav nav-tabs" role="tablist">
-            <li role="presentation" class="active"><a href="#{{ field_name }}-tab" aria-controls="" role="tab" data-toggle="tab">Write</a></li>
-            <li role="presentation"><a href="#{{ field_name }}-preview" id="{{ field_name }}-preview-tab" aria-controls="preview" role="tab" data-toggle="tab">Preview</a></li>
+            <li role="presentation" class="active">
+                <a href="#{{ field_name }}-tab" aria-controls="" role="tab" data-toggle="tab">
+                    Write
+                </a>
+            </li>
+            <li role="presentation">
+                <a href="#{{ field_name }}-preview" id="{{ field_name }}-preview-tab" aria-controls="preview" role="tab" data-toggle="tab">
+                    Preview
+                </a>
+            </li>
         </ul>
         <div class="tab-content">
             <div role="tabpanel" class="tab-pane active" id="{{ field_name }}-tab" data-markdown-target="#{{ field_name }}-markdown-target">
                 {{ render_field(field, class_='form-control markdown-source') }}
             </div>
             <div role="tabpanel" class="tab-pane" id="{{ field_name }}-preview">
+                {{ field.label(class='control-label') }}
                 <div id="{{ field_name }}-markdown-target"></div>
             </div>
         </div>
     </div>
+</div>
 {% endmacro %}
 
 
diff --git a/nyaa/templates/upload.html b/nyaa/templates/upload.html
index feeb59d..5119b25 100644
--- a/nyaa/templates/upload.html
+++ b/nyaa/templates/upload.html
@@ -38,11 +38,11 @@
 		</div>
 	</div>
 
-	<div class="row">
-		<div class="form-group col-md-6">
-			{{ render_field(form.description, class_='form-control') }}
-		</div>
-	</div>
+    <div class="row">
+        <div class="form-group col-md-6">
+            {{ render_markdown_editor(form.description, field_name='description') }}
+        </div>
+    </div>
 
 	<div class="row">
 		<div class="form-group col-md-6">