diff --git a/tpl/base.html b/tpl/base.html
index 3dfc06c..51f4faa 100644
--- a/tpl/base.html
+++ b/tpl/base.html
@@ -51,6 +51,11 @@
 			
 			.tag {background:var(--primary);color:var(--contrast);font-size:0.8em;font-weight:600;padding:0.1em 0.3em;border-radius:3px;}
 
+			.grid_2x2 {
+				grid-template-columns: repeat(2, 1fr);
+				grid-template-rows: repeat(2, 1fr);
+			}
+
 			.rainbow-text {
 				background-image: repeating-linear-gradient(90deg, #ff0000, #ffff00, #00ff00, #00ffff, #0000ff, #ff00ff, #ff0000, #ffff00, #00ff00, #00ffff, #0000ff, #ff00ff);
 				text-align: center;
diff --git a/tpl/blocks/badge.html b/tpl/blocks/badge.html
index c553a99..91baf5b 100644
--- a/tpl/blocks/badge.html
+++ b/tpl/blocks/badge.html
@@ -42,16 +42,10 @@
 			</em></p>
 		{% endif %}
 		
-		<div class="grid">
-			{% if order.ans('propic') %}
-				<input type="submit" name="submit" value="Delete main image" {{'disabled' if time() > PROPIC_DEADLINE else ''}} />
-			{% endif %}
-			{% if order.ans('propic_fursuiter') %}
-				<input type="submit" name="submit" value="Delete fursuit image" {{'disabled' if time() > PROPIC_DEADLINE else ''}} />
-			{% endif %}
-			{% if not order.ans('propic') or (order.is_fursuiter and not order.ans('propic_fursuiter')) %}
-				<input type="submit" name="submit" value="Upload" />
-			{% endif %}
+		<div class="grid grid_2x2">
+			<input style="grid-area: 1 / 1 / 2 / 3;" type="submit" name="submit" value="Upload" {{'disabled' if (order.ans('propic') and order.ans('propic_fursuiter')) else ''}} />
+			<input style="grid-area: 2 / 1 / 3 / 2;" type="submit" name="submit" value="Delete main image" {{'disabled' if (time() > PROPIC_DEADLINE or not order.ans('propic'))  else ''}} />
+			<input style="grid-area: 2 / 2 / 3 / 3;" type="submit" name="submit" value="Delete fursuit image" {{'disabled' if (time() > PROPIC_DEADLINE or not order.ans('propic_fursuiter')) else ''}} />
 		</div>
 	</form>
 </details>
diff --git a/tpl/blocks/room.html b/tpl/blocks/room.html
index f083909..dbf1c80 100644
--- a/tpl/blocks/room.html
+++ b/tpl/blocks/room.html
@@ -75,19 +75,15 @@
 		{% endif %}
 	{% endif %}
 	
-	<p class="grid">
+	<p class="grid grid_2x2">
 		{% if order.room_owner %}
 			
 			{% if not order.room_confirmed %}
-
-				{% if len(room_members) == 1 %}
-					<a href="/manage/room/delete" role="button">Delete room</a>	
-				{% endif %}	
-
 				{# <a role="button" {% if not room.forbidden and quota.get_left(len(room_members)) > 0 %}href="javascript:document.getElementById('modal-roomconfirm').setAttribute('open', 'true');"{% endif %}>Confirm <strong>{{[None,'single','double','triple','quadruple','quintuple'][len(room_members)]}}</strong> room</a> #}
-				<a role="button" {% if not room.forbidden and len(room_members) == order.room_person_no %}href="javascript:document.getElementById('modal-roomconfirm').setAttribute('open', 'true');"{% endif %}>Confirm <strong>{{[None,'single','double','triple','quadruple','quintuple'][order.room_person_no]}}</strong> room</a>
-			
-				<a role="button" href="javascript:document.getElementById('modal-roomrename').setAttribute('open', 'true');">Rename room</a>
+
+				<a style="grid-area: 1 / 1 / 2 / 2;" role="button" href="javascript:document.getElementById('modal-roomrename').setAttribute('open', 'true');">Rename room</a>
+				<a style="grid-area: 1 / 2 / 2 / 3;" href="/manage/room/delete" role="button" {{'disabled' if (len(room_members) > 1) else ''}} >Delete room</a>	
+				<a style="grid-area: 2 / 1 / 3 / 3; display:block;" role="button" {% if not room.forbidden and len(room_members) == order.room_person_no %}href="javascript:document.getElementById('modal-roomconfirm').setAttribute('open', 'true');"{% endif %}>Confirm <strong>{{[None,'single','double','triple','quadruple','quintuple'][order.room_person_no]}}</strong> room</a>
 			{% endif %}
 		{% else %}
 			{% if order.room_id and not order.room_confirmed %}