diff --git a/files/style/be.bastelstu.chat.scss b/files/style/be.bastelstu.chat.scss
index d6bf752..24d363f 100644
--- a/files/style/be.bastelstu.chat.scss
+++ b/files/style/be.bastelstu.chat.scss
@@ -70,17 +70,27 @@ #tpl_chat_log {
 			flex: 0.5 0 auto;
 			flex-direction: column;
 			margin-left: 10px;
-			max-width: 310px;
+			max-width: min(310px, 35%);
 
 			> .boxContainer {
 				-webkit-columns: 1;
 				-moz-columns: 1;
 				columns: 1;
+
+				margin-bottom: 0;
 			}
 		}
 	}
 
-	@include screen-lg {
+	@include screen-sm-up {
+		.layoutBoundary {
+			flex-wrap: nowrap;
+		}
+
+		.content + .sidebar.boxesSidebarRight {
+			margin-top: 0;
+		}
+
 		.boxesSidebarRight {
 			&,
 			> .boxContainer {
@@ -128,7 +138,9 @@ #tpl_chat_log {
 				}
 			}
 		}
+	}
 
+	@include screen-lg {
 		#chatQuickSettings {
 			display: none;
 		}