diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
index e60668740..c05a5f2bb 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
@@ -152,14 +152,18 @@
             <LimiterInfo VisibleName="Limiter Info" url="/diag_limiter_info.php"/>
             <pfInfo url="/diag_pf_info.php" VisibleName="pfInfo"/>
             <pfTop url="/diag_system_pftop.php" VisibleName="pfTop"/>
-            <Tables url="/diag_tables.php">
-                <TablesDetails url="/diag_tables.php*"/>
-            </Tables>
+            <pfTables url="/diag_tables.php">
+                <Details url="/diag_tables.php*"/>
+            </pfTables>
             <Sockets url="/diag_sockets.php">
                 <SocketsDetails url="/diag_sockets.php?*"/>
             </Sockets>
-            <StatesSummary VisibleName="States Summary" url="/diag_states_summary.php"/>
             <StatesDump VisibleName="States Dump" url="/diag_dump_states.php"/>
+            <StatesReset VisibleName="States Reset" url="/diag_resetstate.php"/>
+            <StatesSummary VisibleName="States Summary" url="/diag_states_summary.php"/>
+            <StatesTrackSource VisibleName="Source Tracking" url="/diag_dump_states_sources.php">
+                <Filter url="/diag_dump_states_sources.php*"/>
+            </StatesTrackSource>
         </Diagnostics>
     </Firewall>
     <Services order="4" cssClass="glyphicon glyphicon-cog">
diff --git a/src/www/diag_dump_states.php b/src/www/diag_dump_states.php
index 1922d0ce8..aa9f1f6c4 100644
--- a/src/www/diag_dump_states.php
+++ b/src/www/diag_dump_states.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
 	Copyright (C) 2014 Deciso B.V.
 	Copyright (C) 2005-2009 Scott Ullrich
@@ -109,19 +110,8 @@ include("head.inc");
 <section class="page-content-main">
 	<div class="container-fluid">
 		<div class="row">
-
 		      <section class="col-xs-12">
-
-					<?php
-							$tab_array = array();
-							$tab_array[0] = array(gettext("States"), true, "diag_dump_states.php");
-							$tab_array[1] = array(gettext("Reset states"), false, "diag_resetstate.php");
-							display_top_tabs($tab_array);
-					?>
-
-
-						<div class="tab-content content-box col-xs-12">
-
+					<div class="tab-content content-box col-xs-12">
 						<form action="<?=$_SERVER['SCRIPT_NAME'];?>" method="post" name="iform">
 							                <?php
 												$current_statecount=`pfctl -si | grep "current entries" | awk '{ print $3 }'`;
diff --git a/src/www/diag_dump_states_sources.php b/src/www/diag_dump_states_sources.php
index bff8ec54e..6da5bba49 100644
--- a/src/www/diag_dump_states_sources.php
+++ b/src/www/diag_dump_states_sources.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
 	Copyright (C) 2014 Deciso B.V.
 	Copyright (C) 2005-2009 Scott Ullrich
@@ -92,17 +93,6 @@ include("head.inc");
 </script>
 
 <table class="table table-striped" width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td>
-		<?php
-			$tab_array = array();
-			$tab_array[] = array(gettext("States"), false, "diag_dump_states.php");
-			$tab_array[] = array(gettext("Source Tracking"), true, "diag_dump_states_sources.php");
-			$tab_array[] = array(gettext("Reset States"), false, "diag_resetstate.php");
-			display_top_tabs($tab_array);
-		?>
-		</td>
-	</tr>
 	<tr>
 		<td>
 			<div id="mainarea">
diff --git a/src/www/diag_resetstate.php b/src/www/diag_resetstate.php
index 388f7db1e..b7a68a2a6 100644
--- a/src/www/diag_resetstate.php
+++ b/src/www/diag_resetstate.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
 	Copyright (C) 2014 Deciso B.V.
 	Copyright (C) 2004-2009 Scott Ullrich
@@ -52,7 +53,7 @@ if ($_POST) {
 	}
 }
 
-$pgtitle = array(gettext("Diagnostics"), gettext("Reset state"));
+$pgtitle = array(gettext('Diagnostics'), gettext('State Reset'));
 include("head.inc");
 
 ?>
@@ -64,31 +65,13 @@ include("head.inc");
 <section class="page-content-main">
 	<div class="container-fluid">
 		<div class="row">
-
 			 <section class="col-xs-12">
-
-				<?php
-						$tab_array = array();
-						$tab_array[0] = array(gettext("States"), false, "diag_dump_states.php");
-						$tab_array[1] = array(gettext("Reset states"), true, "diag_resetstate.php");
-						display_top_tabs($tab_array);
-				?>
-
-
 				<div class="tab-content content-box col-xs-12">
-
 				<div class="container-fluid tab-content">
-
 					<div class="tab-pane active" id="system">
-
-
 								<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
 								<?php if (isset($savemsg)) print_info_box($savemsg); ?>
-
-
 								<form action="<?=$_SERVER['REQUEST_URI'];?>" method="post">
-
-
 			                      <input name="statetable" type="checkbox" id="statetable" value="yes" checked="checked" />
 			                      <strong><?= gettext("Firewall state table"); ?></strong><br />
 			                      <span class="vexpl"><br />
@@ -119,10 +102,7 @@ include("head.inc");
 									</p>
 									<?php endif; ?>
 						            <input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Reset"); ?>" />
-
-
 								</form>
-
 						</div>
 					</div>
 				</div>
diff --git a/src/www/diag_tables.php b/src/www/diag_tables.php
index 9b2eef5ea..3820d9fcb 100644
--- a/src/www/diag_tables.php
+++ b/src/www/diag_tables.php
@@ -73,7 +73,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     }
 }
 
-$pgtitle = array(gettext("Diagnostics"), gettext("Tables"));
+$pgtitle = array(gettext("Diagnostics"), gettext("pfTables"));
 $shortcut_section = "aliases";
 // fetch list of tables and content of selected table
 $tables = json_decode(configd_run("filter list tables json"));