diff --git a/gulp/res/css/style.css b/gulp/res/css/style.css
index 6c11984e..dc938ffe 100644
--- a/gulp/res/css/style.css
+++ b/gulp/res/css/style.css
@@ -843,15 +843,16 @@ input:invalid, textarea:invalid {
 	line-height: 3em;
 }
 
-a.button {
+.button {
 	-webkit-appearance: button;
 	-moz-appearance: button;
 	appearance: button;
 	text-decoration: none;
+	cursor: pointer;
 	color: initial;
 }
 
-a.button:hover {
+.button:hover {
 	color: initial!important;
 }
 
@@ -941,7 +942,7 @@ iframe.bypass {
 	overflow: hidden;
 }
 
-.label {
+.label, .rlabel {
 	padding: 3px;
 	border: 1px solid var(--box-border-color);
 	min-width: 80px;
@@ -953,6 +954,10 @@ iframe.bypass {
 	flex-direction: column;
 	justify-content: center;
 }
+.rlabel {
+	margin-right: 0;
+	margin-left: 1px;
+}
 
 hr {
 	border-top: 1px solid var(--hr);
@@ -1065,7 +1070,9 @@ table, .boardtable {
 #settingsmodal .form-wrapper.flexleft.mt-10, #settingsmodal .form-wrapper.flexleft.mt-10 .row {
 	width: 100%
 }
-
+row.wrap.sb .col {
+    flex-basis: calc(50% - 5px);
+}
 
 @media only screen and (max-height: 400px) {
 	.modal {
diff --git a/views/mixins/modal.pug b/views/mixins/modal.pug
index d4eb8ac9..315cdc06 100644
--- a/views/mixins/modal.pug
+++ b/views/mixins/modal.pug
@@ -26,6 +26,70 @@ mixin modal(data)
 		else if data.settings
 			.row
 				.form-wrapper.flexleft.mt-10
+					.row.wrap.sb
+						.col.mr-5
+							.row
+								label.postform-style.ph-5
+									input#live-setting(type='checkbox')
+								.rlabel Live posts
+							.row
+								label.postform-style.ph-5
+									input#notification-setting(type='checkbox')
+								.rlabel Notifications
+							.row
+								label.postform-style.ph-5
+									input#scroll-setting(type='checkbox')
+								.rlabel Scroll to new posts
+							.row
+								label.postform-style.ph-5
+									input#localtime-setting(type='checkbox')
+								.rlabel Local time
+							.row
+								label.postform-style.ph-5
+									input#24hour-setting(type='checkbox')
+								.rlabel 24h time
+							.row
+								label.postform-style.ph-5
+									input#relative-setting(type='checkbox')
+								.rlabel Show relative time
+
+						.col
+
+							.row
+								label.postform-style.ph-5
+									input#hideimages-setting(type='checkbox')
+								.rlabel Hide Thumbnails
+							.row
+								label.postform-style.ph-5
+									input#hiderecursive-setting(type='checkbox')
+								.rlabel Recursive Post Hide
+							.row
+								label.postform-style.ph-5
+									input#loop-setting(type='checkbox')
+								.rlabel Loop audio/video
+							.row
+								label.postform-style.ph-5
+									input#heightlimit-setting(type='checkbox')
+								.rlabel Unlimit expand height
+							.row
+								label.postform-style.ph-5
+									input#crispimages-setting(type='checkbox')
+								.rlabel Crisp image rendering
+							.row
+								label.postform-style.ph-5
+									input#imageloadingbars-setting(type='checkbox')
+								.rlabel Image loading bars
+
+					.row
+						.label Video/Audio Volume
+						label.postform-style.ph-5
+							input#volume-setting(type='range' min='0' max='100')
+					.row
+						.label Post Password
+						input#postpassword-setting(type='password' name='postpassword')
+					.row
+						.label Default Name
+						input#name-setting(type='text' name='name')
 					.row
 						.label Theme
 						select#theme-setting
@@ -38,64 +102,6 @@ mixin modal(data)
 							option(value='default') default
 							each theme in data.settings.codeThemes
 								option(value=theme) #{theme}
-					.row
-						.label Live posts
-						label.postform-style.ph-5
-							input#live-setting(type='checkbox')
-					.row
-						.label Notifications
-						label.postform-style.ph-5
-							input#notification-setting(type='checkbox')
-					.row
-						.label Scroll to new posts
-						label.postform-style.ph-5
-							input#scroll-setting(type='checkbox')
-					.row
-						.label Local time
-						label.postform-style.ph-5
-							input#localtime-setting(type='checkbox')
-					.row
-						.label 24h time
-						label.postform-style.ph-5
-							input#24hour-setting(type='checkbox')
-					.row
-						.label Show relative time
-						label.postform-style.ph-5
-							input#relative-setting(type='checkbox')
-					.row
-						.label Hide Thumbnails
-						label.postform-style.ph-5
-							input#hideimages-setting(type='checkbox')
-					.row
-						.label Recursive Post Hide
-						label.postform-style.ph-5
-							input#hiderecursive-setting(type='checkbox')
-					.row
-						.label Video/Audio Volume
-						label.postform-style.ph-5
-							input#volume-setting(type='range' min='0' max='100')
-					.row
-						.label Loop audio/video
-						label.postform-style.ph-5
-							input#loop-setting(type='checkbox')
-					.row
-						.label Unlimit expand height
-						label.postform-style.ph-5
-							input#heightlimit-setting(type='checkbox')
-					.row
-						.label Crisp image rendering
-						label.postform-style.ph-5
-							input#crispimages-setting(type='checkbox')
-					.row
-						.label Image loading bars (EXPERIMENTAL)
-						label.postform-style.ph-5
-							input#imageloadingbars-setting(type='checkbox')
-					.row
-						.label Post Password
-						input#postpassword-setting(type='password' name='postpassword')
-					.row
-						.label Default Name
-						input#name-setting(type='text' name='name')
 					.row
 						.label Custom CSS
-						textarea#customcss-setting(rows=10)
+						textarea#customcss-setting(rows=7)