diff --git a/templates/forums.html b/templates/forums.html
index 04a3c2b..e833d4f 100755
--- a/templates/forums.html
+++ b/templates/forums.html
@@ -18,8 +18,7 @@
             <input type="text" name="q" value="{{ .Query }}" id="search-input" placeholder="Type to search..." />
             <button id="search-wrapper-ico" class="material-icons-round" name="t" value="forum">search</button>
             <div class="autocomplete">
-                <ul>
-            </ul>
+                <ul></ul>
             </div>
             <input type="submit" class="hide" name="t" value="forum" />
         </div>
@@ -41,10 +40,10 @@
                 <button name="t" value="forum" class="clickable search-active">Forums</button>
             </div>
             <div id="content" class="js-enabled">
-            <div class="search-container-results-btn">
-                <button id="sub-search-wrapper-ico" class="material-icons-round clickable" name="t" value="map">map</button>
-                <button name="t" value="map" class="clickable">Maps</button>
-            </div>
+                <div class="search-container-results-btn">
+                    <button id="sub-search-wrapper-ico" class="material-icons-round clickable" name="t" value="map">map</button>
+                    <button name="t" value="map" class="clickable">Maps</button>
+                </div>
             </div>
             <div class="search-container-results-btn">
                 <button id="sub-search-wrapper-ico" class="material-icons-round clickable" name="t" value="file">share</button>
@@ -63,9 +62,9 @@
             <option value="{{.Code}}" {{if eq .Code $.CurrentLang}}selected{{end}}>{{.Name}}</option>
             {{end}}
         </select>        
-        <button class="results-save" name="t" value="text">Apply settings</button>
+        <button class="results-save" name="t" value="forum">Apply settings</button>
     </form>    
-    <div class="results">
+    <div class="results" id="results">
         {{if .Results}}
             {{range .Results}}
                 <div class="result_item">
@@ -75,22 +74,32 @@
                 </div>
                 <br>
             {{end}}
-        {{else}}
+        {{else if .NoResults}}
             <div class="no-results">No results found for '{{ .Query }}'. Try different keywords.</div>
+        {{else}}
+            <div class="no-more-results">Looks like this is the end of results.</div>
         {{end}}
+    </div>    
+    <div class="message-bottom-left" id="message-bottom-left">
+        <span>Searching for new results...</span>
     </div>
-    <div class="prev-next prev-img">
+    <div class="prev-next prev-img" id="prev-next">
         <form action="/search" method="get">
             <input type="hidden" name="q" value="{{ .Query }}">
-            <input type="hidden" name="t" value="text">
-            {{ if .HasPrevPage }}
-            <button type="submit" name="p" value="{{ sub .Page 1 }}">Previous</button>
-            {{ end }}
-            {{ if .HasNextPage }}
-            <button type="submit" name="p" value="{{ add .Page 1 }}">Next</button>
-            {{ end }}
+            <input type="hidden" name="t" value="forum">
+            <div id="content" class="js-enabled">
+                {{ if .HasPrevPage }}
+                <button type="submit" name="p" value="{{ sub .Page 1 }}">Previous</button>
+                {{ end }}
+                {{ if .HasNextPage }}
+                <button type="submit" name="p" value="{{ add .Page 1 }}">Next</button>
+                {{ end }}
+            </div>
         </form>
     </div>
+    <!-- Pass the relevant data for dynamic scrolling -->
+    <div id="template-data" data-page="{{ .Page }}" data-query="{{ .Query }}" data-type="forum"></div>
+    <script defer src="/static/js/dynamicscrolling.js"></script>
     <script defer src="/static/js/autocomplete.js"></script>
     <script>
         // Check if JavaScript is enabled and modify the DOM accordingly
diff --git a/templates/text.html b/templates/text.html
index 21fdcd8..2be2d2b 100755
--- a/templates/text.html
+++ b/templates/text.html
@@ -88,12 +88,14 @@
         <form action="/search" method="get">
             <input type="hidden" name="q" value="{{ .Query }}">
             <input type="hidden" name="t" value="text">
-            {{ if .HasPrevPage }}
-            <button type="submit" name="p" value="{{ sub .Page 1 }}">Previous</button>
-            {{ end }}
-            {{ if .HasNextPage }}
-            <button type="submit" name="p" value="{{ add .Page 1 }}">Next</button>
-            {{ end }}
+            <div id="content" class="js-enabled">
+                {{ if .HasPrevPage }}
+                <button type="submit" name="p" value="{{ sub .Page 1 }}">Previous</button>
+                {{ end }}
+                {{ if .HasNextPage }}
+                <button type="submit" name="p" value="{{ add .Page 1 }}">Next</button>
+                {{ end }}
+            </div>
         </form>
     </div>
     <div id="template-data" data-page="{{ .Page }}" data-query="{{ .Query }}" data-type="text"></div>