diff --git a/js/inline-expanding.js b/js/inline-expanding.js
index e529a395..61085b0d 100644
--- a/js/inline-expanding.js
+++ b/js/inline-expanding.js
@@ -17,6 +17,9 @@ onready(function(){
 
 		for (var i = 0; i < link.length; i++) {
 			if (typeof link[i] == "object" && link[i].childNodes && typeof link[i].childNodes[0] !== 'undefined' && link[i].childNodes[0].src && link[i].className != 'file') {
+				if (window.jQuery && !$(link).prev().hasClass('fileinfo')) {
+					continue;	
+				}
 				link[i].childNodes[0].style.maxWidth = '95%';
 				link[i].onclick = function(e) {
 					if (this.childNodes[0].className == 'hidden')
diff --git a/templates/header.html b/templates/header.html
index 3791296f..c1230f0e 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -13,17 +13,31 @@
 			{% endif %}
 		{% endif %}
 		{% if config.recaptcha %}<style type="text/css">{% raw %}
-			.recaptcha_image_cell {
-				background: none !important;
+			#recaptcha_area {
+				float: none !important;
+				padding: 0 !important;
 			}
-			table.recaptchatable {
+			#recaptcha_logo, #recaptcha_privacy {
+				display: none;
+			}
+			#recaptcha_table {
 				border: none !important;
 			}
-			#recaptcha_logo, #recaptcha_tagline {
-				display: none;
-				float: right;
+			#recaptcha_table tr:first-child {
+				height: auto;
 			}
-			.recaptchatable a {
-				display: block;
+			.recaptchatable img {
+				float: none !important;
+			}
+			#recaptcha_response_field {
+				font-size: 10pt !important;
+				border: 1px solid #a9a9a9 !important;
+				padding: 1px !important;
+			}
+			td.recaptcha_image_cell {
+				background: transparent !important;
+			}
+			.recaptchatable, #recaptcha_area tr, #recaptcha_area td, #recaptcha_area th {
+				padding: 0 !important;
 			}
 		{% endraw %}</style>{% endif %}
\ No newline at end of file