diff --git a/web/app/controllers/problem_set.php b/web/app/controllers/problem_set.php
index de7705f..bb871d0 100644
--- a/web/app/controllers/problem_set.php
+++ b/web/app/controllers/problem_set.php
@@ -154,7 +154,7 @@ EOD;
 		? array('card', 'mb-3')
 		: array('table-responsive');
 	$table_classes = isset($REQUIRE_LIB['bootstrap5'])
-		? array('table', 'uoj-problem-list-table', 'mb-0')
+		? array('table', 'uoj-table', 'mb-0')
 		: array('table', 'table-bordered', 'table-hover', 'table-striped');
 	?>
 <?php echoUOJPageHeader(UOJLocale::get('problems')) ?>
diff --git a/web/app/controllers/ranklist.php b/web/app/controllers/ranklist.php
index 0d464ac..61b6892 100644
--- a/web/app/controllers/ranklist.php
+++ b/web/app/controllers/ranklist.php
@@ -13,7 +13,15 @@
 	} else {
 		become404Page();
 	}
+	
+	if (!isset($_COOKIE['bootstrap4'])) {
+		$REQUIRE_LIB['bootstrap5'] = '';
+
+		$config['div_classes'] = array('card', 'mb-3');
+		$config['table_classes'] = array('table', 'uoj-table', 'mb-0', 'text-center');
+	}
 	?>
 <?php echoUOJPageHeader($title) ?>
+<h1 class="h2"><?= $title ?></h1>
 <?php echoRanklist($config) ?>
 <?php echoUOJPageFooter() ?>
diff --git a/web/app/controllers/submissions_list.php b/web/app/controllers/submissions_list.php
index ddc4acc..6a7f30c 100644
--- a/web/app/controllers/submissions_list.php
+++ b/web/app/controllers/submissions_list.php
@@ -115,7 +115,7 @@ d-inline-block
 			'table_config' => (isset($REQUIRE_LIB['bootstrap5']) 
 				? array(
 					'div_classes' => array('card', 'mb-3'),
-					'table_classes' => array('table', 'mb-0', 'uoj-submissions-table', 'text-center')
+					'table_classes' => array('table', 'mb-0', 'uoj-table', 'text-center')
 				)
 				: array()
 			),
diff --git a/web/css/uoj-bs5.css b/web/css/uoj-bs5.css
index b1bcd05..1d9bcc0 100644
--- a/web/css/uoj-bs5.css
+++ b/web/css/uoj-bs5.css
@@ -43,8 +43,7 @@ label {
 	float: right;
 }
 
-.uoj-problem-list-table > tbody > tr:last-child,
-.uoj-submissions-table > tbody > tr:last-child {
+.uoj-table > tbody > tr:last-child {
 	border-bottom-color: transparent;
 }