diff --git a/templates/partials/modals/flag_modal.tpl b/templates/partials/modals/flag_modal.tpl
index 66638da..d54c08b 100644
--- a/templates/partials/modals/flag_modal.tpl
+++ b/templates/partials/modals/flag_modal.tpl
@@ -1,5 +1,5 @@
 <div class="modal" tabindex="-1" role="dialog" aria-labelledby="Flag post" aria-hidden="true">
-	<div class="modal-dialog">
+	<div class="modal-dialog modal-lg">
 		<div class="modal-content">
 			<div class="modal-header">
 				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
@@ -11,9 +11,6 @@
 				<p class="lead">
 					[[flags:modal-body, {type}, {id}]]
 				</p>
-				<div class="form-group">
-					<textarea class="form-control" id="flag-reason-custom" placeholder="[[flags:modal-reason-custom]]"></textarea>
-				</div>
 				<div class="btn-group btn-group-justified">
 					<div class="btn-group">
 						<button class="btn btn-default flag-reason">[[flags:modal-reason-spam]]</button>
@@ -21,11 +18,16 @@
 					<div class="btn-group">
 						<button class="btn btn-default flag-reason">[[flags:modal-reason-offensive]]</button>
 					</div>
+					<div class="btn-group">
+						<button class="btn btn-default toggle-custom">[[flags:modal-reason-other]]</button>
+					</div>
+				</div>
+				<div class="form-group">
+					<textarea class="form-control" id="flag-reason-custom" placeholder="[[flags:modal-reason-custom]]" disabled="disabled"></textarea>
 				</div>
-			</div>
 
-			<div class="modal-footer">
-				<button type="button" class="btn btn-primary" id="flag-post-commit" disabled>[[flags:modal-submit]]</button>
+				<button type="button" class="btn btn-primary pull-right" id="flag-post-commit" disabled>[[flags:modal-submit]]</button>
+				<div class="clear"></div>
 			</div>
 		</div>
 	</div>