diff --git a/CTFd/themes/admin/templates/pages.html b/CTFd/themes/admin/templates/pages.html
index 87a0e7cc..ec45540f 100644
--- a/CTFd/themes/admin/templates/pages.html
+++ b/CTFd/themes/admin/templates/pages.html
@@ -33,11 +33,11 @@
 			<table id="pages" class="table table-striped border">
 				<thead>
 				<tr>
-					<td class="d-block border-right border-bottom text-center" data-checkbox>
-						<div class="form-check">
+					<th class="border-right" data-checkbox>
+						<div class="form-check text-center">
 							<input type="checkbox" class="form-check-input" id="scoreboard-bulk-select" data-checkbox-all>&nbsp;
 						</div>
-					</td>
+					</th>
 					<th class="sort-col text-center"><b>Title</b></th>
 					<th class="sort-col text-center"><b>Route</b></th>
 					<th class="sort-col text-center"><b>Authentication</b></th>
@@ -49,8 +49,8 @@
 				<tbody>
 				{% for page in pages %}
 					<tr data-href="{{ url_for('admin.pages_detail', page_id=page.id) }}">
-						<td class="d-block border-right text-center" data-checkbox>
-							<div class="form-check">
+						<td class="border-right" data-checkbox>
+							<div class="form-check text-center">
 								<input type="checkbox" class="form-check-input" value="{{ page.id }}" data-account-id="{{ page.id }}">&nbsp;
 							</div>
 						</td>
diff --git a/CTFd/themes/admin/templates/scoreboard.html b/CTFd/themes/admin/templates/scoreboard.html
index bea64d2e..f5e25d7f 100644
--- a/CTFd/themes/admin/templates/scoreboard.html
+++ b/CTFd/themes/admin/templates/scoreboard.html
@@ -23,11 +23,11 @@
 			<table id="scoreboard" class="table table-striped border">
 				<thead>
 					<tr>
-						<td class="d-block border-right border-bottom text-center" data-checkbox>
-							<div class="form-check">
+						<th class="border-right" data-checkbox>
+							<div class="form-check text-center">
 								<input type="checkbox" class="form-check-input" id="scoreboard-bulk-select" data-checkbox-all>&nbsp;
 							</div>
-						</td>
+						</th>
 						<th class="sort-col text-center"><b>Place</b></th>
 						<th class="sort-col"><b>Team</b></th>
 						<th class="sort-col"><b>Score</b></th>
@@ -37,7 +37,7 @@
 				<tbody>
 				{% for standing in standings %}
 					<tr data-href="{{ generate_account_url(standing.account_id, admin=True) }}">
-						<td class="d-block border-right text-center" data-checkbox>
+						<td class="border-right text-center" data-checkbox>
 							<div class="form-check">
 								<input type="checkbox" class="form-check-input" value="{{ standing.account_id }}" data-account-id="{{ standing.account_id }}">&nbsp;
 							</div>
diff --git a/CTFd/themes/admin/templates/submissions.html b/CTFd/themes/admin/templates/submissions.html
index d92fd4c8..12272c93 100644
--- a/CTFd/themes/admin/templates/submissions.html
+++ b/CTFd/themes/admin/templates/submissions.html
@@ -28,11 +28,11 @@
 			<table id="teamsboard" class="table table-striped border">
 				<thead>
 					<tr>
-						<td class="d-block border-right border-bottom" data-checkbox>
+						<th class="border-right" data-checkbox>
 							<div class="form-check text-center">
 								<input type="checkbox" class="form-check-input" data-checkbox-all>&nbsp;
 							</div>
-						</td>
+						</th>
 						<th class="text-center sort-col"><b>ID</b></th>
 						<th class="sort-col"><b>Team</b></th>
 						<th class="sort-col"><b>Challenge</b></th>
@@ -44,7 +44,7 @@
 				<tbody>
 					{% for sub in submissions %}
 					<tr>
-						<td class="d-block border-right" data-checkbox>
+						<td class="border-right" data-checkbox>
 							<div class="form-check text-center">
 								<input type="checkbox" class="form-check-input" value="{{ sub.id }}" data-submission-id="{{ sub.id }}">&nbsp;
 							</div>
diff --git a/CTFd/themes/admin/templates/teams/teams.html b/CTFd/themes/admin/templates/teams/teams.html
index 37a8116f..8c835a04 100644
--- a/CTFd/themes/admin/templates/teams/teams.html
+++ b/CTFd/themes/admin/templates/teams/teams.html
@@ -72,11 +72,11 @@
 			<table id="teamsboard" class="table table-striped border">
 				<thead>
 					<tr>
-						<td class="d-block border-right border-bottom text-center" data-checkbox>
-							<div class="form-check">
+						<th class="border-right" data-checkbox>
+							<div class="form-check text-center">
 								<input type="checkbox" class="form-check-input" data-checkbox-all>&nbsp;
 							</div>
-						</td>
+						</th>
 						<th class="sort-col text-center"><b>ID</b></th>
 						<th class="sort-col text-left"><b>Team</b></th>
 						<th class="sort-col text-center"><b>Website</b></th>
@@ -88,7 +88,7 @@
 				<tbody>
 					{% for team in teams %}
 					<tr name="{{ team.id }}" data-href="{{ url_for('admin.teams_detail', team_id=team.id) }}">
-						<td class="d-block border-right" data-checkbox>
+						<td class="border-right" data-checkbox>
 							<div class="form-check text-center">
 								<input type="checkbox" class="form-check-input" value="{{ team.id }}" data-submission-id="{{ team.id }}">&nbsp;
 							</div>
diff --git a/CTFd/themes/admin/templates/users/users.html b/CTFd/themes/admin/templates/users/users.html
index c28322ca..d2af1869 100644
--- a/CTFd/themes/admin/templates/users/users.html
+++ b/CTFd/themes/admin/templates/users/users.html
@@ -71,11 +71,11 @@
 			<table id="teamsboard" class="table table-striped border">
 				<thead>
 					<tr>
-						<td class="d-block border-right border-bottom text-center" data-checkbox>
-							<div class="form-check">
+						<th class="border-right" data-checkbox>
+							<div class="form-check text-center">
 								<input type="checkbox" class="form-check-input" data-checkbox-all>&nbsp;
 							</div>
-						</td>
+						</th>
 						<th class="sort-col text-center"><b>ID</b></td>
 						<th class="sort-col text-center"><b>User</b></th>
 						<th class="d-md-table-cell d-lg-table-cell sort-col text-center"><b>Email</b></th>
@@ -90,8 +90,8 @@
 				<tbody>
 					{% for user in users %}
 					<tr name="{{ user.id }}" data-href="{{ url_for('admin.users_detail', user_id=user.id) }}">
-						<td class="d-block border-right text-center" data-checkbox>
-							<div class="form-check">
+						<td class="border-right" data-checkbox>
+							<div class="form-check text-center">
 								<input type="checkbox" class="form-check-input" value="{{ user.id }}" data-account-id="{{ user.id }}">&nbsp;
 							</div>
 						</td>