diff --git a/Rocksolid_Light/common/themes/style.css b/Rocksolid_Light/common/themes/style.css
index e90e0c3..6fea9b7 100644
--- a/Rocksolid_Light/common/themes/style.css
+++ b/Rocksolid_Light/common/themes/style.css
@@ -77,9 +77,9 @@
 
 .search_suggestion_inline {
 	display: inline;
-  }
-  
-  .search_suggestion_link-button {
+}
+
+.search_suggestion_link-button {
 	background: none;
 	border: none;
 	color: var(--color-link);
@@ -88,13 +88,15 @@
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 0.6em;
 	font-family: serif;
-  }
-  .search_suggestion_link-button:focus {
+}
+
+.search_suggestion_link-button:focus {
 	outline: none;
-  }
-  .search_suggestion_link-button:active {
-	color:red;
-  }
+}
+
+.search_suggestion_link-button:active {
+	color: red;
+}
 
 .theme_listbox {
 	border: none;
@@ -1012,6 +1014,17 @@ textarea.configuration {
 	margin: 0px;
 }
 
+.scroll {
+	scroll-snap-type: y proximity;
+	flex-grow: 1;
+	overflow: auto;
+}
+
+section {
+	/* Snap align start. */
+	scroll-snap-align: start;
+}
+
 /* Mobile Styles */
 @media only screen and (max-device-width: 480px) {
 	body {
@@ -1114,7 +1127,7 @@ textarea.configuration {
 
 	.np_thread_line1_icon {
 		max-width: 100%;
-            height: auto;
+		height: auto;
 		background: var(--color-dark);
 		border-bottom: 1px solid var(--color-row-border);
 		border-right: 1px solid var(--color-row-border);
@@ -1127,7 +1140,7 @@ textarea.configuration {
 	/* Odd line numbers in the thread */
 	.np_thread_line2_icon {
 		max-width: 100%;
-            height: auto;
+		height: auto;
 		background: var(--color-light);
 		/*	border-top: 1px solid var(--color-row-border); */
 		border-bottom: 1px solid var(--color-row-border);
@@ -1201,11 +1214,6 @@ textarea.configuration {
 	}
 }
 
-.scroll {
-	flex-grow: 1;
-	overflow: auto;
-}
-
 /* Desktop Styles */
 @media only screen and (min-device-width: 821px) {
 	body {
diff --git a/Rocksolid_Light/rocksolid/article-flat.php b/Rocksolid_Light/rocksolid/article-flat.php
index a96718c..d409bea 100644
--- a/Rocksolid_Light/rocksolid/article-flat.php
+++ b/Rocksolid_Light/rocksolid/article-flat.php
@@ -171,11 +171,12 @@ if ($message) {
     foreach ($pageids as $subid) {
         flush();
         $message = message_read($subid, 0, $group);
-        echo '<p id="' . $subid . '"> </p>';
+        echo '<section id="' . $subid . '">';
         $is_blocked = message_show($group, $subid, 0, $message, $articleflat_chars_per_articles);
         if (((! $CONFIG['readonly']) && ($message)) && $is_blocked != "blocked") {
             echo '<form action="' . $file_post . '">' . '<input type="hidden" name="id" value="' . urlencode($subid) . '">' . '<input type="hidden" name="type" value="reply">' . '<input type="hidden" name="group" value="' . urlencode($group) . '">' . '<input type="submit" value="' . $text_article["button_answer"] . '">' . '</form>';
         }
+        echo ' </section>';
     }
     // Display section/group/subject
     echo '<hr><h1 class="np_thread_headline">';