diff --git a/web/app/controllers/blogs.php b/web/app/controllers/blogs.php
index dbac060..1e96ffc 100644
--- a/web/app/controllers/blogs.php
+++ b/web/app/controllers/blogs.php
@@ -45,7 +45,7 @@ EOD;
 
 <?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
 <div class="row">
-<div class="col-sm-12 col-md-9">
+<div class="col-lg-9">
 <div class="d-flex flex-wrap justify-content-between">
 <?php endif ?>
 
@@ -88,7 +88,7 @@ EOD;
 <?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
 </div>
 
-<aside class="col mt-3 mt-md-0">
+<aside class="col mt-3 mt-lg-0">
 <?php uojIncludeView('sidebar', array()) ?>
 </aside>
 
diff --git a/web/app/controllers/group.php b/web/app/controllers/group.php
index a5ba7b8..185775d 100644
--- a/web/app/controllers/group.php
+++ b/web/app/controllers/group.php
@@ -25,7 +25,7 @@
 
 <?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
 <div class="row">
-<div class="col-sm-12 col-md-9">
+<div class="col-lg-9">
 <div class="d-flex justify-content-between">
 <?php endif ?>
 
@@ -180,7 +180,7 @@
 <?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
 </div>
 
-<aside class="col mt-3 mt-md-0">
+<aside class="col mt-3 mt-lg-0">
 
 <?php uojIncludeView('sidebar', array()); ?>
 </aside>
diff --git a/web/app/controllers/groups.php b/web/app/controllers/groups.php
index 247e867..8131ce2 100644
--- a/web/app/controllers/groups.php
+++ b/web/app/controllers/groups.php
@@ -59,7 +59,7 @@
 
 <?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
 <div class="row">
-<div class="col-sm-12 col-md-9">
+<div class="col-lg-9">
 <div class="d-flex justify-content-between">
 <?php endif ?>
 <h1 class="h2">
@@ -122,7 +122,7 @@ EOD;
 <?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
 </div>
 
-<aside class="col mt-3 mt-md-0">
+<aside class="col mt-3 mt-lg-0">
 <?php 
 	uojIncludeView('sidebar', array());
 	?>
diff --git a/web/app/controllers/index.php b/web/app/controllers/index.php
index a6f8912..b34b4eb 100644
--- a/web/app/controllers/index.php
+++ b/web/app/controllers/index.php
@@ -9,7 +9,7 @@
 	?>
 <?php echoUOJPageHeader(UOJConfig::$data['profile']['oj-name-short']) ?>
 <div class="row">
-	<div class="col-sm-12 col-md-9">
+	<div class="col-lg-9">
 		<div class="card card-default">
 			<div class="card-body">
 				<?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
diff --git a/web/app/controllers/problem.php b/web/app/controllers/problem.php
index 165ed56..5656b24 100644
--- a/web/app/controllers/problem.php
+++ b/web/app/controllers/problem.php
@@ -234,7 +234,7 @@ EOD
 
 <?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
 <div class="row">
-<div class="col-sm-12 col-md-9">
+<div class="col-lg-9">
 <?php endif ?>
 
 <?php if (!isset($REQUIRE_LIB['bootstrap5'])): ?>
@@ -350,7 +350,7 @@ $('#contest-countdown').countdown(<?= $contest['end_time']->getTimestamp() - UOJ
 <?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
 </div>
 
-<aside class="col">
+<aside class="col mt-3 mt-lg-0">
 <div class="card card-default mb-2">
 	<ul class="nav nav-pills nav-fill flex-column" role="tablist">
 		<li class="nav-item text-start">
diff --git a/web/app/controllers/problem_list.php b/web/app/controllers/problem_list.php
index 3774f35..80820e8 100644
--- a/web/app/controllers/problem_list.php
+++ b/web/app/controllers/problem_list.php
@@ -109,7 +109,7 @@ EOD;
 
 <?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
 <div class="row">
-<div class="col-sm-12 col-md-9">
+<div class="col-lg-9">
 <div class="d-flex justify-content-between">
 <?php endif ?>
 <h1 class="h2">
@@ -259,7 +259,7 @@ $('#input-show_difficulty').click(function() {
 <?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
 </div>
 
-<aside class="col mt-3 mt-md-0">
+<aside class="col mt-3 mt-lg-0">
 
 <?php uojIncludeView('sidebar', array()); ?>
 </aside>
diff --git a/web/app/controllers/problem_lists.php b/web/app/controllers/problem_lists.php
index 4c84182..5f582ce 100644
--- a/web/app/controllers/problem_lists.php
+++ b/web/app/controllers/problem_lists.php
@@ -73,7 +73,7 @@
 
 <?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
 <div class="row">
-<div class="col-sm-12 col-md-9">
+<div class="col-lg-9">
 <div class="d-flex justify-content-between">
 <?php endif ?>
 <h1 class="h2">
@@ -151,7 +151,7 @@ EOD;
 <?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
 </div>
 
-<aside class="col mt-3 mt-md-0">
+<aside class="col mt-3 mt-lg-0">
 <?php 
 	uojIncludeView('sidebar', array());
 	?>
diff --git a/web/app/controllers/problem_set.php b/web/app/controllers/problem_set.php
index e578e3f..1295118 100644
--- a/web/app/controllers/problem_set.php
+++ b/web/app/controllers/problem_set.php
@@ -161,7 +161,7 @@ EOD;
 
 <?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
 <div class="row">
-<div class="col-sm-12 col-md-9">
+<div class="col-lg-9">
 <div class="d-flex justify-content-between">
 <?php endif ?>
 <h1 class="h2">
@@ -187,14 +187,20 @@ EOD;
 <?php endif ?>
 
 <div class="row">
-	<div class="col-sm-4">
+	<div class="
+	<?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
+	col-12 col-sm-6
+	<?php else: ?>
+	col-sm-4
+	<?php endif ?>
+	">
 		<?= HTML::tablist($tabs_info, $cur_tab, 'nav-pills') ?>
 	</div>
-	<div class="col-sm-4 order-sm-5
+	<div class="
 	<?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
-	text-end p-2
+	text-end p-2 col-12 col-sm-6
 	<?php else: ?>
-	text-right checkbox
+	text-right checkbox order-sm-5 col-sm-4
 	<?php endif ?>
 	">
 		<?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
@@ -239,11 +245,19 @@ EOD;
 		</div>
 		<?php endif ?>
 	</div>
+	<?php if (!isset($REQUIRE_LIB['bootstrap5'])): ?>
 	<div class="col-sm-4 order-sm-3">
-	<?php echo $pag->pagination(); ?>
+		<?= $pag->pagination(); ?>
 	</div>
+	<?php endif ?>
 </div>
 
+<?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
+<div class="text-center">
+	<?= $pag->pagination(); ?>
+</div>
+<?php endif ?>
+
 <script type="text/javascript">
 $('#input-show_tags_mode').click(function() {
 	if (this.checked) {
@@ -284,7 +298,7 @@ $('#input-show_submit_mode').click(function() {
 <?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
 </div>
 
-<aside class="col mt-3 mt-md-0">
+<aside class="col mt-3 mt-lg-0">
 
 <form method="get">
 	<div class="input-group mb-3">