diff --git a/resources/ManageApprovers.css b/resources/ManageApprovers.css
index 1729236..9a3b3e3 100644
--- a/resources/ManageApprovers.css
+++ b/resources/ManageApprovers.css
@@ -1,89 +1,91 @@
-.form-container {
-	text-align: left;
-	max-width: 650px;
-	background-color: #f2f2f2;
-}
+.manage-approvers {
+	.form-container {
+		text-align: left;
+		max-width: 650px;
+		background-color: #f2f2f2;
+	}
 
-input[ type='text' ] {
-	padding: 6px;
-	margin-right: 10px;
-	width: 150px;
-	height: 20px;
-	border: 0;
-	border-radius: 5px;
-}
+	input[ type='text' ] {
+		padding: 6px;
+		margin-right: 10px;
+		width: 150px;
+		height: 20px;
+		border: 0;
+		border-radius: 5px;
+	}
 
-button {
-	padding: 6px 10px;
-	cursor: pointer;
-	background-color: #4caf50;
-	color: #fff;
-	border: 0;
-	border-radius: 5px;
-}
+	button {
+		padding: 6px 10px;
+		cursor: pointer;
+		background-color: #4caf50;
+		color: #fff;
+		border: 0;
+		border-radius: 5px;
+	}
 
-button:hover {
-	background-color: #45a049;
-}
+	button:hover {
+		background-color: #45a049;
+	}
 
-table {
-	width: 100%;
-	border-collapse: collapse;
-	margin-top: 20px;
-}
+	table {
+		width: 100%;
+		border-collapse: collapse;
+		margin-top: 20px;
+	}
 
-th,
-td {
-	padding: 10px;
-	border: 1px solid #ddd;
-}
+	th,
+	td {
+		padding: 10px;
+		border: 1px solid #ddd;
+	}
 
-th {
-	background-color: #f2f2f2;
-}
+	th {
+		background-color: #f2f2f2;
+	}
 
-.approval-delete-btn {
-	margin-left: 10px;
-	background-color: transparent;
-	color: #f00;
-}
+	.approval-delete-btn {
+		margin-left: 10px;
+		background-color: transparent;
+		color: #f00;
+	}
 
-.approval-delete-btn:hover {
-	background-color: rgba( 255, 0, 0, 0.78 );
-	color: #fff;
-}
+	.approval-delete-btn:hover {
+		background-color: rgba( 255, 0, 0, 0.78 );
+		color: #fff;
+	}
 
-.category-row {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	margin-top: 3px;
-}
+	.category-row {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin-top: 3px;
+	}
 
-.category-entry {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	background-color: #f9f9f9;
-	padding: 5px;
-	border-radius: 5px;
-	margin-bottom: 5px;
-}
+	.category-entry {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		background-color: #f9f9f9;
+		padding: 5px;
+		border-radius: 5px;
+		margin-bottom: 5px;
+	}
 
-.category-name {
-	font-weight: bold;
-	padding-left: 15px;
-}
+	.category-name {
+		font-weight: bold;
+		padding-left: 15px;
+	}
 
-.add-button,
-.add-approver-button {
-	margin-top: 10px;
-}
+	.add-button,
+	.add-approver-button {
+		margin-top: 10px;
+	}
 
-.add-approver-form {
-	padding: 15px;
-	background-color: #f8f8f8;
-	border: 1px solid #e7e7e7;
-	border-radius: 8px;
-	box-shadow: 0 2px 5px rgba( 0, 0, 0, 0.15 );
+	.add-approver-form {
+		padding: 15px;
+		background-color: #f8f8f8;
+		border: 1px solid #e7e7e7;
+		border-radius: 8px;
+		box-shadow: 0 2px 5px rgba( 0, 0, 0, 0.15 );
+	}
 }
diff --git a/resources/PageApprovals.css b/resources/PageApprovals.css
index 1e0f22f..59b966c 100755
--- a/resources/PageApprovals.css
+++ b/resources/PageApprovals.css
@@ -92,7 +92,7 @@
 	display: none !important;
 }
 
-.tooltip {
+.approval-status-tooltip {
 	visibility: hidden;
 	position: absolute;
 	top: 50%;
@@ -113,7 +113,7 @@
 	margin-right: 10px;
 }
 
-.tooltip::after {
+.approval-status-tooltip::after {
 	content: '';
 	position: absolute;
 	top: 50%;
@@ -124,7 +124,7 @@
 	border-color: transparent transparent transparent rgba( 0, 0, 0, 0.9 );
 }
 
-.page-approval-container:hover .tooltip {
+.page-approval-container:hover .approval-status-tooltip {
 	visibility: visible;
 	opacity: 1;
 }
@@ -137,28 +137,29 @@
 	box-shadow: 0 2px 5px rgba( 0, 0, 0, 0.2 );
 	border-radius: 4px;
 	overflow: hidden;
-}
 
-.dropdown-item {
-	display: flex;
-	align-items: center;
-	padding: 10px 15px;
-	width: 100%;
-	border: 0;
-	background: none;
-	cursor: pointer;
-	text-align: left;
-	white-space: nowrap;
-}
+	.dropdown-item {
+		display: flex;
+		align-items: center;
+		padding: 10px 15px;
+		width: 100%;
+		border: 0;
+		background: none;
+		cursor: pointer;
+		text-align: left;
+		white-space: nowrap;
+	}
 
-.dropdown-item:hover {
-	background-color: rgba( 211, 211, 211, 0.23 );
-}
+	.dropdown-item:hover {
+		background-color: rgba( 211, 211, 211, 0.23 );
+	}
 
-.dropdown-item span {
-	margin-right: 10px;
+	.dropdown-item span {
+		margin-right: 10px;
+	}
 }
 
+
 #approveButton {
 	color: #158f68;
 }
diff --git a/templates/ManageApprovers.mustache b/templates/ManageApprovers.mustache
index 1542a6d..9e660dd 100644
--- a/templates/ManageApprovers.mustache
+++ b/templates/ManageApprovers.mustache
@@ -1,40 +1,42 @@
-<div class="form-container">
-	<form method="POST" action="" class="add-approver-form">
-		<input type="text" name="username" placeholder="Username" required>
-		<button class="add-approver-button" type="submit" name="action" value="add-approver">Add Approver</button>
-	</form>
-</div>
+<div class="manage-approvers">
+	<div class="form-container">
+		<form method="POST" action="" class="add-approver-form">
+			<input type="text" name="username" placeholder="Username" required>
+			<button class="add-approver-button" type="submit" name="action" value="add-approver">Add Approver</button>
+		</form>
+	</div>
 
-<table class="form-container">
-	<thead>
-	<tr>
-		<th>Username</th>
-		<th>Categories</th>
-	</tr>
-	</thead>
-	<tbody>
-	{{#approvers}}
+	<table class="form-container">
+		<thead>
 		<tr>
-			<td>{{username}}</td>
-			<td>
-				{{#categories}}
-					<div class="category-entry">
-						<span class="category-name">{{.}}</span>
-						<form method="POST" action="" class="category-row">
-							<input type="hidden" name="username" value="{{username}}">
-							<input type="hidden" name="category" value="{{.}}">
-							<button class="approval-delete-btn" type="submit" name="action" value="delete">Delete
-							</button>
-						</form>
-					</div>
-				{{/categories}}
-				<form method="POST" action="" class="add-category-form">
-					<input type="text" name="category" placeholder="New Category" required>
-					<input type="hidden" name="username" value="{{username}}">
-					<button class="add-button" type="submit" name="action" value="add">Add</button>
-				</form>
-			</td>
+			<th>Username</th>
+			<th>Categories</th>
 		</tr>
-	{{/approvers}}
-	</tbody>
-</table>
+		</thead>
+		<tbody>
+		{{#approvers}}
+			<tr>
+				<td>{{username}}</td>
+				<td>
+					{{#categories}}
+						<div class="category-entry">
+							<span class="category-name">{{.}}</span>
+							<form method="POST" action="" class="category-row">
+								<input type="hidden" name="username" value="{{username}}">
+								<input type="hidden" name="category" value="{{.}}">
+								<button class="approval-delete-btn" type="submit" name="action" value="delete">Delete
+								</button>
+							</form>
+						</div>
+					{{/categories}}
+					<form method="POST" action="" class="add-category-form">
+						<input type="text" name="category" placeholder="New Category" required>
+						<input type="hidden" name="username" value="{{username}}">
+						<button class="add-button" type="submit" name="action" value="add">Add</button>
+					</form>
+				</td>
+			</tr>
+		{{/approvers}}
+		</tbody>
+	</table>
+</div>
diff --git a/templates/PageApprovalStatus.mustache b/templates/PageApprovalStatus.mustache
index a698700..7cf4ff8 100644
--- a/templates/PageApprovalStatus.mustache
+++ b/templates/PageApprovalStatus.mustache
@@ -15,7 +15,7 @@
 				</button>
 			</div>
 		{{/canApprove}}
-		<div class="tooltip {{^isPageApproved}}display-none{{/isPageApproved}}">
+		<div class="approval-status-tooltip {{^isPageApproved}}display-none{{/isPageApproved}}">
 			<small class="approver-details {{^isPageApproved}}display-none{{/isPageApproved}}">
 				<span class="approver-name">
 					{{approverUserName}}