diff --git a/ruqqus/templates/default.html b/ruqqus/templates/default.html
index 628b0af74..819f0a222 100644
--- a/ruqqus/templates/default.html
+++ b/ruqqus/templates/default.html
@@ -4,6 +4,18 @@
 	{% include "bootstrap.html" %}
 
 	<script>
+		$('.expandable-image').click( function(event) {
+
+			if (event.which != 1) {
+				return
+			}
+			event.preventDefault();
+
+			var url= $(this).data('url');
+
+			expandDesktopImage(url,url);
+		})
+	
 		$('.text-expand').click(function(event){
 		  if (event.which != 1) {
 			return
diff --git a/ruqqus/templates/submit.html b/ruqqus/templates/submit.html
index b56d14b86..a238c339e 100644
--- a/ruqqus/templates/submit.html
+++ b/ruqqus/templates/submit.html
@@ -1,9 +1,20 @@
 <!DOCTYPE html>
 <html lang="en">
-
 <head>
+
+		{% include "bootstrap.html" %}
+
 		<script>
 		
+		$(document).ready(function() {
+			$('#submitform').submit(function() {
+					// disable button
+					$("#create_button").prop("disabled", true);
+					// add spinner to button
+					$("#create_button").html('<span class="spinner-border spinner-border-sm mr-2" role="status" aria-hidden="true"></span>Creating post');
+				});
+			});
+
 			// Text Formatting
 
 			// Bold Text
@@ -416,8 +427,6 @@
 
 		{% endblock %}
 
-		{% include "bootstrap.html" %}
-
 		<!-- Drama JS -->
 
 		<script src="/assets/js/all_js.js"></script>
