diff --git a/src/views/admin/settings/activitypub.tpl b/src/views/admin/settings/activitypub.tpl
index 1fbebbf6df..c9de5f37b6 100644
--- a/src/views/admin/settings/activitypub.tpl
+++ b/src/views/admin/settings/activitypub.tpl
@@ -1,158 +1,153 @@
 <div class="acp-page-container">
 	<!-- IMPORT admin/partials/settings/header.tpl -->
 
-	<p class="lead">[[admin/settings/activitypub:intro-lead]]</p>
-	<p>[[admin/settings/activitypub:intro-body]]</p>
-
-	<hr />
-
 	<div class="row settings m-0">
-		<div class="col-sm-2 col-12 settings-header">[[admin/settings/activitypub:general]]</div>
-		<div class="col-sm-10 col-12">
-			<form>
-				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="activitypubEnabled">
-					<label class="form-check-label">[[admin/settings/activitypub:enabled]]</label>
-					<p class="form-text">[[admin/settings/activitypub:enabled-help]]</p>
-				</div>
-				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="activitypubAllowLoopback">
-					<label class="form-check-label">[[admin/settings/activitypub:allowLoopback]]</label>
-					<p class="form-text">[[admin/settings/activitypub:allowLoopback-help]]</p>
-				</div>
-			</form>
-		</div>
-	</div>
+		<div id="spy-container" class="col-12 col-md-8 px-0 mb-4" tabindex="0">
 
-	<div class="row settings m-0">
-		<div class="col-sm-2 col-12 settings-header">[[admin/settings/activitypub:probe]]</div>
-		<div class="col-sm-10 col-12">
-			<form>
-				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="activitypubProbe">
-					<label class="form-check-label">[[admin/settings/activitypub:probe-enabled]]</label>
-					<p class="form-text">[[admin/settings/activitypub:probe-enabled-help]]</p>
-				</div>
-				<div class="mb-3">
-					<label class="form-label" for="activitypubProbeTimeout">[[admin/settings/activitypub:probe-timeout]]</label>
-					<input type="number" id="activitypubProbeTimeout" name="activitypubProbeTimeout" data-field="activitypubProbeTimeout" title="[[admin/settings/activitypub:probe-timeout]]" class="form-control" />
-					<div class="form-text">
-						[[admin/settings/activitypub:probe-timeout-help]]
+			<p class="lead">[[admin/settings/activitypub:intro-lead]]</p>
+			<p>[[admin/settings/activitypub:intro-body]]</p>
+
+			<hr />
+
+			<div id="general" class="mb-4">
+				<h5 class="fw-bold tracking-tight settings-header">[[admin/settings/activitypub:general]]</h5>
+				<form>
+					<div class="form-check form-switch mb-3">
+						<input class="form-check-input" type="checkbox" data-field="activitypubEnabled">
+						<label class="form-check-label">[[admin/settings/activitypub:enabled]]</label>
+						<p class="form-text">[[admin/settings/activitypub:enabled-help]]</p>
 					</div>
-				</div>
-			</form>
-		</div>
-	</div>
+					<div class="form-check form-switch mb-3">
+						<input class="form-check-input" type="checkbox" data-field="activitypubAllowLoopback">
+						<label class="form-check-label">[[admin/settings/activitypub:allowLoopback]]</label>
+						<p class="form-text">[[admin/settings/activitypub:allowLoopback-help]]</p>
+					</div>
+				</form>
+			</div>
 
-	<div class="row settings m-0">
-		<div class="col-sm-2 col-12 settings-header">[[admin/settings/activitypub:rules]]</div>
-		<div class="col-sm-10 col-12">
-			<div class="mb-3">
-				<p>[[admin/settings/activitypub:rules-intro]]</p>
-				<table class="table table-striped" id="rules">
-					<thead>
-						<th></th>
-						<th>[[admin/settings/activitypub:rules.type]]</th>
-						<th>[[admin/settings/activitypub:rules.value]]</th>
-						<th>[[admin/settings/activitypub:rules.cid]]</th>
-						<th></th>
-					</thead>
-					<tbody>
-						{{{ each rules }}}
-						<tr data-rid="{./rid}">
-							<td class="align-items-center" style="cursor: move;">
-								<i class="fa fa-grip-lines text-muted drag-handle"></i>
-							</td>
-							<td>{./type}</td>
-							<td>{./value}</td>
-							<td>{./cid}</td>
-							<td><a href="#" data-action="rules.delete"><i class="fa fa-trash link-danger"></i></a></td>
-						</tr>
-						{{{ end }}}
-					</tbody>
-					<tfoot>
-						<tr>
-							<td colspan="3">
-								<button class="btn btn-sm btn-primary" data-action="rules.add">[[admin/settings/activitypub:rules.add]]</button>
-							</td>
-						</tr>
-					</tfoot>
-				</table>
+			<div id="probe" class="mb-4">
+				<h5 class="fw-bold tracking-tight settings-header">[[admin/settings/activitypub:probe]]</h5>
+				<form>
+					<div class="form-check form-switch mb-3">
+						<input class="form-check-input" type="checkbox" data-field="activitypubProbe">
+						<label class="form-check-label">[[admin/settings/activitypub:probe-enabled]]</label>
+						<p class="form-text">[[admin/settings/activitypub:probe-enabled-help]]</p>
+					</div>
+					<div class="mb-3">
+						<label class="form-label" for="activitypubProbeTimeout">[[admin/settings/activitypub:probe-timeout]]</label>
+						<input type="number" id="activitypubProbeTimeout" name="activitypubProbeTimeout" data-field="activitypubProbeTimeout" title="[[admin/settings/activitypub:probe-timeout]]" class="form-control" />
+						<div class="form-text">
+							[[admin/settings/activitypub:probe-timeout-help]]
+						</div>
+					</div>
+				</form>
+			</div>
+
+			<div id="rules" class="mb-4">
+				<h5 class="fw-bold tracking-tight settings-header">[[admin/settings/activitypub:rules]]</h5>
+				<div class="mb-3">
+					<p>[[admin/settings/activitypub:rules-intro]]</p>
+					<table class="table table-striped" id="rules">
+						<thead>
+							<th></th>
+							<th>[[admin/settings/activitypub:rules.type]]</th>
+							<th>[[admin/settings/activitypub:rules.value]]</th>
+							<th>[[admin/settings/activitypub:rules.cid]]</th>
+							<th></th>
+						</thead>
+						<tbody>
+							{{{ each rules }}}
+							<tr data-rid="{./rid}">
+								<td class="align-items-center" style="cursor: move;">
+									<i class="fa fa-grip-lines text-muted drag-handle"></i>
+								</td>
+								<td>{./type}</td>
+								<td>{./value}</td>
+								<td>{./cid}</td>
+								<td><a href="#" data-action="rules.delete"><i class="fa fa-trash link-danger"></i></a></td>
+							</tr>
+							{{{ end }}}
+						</tbody>
+						<tfoot>
+							<tr>
+								<td colspan="5">
+									<button class="btn btn-sm btn-primary" data-action="rules.add">[[admin/settings/activitypub:rules.add]]</button>
+								</td>
+							</tr>
+						</tfoot>
+					</table>
+				</div>
+			</div>
+
+			<div id="relays" class="mb-4">
+				<h5 class="fw-bold tracking-tight settings-header">[[admin/settings/activitypub:relays]]</h5>
+				<p>[[admin/settings/activitypub:relays.intro]]</p>
+				<p class="text-warning">[[admin/settings/activitypub:relays.warning]]</p>
+				<div class="mb-3">
+					<table class="table table-striped" id="relays">
+						<thead>
+							<th>[[admin/settings/activitypub:relays.relay]]</th>
+							<th>[[admin/settings/activitypub:relays.state]]</th>
+							<th></th>
+						</thead>
+						<tbody>
+							{{{ each relays }}}
+							<tr data-url="{./url}">
+								<td>{./url}</td>
+								<td>{./label}</td>
+								<td><a href="#" data-action="relays.remove"><i class="fa fa-trash link-danger"></i></a></td>
+							</tr>
+							{{{ end }}}
+						</tbody>
+						<tfoot>
+							<tr>
+								<td colspan="3">
+									<button class="btn btn-sm btn-primary" data-action="relays.add">[[admin/settings/activitypub:relays.add]]</button>
+								</td>
+							</tr>
+						</tfoot>
+					</table>
+				</div>
+			</div>
+
+			<div id="pruning" class="mb-4">
+				<h5 class="fw-bold tracking-tight settings-header">[[admin/settings/activitypub:pruning]]</h5>
+				<form>
+					<div class="mb-3">
+						<label class="form-label" for="activitypubContentPruneDays">[[admin/settings/activitypub:content-pruning]]</label>
+						<input type="number" id="activitypubContentPruneDays" name="activitypubContentPruneDays" data-field="activitypubContentPruneDays" title="[[admin/settings/activitypub:content-pruning]]" class="form-control" />
+						<div class="form-text">
+							[[admin/settings/activitypub:content-pruning-help]]
+						</div>
+					</div>
+					<div class="mb-3">
+						<label class="form-label" for="activitypubUserPruneDays">[[admin/settings/activitypub:user-pruning]]</label>
+						<input type="number" id="activitypubUserPruneDays" name="activitypubUserPruneDays" data-field="activitypubUserPruneDays" title="[[admin/settings/activitypub:user-pruning]]" class="form-control" />
+						<div class="form-text">
+							[[admin/settings/activitypub:user-pruning-help]]
+						</div>
+					</div>
+				</form>
+			</div>
+
+			<div id="server-filtering" class="mb-4">
+				<h5 class="fw-bold tracking-tight settings-header">[[admin/settings/activitypub:server-filtering]]</h5>
+				<form>
+					<div class="mb-3">
+						<p>[[admin/settings/activitypub:server.filter-help]]</p>
+						<p>[[admin/settings/activitypub:server.filter-help-hostname]]</p>
+						<p>[[admin/settings/activitypub:count, {instanceCount}]]</p>
+						<label for="activitypubFilterList" class="form-label">Filtering list</label>
+						<textarea class="form-control" id="activitypubFilterList" data-field="activitypubFilterList" rows="10"></textarea>
+					</div>
+					<div class="form-check form-switch mb-3">
+						<input class="form-check-input" type="checkbox" id="activitypubFilter" data-field="activitypubFilter" />
+						<label class="form-check-label" for="activitypubFilter">[[admin/settings/activitypub:server.filter-allow-list]]</label>
+					</div>
+				</form>
 			</div>
 		</div>
-	</div>
 
-	<div class="row settings m-0">
-		<div class="col-sm-2 col-12 settings-header">[[admin/settings/activitypub:relays]]</div>
-		<div class="col-sm-10 col-12">
-			<p>[[admin/settings/activitypub:relays.intro]]</p>
-			<p class="text-warning">[[admin/settings/activitypub:relays.warning]]</p>
-			<div class="mb-3">
-				<table class="table table-striped" id="relays">
-					<thead>
-						<th>[[admin/settings/activitypub:relays.relay]]</th>
-						<th>[[admin/settings/activitypub:relays.state]]</th>
-						<th></th>
-					</thead>
-					<tbody>
-						{{{ each relays }}}
-						<tr data-url="{./url}">
-							<td>{./url}</td>
-							<td>{./label}</td>
-							<td><a href="#" data-action="relays.remove"><i class="fa fa-trash link-danger"></i></a></td>
-						</tr>
-						{{{ end }}}
-					</tbody>
-					<tfoot>
-						<tr>
-							<td colspan="3">
-								<button class="btn btn-sm btn-primary" data-action="relays.add">[[admin/settings/activitypub:relays.add]]</button>
-							</td>
-						</tr>
-					</tfoot>
-				</table>
-			</div>
-		</div>
-	</div>
-
-	<div class="row settings m-0">
-		<div class="col-sm-2 col-12 settings-header">[[admin/settings/activitypub:pruning]]</div>
-		<div class="col-sm-10 col-12">
-			<form>
-				<div class="mb-3">
-					<label class="form-label" for="activitypubContentPruneDays">[[admin/settings/activitypub:content-pruning]]</label>
-					<input type="number" id="activitypubContentPruneDays" name="activitypubContentPruneDays" data-field="activitypubContentPruneDays" title="[[admin/settings/activitypub:content-pruning]]" class="form-control" />
-					<div class="form-text">
-						[[admin/settings/activitypub:content-pruning-help]]
-					</div>
-				</div>
-				<div class="mb-3">
-					<label class="form-label" for="activitypubUserPruneDays">[[admin/settings/activitypub:user-pruning]]</label>
-					<input type="number" id="activitypubUserPruneDays" name="activitypubUserPruneDays" data-field="activitypubUserPruneDays" title="[[admin/settings/activitypub:user-pruning]]" class="form-control" />
-					<div class="form-text">
-						[[admin/settings/activitypub:user-pruning-help]]
-					</div>
-				</div>
-			</form>
-		</div>
-	</div>
-
-	<div class="row settings m-0">
-		<div class="col-sm-2 col-12 settings-header">[[admin/settings/activitypub:server-filtering]]</div>
-		<div class="col-sm-10 col-12">
-			<form>
-				<div class="mb-3">
-					<p>[[admin/settings/activitypub:server.filter-help]]</p>
-					<p>[[admin/settings/activitypub:server.filter-help-hostname]]</p>
-					<p>[[admin/settings/activitypub:count, {instanceCount}]]</p>
-					<label for="activitypubFilterList" class="form-label">Filtering list</label>
-					<textarea class="form-control" id="activitypubFilterList" data-field="activitypubFilterList" rows="10"></textarea>
-				</div>
-				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" id="activitypubFilter" data-field="activitypubFilter" />
-					<label class="form-check-label" for="activitypubFilter">[[admin/settings/activitypub:server.filter-allow-list]]</label>
-				</div>
-			</form>
-		</div>
+		<!-- IMPORT admin/partials/settings/toc.tpl -->
 	</div>
 </div>