diff --git a/public/scss/admin/admin.scss b/public/scss/admin/admin.scss
index 16283eea99..c8e8fccba8 100644
--- a/public/scss/admin/admin.scss
+++ b/public/scss/admin/admin.scss
@@ -12,7 +12,6 @@
 @import "./manage/tags";
 @import "./manage/groups";
 // @import "./manage/registration";
-// @import "./manage/admins-mods";
 // @import "./appearance/customise";
 // @import "./appearance/themes";
 // @import "./extend/plugins";
@@ -41,20 +40,19 @@ body {
 	background: #fff;
 	font-size: 14px;
 
-h1 {
-	font-size: 35px;
-	margin-bottom: 50px;
-}
+	h1 {
+		font-size: 35px;
+		margin-bottom: 50px;
+	}
 
-label {
-	font-weight: 700;
-	height: auto;
-}
+	label {
+		font-weight: 700;
+		height: auto;
+	}
 
-
-.btn {
-	border-radius: 0;
-}
+	.btn {
+		border-radius: 0;
+	}
 
 	// .floating-button can either be a container or the button itself
 	.floating-button {
@@ -109,7 +107,7 @@ label {
 		@include box-header-font;
 	}
 
-	.card:not([data-container-html]) {
+	.dashboard .card:not([data-container-html]) {
 		background-color: #FFF;
 		box-sizing: border-box;
 		border-radius: 3px;
diff --git a/public/scss/admin/vars.scss b/public/scss/admin/vars.scss
index 854e786084..6b7a5a4c3a 100644
--- a/public/scss/admin/vars.scss
+++ b/public/scss/admin/vars.scss
@@ -18,3 +18,6 @@
 //   "Noto Color Emoji"                  : Emoji on Android
 $font-family-system: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
 $font-family-sans-serif: font-family-system;
+
+
+$light: #e9ecef;
\ No newline at end of file
diff --git a/src/views/admin/manage/admins-mods.tpl b/src/views/admin/manage/admins-mods.tpl
index cec7b0d22d..500846da56 100644
--- a/src/views/admin/manage/admins-mods.tpl
+++ b/src/views/admin/manage/admins-mods.tpl
@@ -1,77 +1,79 @@
 <div class="admins-mods">
-	<h4><!-- IF admins.icon --><i class="fa {admins.icon}"></i> <!-- ENDIF admins.icon -->[[admin/manage/admins-mods:administrators]]</h4>
-	<div class="administrator-area">
-	<!-- BEGIN admins.members -->
-		<div class="user-card pull-left" data-uid="{admins.members.uid}">
-			<!-- IF admins.members.picture -->
-			<img class="avatar avatar-sm" src="{admins.members.picture}" alt="" />
-			<!-- ELSE -->
-			<div class="avatar avatar-sm" style="background-color: {admins.members.icon:bgColor};">{admins.members.icon:text}</div>
-			<!-- ENDIF admins.members.picture -->
-			<a href="{config.relative_path}/user/{admins.members.userslug}">{admins.members.username}</a>
-			<i class="remove-user-icon fa fa-times" role="button"></i>
-		</div>
-	<!-- END admins.members -->
-	</div>
-	<input id="admin-search" class="form-control" placeholder="[[admin/manage/admins-mods:add-administrator]]" />
-
-	<br/>
-
-	<h4><!-- IF globalMods.icon --><i class="fa {globalMods.icon}"></i> <!-- ENDIF globalMods.icon -->[[admin/manage/admins-mods:global-moderators]]</h4>
-	<div class="global-moderator-area">
-	<!-- BEGIN globalMods.members -->
-		<div class="user-card pull-left" data-uid="{globalMods.members.uid}">
-			<!-- IF globalMods.members.picture -->
-			<img class="avatar avatar-sm" src="{globalMods.members.picture}" alt="" />
-			<!-- ELSE -->
-			<div class="avatar avatar-sm" style="background-color: {globalMods.members.icon:bgColor};">{globalMods.members.icon:text}</div>
-			<!-- ENDIF globalMods.members.picture -->
-			<a href="{config.relative_path}/user/{globalMods.members.userslug}">{globalMods.members.username}</a>
-			<i class="remove-user-icon fa fa-times" role="button"></i>
-		</div>
-	<!-- END globalMods.members -->
-	</div>
-
-	<div id="no-global-mods-warning" class="<!-- IF globalMods.members.length -->hidden<!-- ENDIF globalMods.members.length -->">[[admin/manage/admins-mods:no-global-moderators]]</div>
-
-	<input id="global-mod-search" class="form-control" placeholder="[[admin/manage/admins-mods:add-global-moderator]]" />
-
-	<br/>
-
-	<h4 id="moderators-title">[[admin/manage/admins-mods:moderators]]</h4>
-
-	<!-- IMPORT partials/breadcrumbs.tpl -->
-
-	<!-- IMPORT partials/category-selector.tpl -->
-
-	{{{ if !categoryMods.length }}}
-	<div><p class="well">[[admin/manage/admins-mods:no-sub-categories]]</p></div>
-	{{{ end }}}
-
-	{{{ each categoryMods }}}
-	<div class="categories category-wrapper category-depth-{categoryMods.depth}">
-	<h4>{{{ if categoryMods.icon }}}<i class="fa {categoryMods.icon}"></i> {{{ end }}}{categoryMods.name} {{{ if categoryMods.subCategoryCount }}}<small><a href="{config.relative_path}/admin/manage/admins-mods?cid={categoryMods.cid}#moderators-title">[[admin/manage/admins-mods:subcategories, {categoryMods.subCategoryCount}]]</a></small>{{{ else }}}{{{ end }}}{{{if categoryMods.disabled}}}<span class="badge badge-primary">[[admin/manage/admins-mods:disabled]]</span>{{{end}}}</h4>
-	<div class="moderator-area" data-cid="{categoryMods.cid}">
-		{{{ each categoryMods.moderators }}}
-			<div class="user-card pull-left" data-uid="{categoryMods.moderators.uid}">
-				{{{ if  categoryMods.moderators.picture }}}
-				<img class="avatar avatar-sm" src="{categoryMods.moderators.picture}" alt="" />
-				{{{ else }}}
-				<div class="avatar avatar-sm" style="background-color: {categoryMods.moderators.icon:bgColor};">{categoryMods.moderators.icon:text}</div>
-				{{{ end }}}
-				<a href="{config.relative_path}/user/{categoryMods.moderators.userslug}">{categoryMods.moderators.username}</a>
-				<i class="remove-user-icon fa fa-times" role="button"></i>
+	<div class="mb-3">
+		<h4><!-- IF admins.icon --><i class="fa {admins.icon}"></i> <!-- ENDIF admins.icon -->[[admin/manage/admins-mods:administrators]]</h4>
+		<div class="administrator-area">
+		<!-- BEGIN admins.members -->
+			<div class="badge text-bg-light m-1 p-1 pull-left" data-uid="{admins.members.uid}">
+				<!-- IF admins.members.picture -->
+				<img class="avatar avatar-sm" src="{admins.members.picture}" alt="" />
+				<!-- ELSE -->
+				<div class="avatar avatar-sm" style="background-color: {admins.members.icon:bgColor};">{admins.members.icon:text}</div>
+				<!-- ENDIF admins.members.picture -->
+				<a href="{config.relative_path}/user/{admins.members.userslug}">{admins.members.username}</a>
+				<i class="mx-1 remove-user-icon fa fa-times" role="button"></i>
 			</div>
-		{{{ end }}}
+		<!-- END admins.members -->
+		</div>
+		<input id="admin-search" class="form-control" placeholder="[[admin/manage/admins-mods:add-administrator]]" />
 	</div>
 
-	<div data-cid="{categoryMods.cid}" class="no-moderator-warning {{{ if categoryMods.moderators.length }}}hidden{{{ end }}}">[[admin/manage/admins-mods:no-moderators]]</div>
+	<div class="mb-3">
+		<h4><!-- IF globalMods.icon --><i class="fa {globalMods.icon}"></i> <!-- ENDIF globalMods.icon -->[[admin/manage/admins-mods:global-moderators]]</h4>
+		<div class="global-moderator-area">
+		<!-- BEGIN globalMods.members -->
+			<div class="badge text-bg-light  m-1 p-1 pull-left" data-uid="{globalMods.members.uid}">
+				<!-- IF globalMods.members.picture -->
+				<img class="avatar avatar-sm" src="{globalMods.members.picture}" alt="" />
+				<!-- ELSE -->
+				<div class="avatar avatar-sm" style="background-color: {globalMods.members.icon:bgColor};">{globalMods.members.icon:text}</div>
+				<!-- ENDIF globalMods.members.picture -->
+				<a href="{config.relative_path}/user/{globalMods.members.userslug}">{globalMods.members.username}</a>
+				<i class="mx-1 remove-user-icon fa fa-times" role="button"></i>
+			</div>
+		<!-- END globalMods.members -->
+		</div>
 
-	<input data-cid="{categoryMods.cid}" class="form-control moderator-search" placeholder="[[admin/manage/admins-mods:add-moderator]]" />
+		<div id="no-global-mods-warning" class="alert alert-info {{{ if globalMods.members.length }}}hidden{{{ end }}}">[[admin/manage/admins-mods:no-global-moderators]]</div>
+
+		<input id="global-mod-search" class="form-control" placeholder="[[admin/manage/admins-mods:add-global-moderator]]" />
 	</div>
-	<br/>
-	{{{ end }}}
+
 	<div>
-		<!-- IMPORT partials/paginator.tpl -->
+		<h4 id="moderators-title">[[admin/manage/admins-mods:moderators]]</h4>
+
+		<!-- IMPORT partials/breadcrumbs.tpl -->
+		<div class="mb-3">
+		<!-- IMPORT partials/category-selector.tpl -->
+		</div>
+		{{{ if !categoryMods.length }}}
+		<div><p class="alert alert-info">[[admin/manage/admins-mods:no-sub-categories]]</p></div>
+		{{{ end }}}
+
+		{{{ each categoryMods }}}
+		<div class="categories category-wrapper mb-2">
+			<h4>{{{ if categoryMods.icon }}}<i class="fa {categoryMods.icon}"></i> {{{ end }}}{categoryMods.name} {{{ if categoryMods.subCategoryCount }}}<small><a href="{config.relative_path}/admin/manage/admins-mods?cid={categoryMods.cid}#moderators-title">[[admin/manage/admins-mods:subcategories, {categoryMods.subCategoryCount}]]</a></small>{{{ else }}}{{{ end }}}{{{if categoryMods.disabled}}}<span class="badge badge-primary">[[admin/manage/admins-mods:disabled]]</span>{{{end}}}</h4>
+			<div class="moderator-area" data-cid="{categoryMods.cid}">
+				{{{ each categoryMods.moderators }}}
+					<div class="badge text-bg-light m-1 p-1 pull-left" data-uid="{categoryMods.moderators.uid}">
+						{{{ if  categoryMods.moderators.picture }}}
+						<img class="avatar avatar-sm" src="{categoryMods.moderators.picture}" alt="" />
+						{{{ else }}}
+						<div class="avatar avatar-sm" style="background-color: {categoryMods.moderators.icon:bgColor};">{categoryMods.moderators.icon:text}</div>
+						{{{ end }}}
+						<a href="{config.relative_path}/user/{categoryMods.moderators.userslug}">{categoryMods.moderators.username}</a>
+						<i class="mx-1 remove-user-icon fa fa-times" role="button"></i>
+					</div>
+				{{{ end }}}
+			</div>
+
+			<div data-cid="{categoryMods.cid}" class="no-moderator-warning {{{ if categoryMods.moderators.length }}}hidden{{{ end }}}">[[admin/manage/admins-mods:no-moderators]]</div>
+
+			<input data-cid="{categoryMods.cid}" class="form-control moderator-search" placeholder="[[admin/manage/admins-mods:add-moderator]]" />
+		</div>
+
+		{{{ end }}}
+		<div>
+			<!-- IMPORT partials/paginator.tpl -->
+		</div>
 	</div>
 </div>
diff --git a/src/views/admin/manage/digest.tpl b/src/views/admin/manage/digest.tpl
index 96fc869331..e35926acb3 100644
--- a/src/views/admin/manage/digest.tpl
+++ b/src/views/admin/manage/digest.tpl
@@ -4,49 +4,51 @@
 
 <hr />
 
-<table class="table table-striped">
-	<thead>
-		<th>[[admin/manage/digest:user]]</th>
-		<th>[[admin/manage/digest:subscription]]</th>
-		<th>[[admin/manage/digest:last-delivery]]</th>
-		<th></th>
-	</thead>
-	<tbody>
-		<!-- BEGIN delivery -->
-		<tr>
-			<td><a href="{config.relative_path}/uid/{../uid}">{buildAvatar(delivery, "sm", true)} {../username}</a></td>
-			<td>{{{if ../setting}}}{../setting}{{{else}}}<em>[[admin/manage/digest:default]]</em>{{{end}}}</td>
-			<td>{../lastDelivery}</td>
-			<td><button class="btn btn-xs btn-default" data-action="resend" data-uid="{../uid}">[[admin/manage/digest:resend]]</button></td>
-		</tr>
-		<!-- END delivery -->
-		<!-- IF !delivery.length -->
-		<tr>
-			<td colspan="4">
-				<div class="alert alert-success">
-					[[admin/manage/digest:no-delivery-data]]
-				</div>
-			</td>
-		</tr>
-		<!-- ENDIF !delivery.length -->
-	</tbody>
-	<tfoot>
-		<tr>
-			<td colspan="4"><!-- IMPORT partials/paginator.tpl --></td>
-		</tr>
-		<tr>
-			<td colspan="4">
-				<em>[[admin/manage/digest:default-help, {default}]]</em>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="4">
-				[[admin/manage/digest:manual-run]]
-				<button class="btn btn-xs btn-default" data-action="resend-day">[[admin/settings/user:digest-freq.daily]]</button>
-				<button class="btn btn-xs btn-default" data-action="resend-week">[[admin/settings/user:digest-freq.weekly]]</button>
-				<button class="btn btn-xs btn-default" data-action="resend-biweek">[[admin/settings/user:digest-freq.biweekly]]</button>
-				<button class="btn btn-xs btn-default" data-action="resend-month">[[admin/settings/user:digest-freq.monthly]]</button>
-			</td>
-		</tr>
-	</tfoot>
-</table>
+<div class="table-responsive">
+	<table class="table table-striped">
+		<thead>
+			<th>[[admin/manage/digest:user]]</th>
+			<th>[[admin/manage/digest:subscription]]</th>
+			<th>[[admin/manage/digest:last-delivery]]</th>
+			<th></th>
+		</thead>
+		<tbody>
+			<!-- BEGIN delivery -->
+			<tr>
+				<td><a href="{config.relative_path}/uid/{../uid}">{buildAvatar(delivery, "sm", true)} {../username}</a></td>
+				<td>{{{if ../setting}}}{../setting}{{{else}}}<em>[[admin/manage/digest:default]]</em>{{{end}}}</td>
+				<td>{../lastDelivery}</td>
+				<td><button class="btn btn-sm btn-outline-secondary" data-action="resend" data-uid="{../uid}">[[admin/manage/digest:resend]]</button></td>
+			</tr>
+			<!-- END delivery -->
+			<!-- IF !delivery.length -->
+			<tr>
+				<td colspan="4">
+					<div class="alert alert-success">
+						[[admin/manage/digest:no-delivery-data]]
+					</div>
+				</td>
+			</tr>
+			<!-- ENDIF !delivery.length -->
+		</tbody>
+		<tfoot>
+			<tr>
+				<td colspan="4"><!-- IMPORT partials/paginator.tpl --></td>
+			</tr>
+			<tr>
+				<td colspan="4">
+					<em>[[admin/manage/digest:default-help, {default}]]</em>
+				</td>
+			</tr>
+			<tr>
+				<td colspan="4">
+					[[admin/manage/digest:manual-run]]
+					<button class="btn btn-sm btn-outline-secondary" data-action="resend-day">[[admin/settings/user:digest-freq.daily]]</button>
+					<button class="btn btn-sm btn-outline-secondary" data-action="resend-week">[[admin/settings/user:digest-freq.weekly]]</button>
+					<button class="btn btn-sm btn-outline-secondary" data-action="resend-biweek">[[admin/settings/user:digest-freq.biweekly]]</button>
+					<button class="btn btn-sm btn-outline-secondary" data-action="resend-month">[[admin/settings/user:digest-freq.monthly]]</button>
+				</td>
+			</tr>
+		</tfoot>
+	</table>
+</div>
diff --git a/src/views/admin/manage/registration.tpl b/src/views/admin/manage/registration.tpl
index e12f08d370..b4bb8e34b0 100644
--- a/src/views/admin/manage/registration.tpl
+++ b/src/views/admin/manage/registration.tpl
@@ -1,11 +1,11 @@
 <div class="row">
-	<div class="col-xs-12">
-		<div class="registration panel panel-primary">
-			<div class="panel-heading">
+	<div class="col-12">
+		<div class="registration card mb-3">
+			<div class="card-header text-bg-primary">
 				[[admin/manage/registration:queue]]
 			</div>
 			<!-- IF !users.length -->
-			<p class="panel-body">
+			<p class="card-body">
 				[[admin/manage/registration:description, {config.relative_path}/admin/settings/user#user-registration]]
 			</p>
 			<!-- ENDIF !users.length -->
@@ -75,10 +75,10 @@
 
 							<td>
 								<div class="btn-group pull-right">
-									<button class="btn btn-success btn-xs" data-action="accept"><i class="fa fa-check"></i></button>
-									<button class="btn btn-danger btn-xs" data-action="delete"><i class="fa fa-times"></i></button>
+									<button class="btn btn-success btn-sm" data-action="accept"><i class="fa fa-check"></i></button>
+									<button class="btn btn-danger btn-sm" data-action="delete"><i class="fa fa-times"></i></button>
 									{{{ each users.customActions }}}
-									<button id="{users.customActions.id}" title="{users.customActions.title}" class="btn btn-xs {users.customActions.class}">
+									<button id="{users.customActions.id}" title="{users.customActions.title}" class="btn btn-sm {users.customActions.class}">
 										<i class="fa {users.customActions.icon}"></i>
 									</button>
 									{{{ end }}}
@@ -93,11 +93,11 @@
 			<!-- IMPORT partials/paginator.tpl -->
 		</div>
 
-		<div class="invitations panel panel-success">
-			<div class="panel-heading">
+		<div class="invitations card">
+			<div class="card-header text-bg-success">
 				[[admin/manage/registration:invitations]]
 			</div>
-			<p class="panel-body">
+			<p class="card-body">
 				[[admin/manage/registration:invitations.description]]
 			</p>
 			<div class="table-responsive">
@@ -118,7 +118,7 @@
 							<td>{invites.invitations.email}</td>
 							<td>{invites.invitations.username}
 								<div class="btn-group pull-right">
-									<button class="btn btn-danger btn-xs" data-action="delete"><i class="fa fa-times"></i></button>
+									<button class="btn btn-danger btn-sm" data-action="delete"><i class="fa fa-times"></i></button>
 								</div>
 							</td>
 						</tr>
diff --git a/src/views/admin/manage/uploads.tpl b/src/views/admin/manage/uploads.tpl
index e478d2b023..63ce59965f 100644
--- a/src/views/admin/manage/uploads.tpl
+++ b/src/views/admin/manage/uploads.tpl
@@ -2,10 +2,10 @@
 <div class="clearfix">
 	<div class="pull-right">
 		<div class="btn-group">
-			<button id="new-folder" class="btn-primary"><i class="fa fa-folder"></i> [[admin/manage/uploads:new-folder]]</button>
+			<button id="new-folder" class="btn btn-primary"><i class="fa fa-folder"></i> [[admin/manage/uploads:new-folder]]</button>
 		</div>
 		<div class="btn-group">
-			<button id="upload" class="btn-success"><i class="fa fa-upload"></i> [[global:upload]]</button>
+			<button id="upload" class="btn btn-success"><i class="fa fa-upload"></i> [[global:upload]]</button>
 		</div>
 	</div>
 </div>