diff --git a/partials/base.php b/partials/base.php
index 5e5fa93..5ebf492 100644
--- a/partials/base.php
+++ b/partials/base.php
@@ -22,7 +22,7 @@ require_once('libs/twtxt.php');
 require_once('libs/hash.php');
 require_once('libs/Parsedown.php');
 
-const TWTS_PER_PAGE = 50;
+const TWTS_PER_PAGE = 10;
 
 // TODO: Move twts per page to config.ini
 // Add a fallback if the number is invalid (it should be between 1 and 999)
@@ -156,6 +156,7 @@ if (!empty($_GET['hash'])) {
 	$twts = array_reverse($twts, true);
 }
 
+// Pagnation
 $page = 1;
 if (!empty($_GET['page'])) {
 	$page = intval($_GET['page']);
diff --git a/partials/timeline.php b/partials/timeline.php
index 1cf72af..0c966da 100644
--- a/partials/timeline.php
+++ b/partials/timeline.php
@@ -49,6 +49,56 @@
 	</article>
 
 <?php }
+
+// Pagnation
+/*
+
+TODO: Merge with code in base.php / make new pagnation.php 
+TODO: Make pagnation work with profile views
+
+*/
+
+$page_url = $_SERVER['REQUEST_URI'];
+//echo $page_url."<hr>";
+
+if (!empty($_GET['page'])) {
+
+	if (preg_match('/\?page=/', $page_url)) {
+		//echo "cotains ?page= so reuse that<hr>";
+		$page_url = preg_replace('/\?page=\d*/', "", $page_url) . '?page=';
+	}
+
+	if (preg_match('/&page=/', $page_url)) {
+		echo "cotains &page= so reuse that<hr>";
+		$page_url = preg_replace('/&page=\d*/', "", $page_url) . '&page=';
+	}
+
+} else {
+
+	if (!preg_match('/(\?|&)/', $page_url)) {
+		//echo "No param, so use ?page<hr>";
+		$page_url = $page_url . '?page=';
+	}
+	
+	if (!preg_match('/(\?|&)page/', $page_url)) {
+		//echo "other param than _page, so use &page<hr>";
+		$page_url = $page_url . '&page=';
+	}	
+}
+
+?>
+
+<center><p>
+	<?php if ($page > 1) { ?>
+		<a href="<?= $page_url . $page-1 ?>">Prev</a>
+	<?php } else { ?>
+		<span style="color: var(--disabled);">Prev</span>
+	<?php } ?>
+	<strong>&nbsp;<?= $page ?>&nbsp;</strong>
+	<a href="<?= $page_url . $page+1 ?>">Next</a>
+</p></center>
+
+<?php
 require_once 'libs/session.php';
 
 if (!hasValidSession()) {