diff --git a/nyaa/templates/edit.html b/nyaa/templates/edit.html
index 46ed917..8d6263d 100755
--- a/nyaa/templates/edit.html
+++ b/nyaa/templates/edit.html
@@ -17,18 +17,18 @@
 
 
 	<div class="row">
-		<div class="col-xl-6">
+		<div class="col-md-6">
 		{{ render_field(form.display_name, class_='form-control', placeholder='Display name') }}
 		</div>
-		<div class="col-xl-4">
+		<div class="col-md-4">
 		{{ render_field(form.category, class_='form-control')}}
 		</div>
 	</div>
 	<div class="row">
-		<div class="col-xl-6">
+		<div class="col-md-6">
 		{{ render_field(form.information, class_='form-control', placeholder='Your website or IRC channel') }}
 		</div>
-		<div class="col-xl-6">
+		<div class="col-md-6">
 			<label class="control-label">Torrent flags</label><br>
 			<div class="btn-group" data-toggle="buttons">
 				{# Only allow changing anonymous status when an uploader exists #}
@@ -46,6 +46,16 @@
 					<span class="glyphicon glyphicon-unchecked"></span>
 					Hidden
 				</label>
+				{% if g.user.is_moderator %}
+				<label class="btn btn-primary {% if torrent.deleted %}active{% endif %}">
+					{{ form.is_deleted }}
+					<span class="glyphicon glyphicon-check"></span>
+					<span class="glyphicon glyphicon-unchecked"></span>
+					Deleted
+				</label>
+				{% endif %}
+			</div>
+			<div class="btn-group" data-toggle="buttons">
 				<label class="btn btn-danger {% if torrent.remake %}active{% endif %}" title="This torrent is derived from another release">
 					{{ form.is_remake }}
 					<span class="glyphicon glyphicon-check"></span>
@@ -66,26 +76,18 @@
 					Trusted
 				</label>
 				{% endif %}
-				{% if g.user.is_moderator %}
-				<label class="btn btn-primary {% if torrent.deleted %}active{% endif %}">
-					{{ form.is_deleted }}
-					<span class="glyphicon glyphicon-check"></span>
-					<span class="glyphicon glyphicon-unchecked"></span>
-					Deleted
-				</label>
-				{% endif %}
 			</div>
 		</div>
 	</div>
 
 	<div class="row">
-		<div class="col-xl-12">
+		<div class="col-md-12">
 			{{ render_markdown_editor(form.description, field_name='description') }}
 		</div>
 	</div>
 
 	<div class="row">
-		<div class="form-group col-xl-6">
+		<div class="form-group col-md-6">
 			<input type="submit" value="Edit" class="btn btn-primary">
 		</div>
 	</div>
diff --git a/nyaa/templates/upload.html b/nyaa/templates/upload.html
index 0cf4faf..e9026c8 100755
--- a/nyaa/templates/upload.html
+++ b/nyaa/templates/upload.html
@@ -18,24 +18,24 @@
 
 	{% if config.ENFORCE_MAIN_ANNOUNCE_URL %}<p><strong>Important:</strong> Please include <kbd>{{ config.MAIN_ANNOUNCE_URL }}</kbd> in your trackers</p>{% endif %}
 	<div class="row">
-		<div class="col-xl-6">
+		<div class="col-md-10">
 		{{ render_upload(upload_form.torrent_file, accept=".torrent") }}
 		</div>
 	</div>
 	<div class="row">
-		<div class="col-xl-6">
+		<div class="col-md-6">
 		{{ render_field(upload_form.display_name, class_='form-control', placeholder='Display name') }}
 		</div>
-		<div class="col-xl-4">
+		<div class="col-md-4">
 		{{ render_field(upload_form.category, class_='form-control')}}
 		</div>
 	</div>
 	<div class="row"></div>
 	<div class="row form-group">
-		<div class="col-xl-6">
+		<div class="col-md-6">
 			{{ render_field(upload_form.information, class_='form-control', placeholder='Your website or IRC channel') }}
 		</div>
-		<div class="col-xl-6">
+		<div class="col-md-6">
 			<label class="control-label">Torrent flags</label><br>
 	
 			<div class="btn-group" data-toggle="buttons">
@@ -52,6 +52,9 @@
 					<span class="glyphicon glyphicon-unchecked"></span>
 					Hidden
 				</label>
+			</div>
+			<div class="btn-group" data-toggle="buttons">
+
 				<label class="btn btn-danger" title="This torrent is derived from another release">
 					{{ upload_form.is_remake }}
 					<span class="glyphicon glyphicon-check"></span>
@@ -76,14 +79,14 @@
 		</div>
 	</div>
 	<div class="row">
-		<div class="col-xl-12">
+		<div class="col-md-12">
 			{{ render_markdown_editor(upload_form.description, field_name='description') }}
 		</div>
 	</div>
 
 	{% if config.USE_RECAPTCHA and not g.user %}
 	<div class="row">
-		<div class="col-xl-4">
+		<div class="col-md-4">
 			{% for error in upload_form.recaptcha.errors %}
 			{{ error }}
 			{% endfor %}
@@ -95,7 +98,7 @@
 	<br>
 
 	<div class="row">
-		<div class="form-group col-xl-6">
+		<div class="form-group col-md-6">
 			<input type="submit" value="Upload" class="btn btn-primary">
 		</div>
 	</div>