diff --git a/src/back/jdd-components/split-view/split-view.css b/src/back/jdd-components/split-view/split-view.css
index a213e58..d7e97b5 100644
--- a/src/back/jdd-components/split-view/split-view.css
+++ b/src/back/jdd-components/split-view/split-view.css
@@ -3,12 +3,7 @@
 
 	display: grid;
 	grid-template-columns: subgrid;
-
-	@container (max-width: 640px) {
-		display: flex;
-		flex-flow: column;
-		gap: var(--row-gap);
-	}
+	grid-column: screen !important;
 
 	.split-view__half {
 		flex-basis: 50%;
@@ -55,8 +50,6 @@
 	}
 
 	&.split-view--bleed-left--screen {
-		grid-column-start: screen-start;
-
 		.split-view__half {
 			&:nth-child(1) {
 				grid-column-start: screen-start;
@@ -65,8 +58,6 @@
 	}
 
 	&.split-view--bleed-right--screen {
-		grid-column-end: screen-end;
-
 		.split-view__half {
 			&:nth-child(2) {
 				grid-column-end: screen-end;
@@ -75,8 +66,6 @@
 	}
 
 	&.split-view--bleed-left--bleed {
-		grid-column-start: bleed-start;
-
 		.split-view__half {
 			&:nth-child(1) {
 				grid-column-start: bleed-start;
@@ -85,8 +74,6 @@
 	}
 
 	&.split-view--bleed-right--bleed {
-		grid-column-end: bleed-end;
-
 		.split-view__half {
 			&:nth-child(2) {
 				grid-column-end: bleed-end;
@@ -94,6 +81,41 @@
 		}
 	}
 
+	@container (max-width: 640px) {
+		display: grid;
+		grid-template-columns: subgrid;
+		row-gap: var(--row-gap);
+
+		.split-view__half:nth-child(1),
+		.split-view__half:nth-child(2) {
+			grid-column: content !important;
+		}
+
+		&.split-view--bleed-right--bleed {
+			.split-view__half:nth-child(2) {
+				grid-column: bleed !important;
+			}
+		}
+
+		&.split-view--bleed-left--bleed {
+			.split-view__half:nth-child(1) {
+				grid-column: bleed !important;
+			}
+		}
+
+		&.split-view--bleed-right--screen {
+			.split-view__half:nth-child(2) {
+				grid-column: screen !important;
+			}
+		}
+
+		&.split-view--bleed-left--screen {
+			.split-view__half:nth-child(1) {
+				grid-column: screen !important;
+			}
+		}
+	}
+
 	&.split-view--without-row-gap {
 		row-gap: 0;
 	}
diff --git a/src/main.css b/src/main.css
index 4303d19..8cec6ec 100644
--- a/src/main.css
+++ b/src/main.css
@@ -73,7 +73,7 @@ body {
 	}
 
 	@container (max-width: 600px) {
-		--screen-padding: 0px;
+		--screen-padding: 8px;
 	}
 
 	@container (max-width: 400px) {