diff --git a/bl-themes/alternative/css/style.css b/bl-themes/alternative/css/style.css
index 76af0921..6b103626 100755
--- a/bl-themes/alternative/css/style.css
+++ b/bl-themes/alternative/css/style.css
@@ -113,4 +113,4 @@ section.home-page:nth-child(even) { /* Alternate the background color */
 	height:100%;
 	width:100%;
 	position:absolute;
-}
\ No newline at end of file
+}
diff --git a/bl-themes/alternative/php/home.php b/bl-themes/alternative/php/home.php
index 4d48b50e..ddbec402 100644
--- a/bl-themes/alternative/php/home.php
+++ b/bl-themes/alternative/php/home.php
@@ -45,28 +45,26 @@
 
 <!-- Pagination -->
 <?php if (Paginator::amountOfPages()>1): ?>
-<div class="paginator">
-	<nav aria-label="Page navigation">
-		<ul class="pagination justify-content-center">
+<nav class="paginator" aria-label="Page navigation">
+	<ul class="pagination flex-wrap justify-content-center">
 
-			<!-- Previuos button -->
-			<li class="page-item <?php if (Paginator::showNext()); echo 'disabled' ?>">
-				<a class="page-link" href="<?php echo Paginator::prevPageUrl(); ?>" tabindex="-1">Previous</a>
-			</li>
+		<!-- Previous button -->
+		<li class="page-item <?php if (!Paginator::showPrev()) echo 'disabled' ?>">
+			<a class="page-link" href="<?php echo Paginator::prevPageUrl() ?>" tabindex="-1">Previous</a>
+		</li>
 
-			<!-- List of pages -->
-			<?php for ($i = 1; $i <= Paginator::amountOfPages(); $i++): ?>
-			<li class="page-item <?php if ($i==Paginator::currentPage()); echo 'active' ?>">
-				<a class="page-link" href="<?php echo Paginator::numberUrl($i); ?>"><?php echo $i ?></a>
-			</li>
-			<?php endfor ?>
+		<!-- List of pages -->
+		<?php for ($i = 1; $i <= Paginator::amountOfPages(); $i++): ?>
+		<li class="page-item <?php if ($i==Paginator::currentPage()) echo 'active' ?>">
+			<a class="page-link" href="<?php echo Paginator::numberUrl($i) ?>"><?php echo $i ?></a>
+		</li>
+		<?php endfor ?>
 
-			<!-- Next button -->
-			<li class="page-item <?php if (Paginator::showPrev()); echo 'disabled' ?>">
-				<a class="page-link" href="<?php echo Paginator::nextPageUrl(); ?>">Next</a>
-			</li>
+		<!-- Next button -->
+		<li class="page-item <?php if (!Paginator::showNext()) echo 'disabled' ?>">
+			<a class="page-link" href="<?php echo Paginator::nextPageUrl() ?>">Next</a>
+		</li>
 
-		</ul>
-	</nav>
-</div>
+	</ul>
+</nav>
 <?php endif ?>
diff --git a/bl-themes/blogx/php/home.php b/bl-themes/blogx/php/home.php
index c7162d26..7f6334a0 100644
--- a/bl-themes/blogx/php/home.php
+++ b/bl-themes/blogx/php/home.php
@@ -35,10 +35,10 @@
 <!-- Pagination -->
 <?php if (Paginator::amountOfPages()>1): ?>
 <nav class="my-4" aria-label="Page navigation">
-	<ul class="pagination">
+	<ul class="pagination flex-wrap">
 
-		<!-- Previuos button -->
-		<li class="page-item <?php if (Paginator::showNext()) echo 'disabled' ?>">
+		<!-- Previous button -->
+		<li class="page-item <?php if (!Paginator::showPrev()) echo 'disabled' ?>">
 			<a class="page-link" href="<?php echo Paginator::prevPageUrl() ?>" tabindex="-1">Previous</a>
 		</li>
 
@@ -50,10 +50,10 @@
 		<?php endfor ?>
 
 		<!-- Next button -->
-		<li class="page-item <?php if (Paginator::showPrev()) echo 'disabled' ?>">
+		<li class="page-item <?php if (!Paginator::showNext()) echo 'disabled' ?>">
 			<a class="page-link" href="<?php echo Paginator::nextPageUrl() ?>">Next</a>
 		</li>
 
 	</ul>
 </nav>
-<?php endif ?>
\ No newline at end of file
+<?php endif ?>