diff --git a/public/styles/Apps/StatsViewer.css b/public/styles/Apps/StatsViewer.css
index 02a364e..8bdf452 100644
--- a/public/styles/Apps/StatsViewer.css
+++ b/public/styles/Apps/StatsViewer.css
@@ -1,5 +1,4 @@
 .stat-tracker.StatsViewer {
-
 	.window-content {
 		gap: 1rem;
 	}
@@ -8,11 +7,17 @@
 		display: flex;
 		flex-direction: row;
 		gap: 1rem;
+
+		> div {
+			width: 100%;
+		}
 	}
+
 	[data-application-part="dataFilters"] {
 		display: grid;
 		grid-template-columns: repeat(2, minmax(0, 1fr));
 		gap: 1rem;
+		align-items: end;
 	}
 
 	[data-application-part="graph"] {
@@ -20,4 +25,10 @@
 		justify-items: center;
 		position: relative;
 	}
+
+	.control-group {
+		display: flex;
+		flex-direction: column;
+		gap: 2px;
+	}
 }
diff --git a/public/templates/Apps/StatsViewer/dataFilters.hbs b/public/templates/Apps/StatsViewer/dataFilters.hbs
index 40aeac6..bbcc52f 100644
--- a/public/templates/Apps/StatsViewer/dataFilters.hbs
+++ b/public/templates/Apps/StatsViewer/dataFilters.hbs
@@ -1,12 +1,19 @@
 <div>
-	<div>
-		Extra Controls
+	<div class="control-group">
+		<label for="{{meta.idp}}-private-data">
+			Private Data Visibility
+		</label>
+		<select
+			id="{{meta.idp}}-private-data"
+			data-bind="_privacySetting"
+		>
+			{{ st-options privacySetting privacyOptions }}
+		</select>
 	</div>
-	{{!-- This currently doesn't support any placeholders :( --}}
-	<multi-select
+	<stats-tracker-multi-select
 		data-bind="_selectedUsers"
+		placeholder="STAT_TRACKER.common.Users"
 	>
-		<option value="">Add a User</option>
 		{{ st-options selectedUsers users }}
-	</multi-select>
+	</stats-tracker-multi-select>
 </div>
diff --git a/public/templates/Apps/StatsViewer/dataOverview.hbs b/public/templates/Apps/StatsViewer/dataOverview.hbs
deleted file mode 100644
index ff2555b..0000000
--- a/public/templates/Apps/StatsViewer/dataOverview.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-<div>
-	Table Overview
-</div>
diff --git a/public/templates/Apps/StatsViewer/tableSelect.hbs b/public/templates/Apps/StatsViewer/tableSelect.hbs
index 4f9501a..5cb8192 100644
--- a/public/templates/Apps/StatsViewer/tableSelect.hbs
+++ b/public/templates/Apps/StatsViewer/tableSelect.hbs
@@ -1,14 +1,26 @@
 <div>
-	<select
-		data-bind="_selectedTable"
-	>
-		{{ st-options table tables }}
-	</select>
-	{{#if subtables}}
+	<div class="control-group">
+		<label for="{{meta.idp}}-selected-table">
+			{{ localize "STAT_TRACKER.common.Table" }}
+		</label>
 		<select
-			data-bind="_selectedSubtable"
+			id="{{meta.idp}}-selected-table"
+			data-bind="_selectedTable"
 		>
-			{{ st-options subtable subtables }}
+			{{ st-options table tables }}
 		</select>
+	</div>
+	{{#if subtables}}
+		<div class="control-group">
+			<label for="{{meta.idp}}-selected-subtable">
+				{{ localize "STAT_TRACKER.common.Subtable" }}
+			</label>
+			<select
+				id="{{meta.idp}}-selected-subtable"
+				data-bind="_selectedSubtable"
+			>
+				{{ st-options subtable subtables }}
+			</select>
+		</div>
 	{{/if}}
 </div>