diff --git a/scripts/advanced.php b/scripts/advanced.php
index 2c38405..21ddee6 100644
--- a/scripts/advanced.php
+++ b/scripts/advanced.php
@@ -42,20 +42,15 @@ a {
   cursor: pointer;
   text-align: center;
 }
-  @media screen and (max-width: 800px) {
-    .column {
-      float: none;
-      width: 100%;
-    }
-  }
+
 form {
   text-align:left;
   margin-left:20px;
 }
-h1 {
-  text-align:center;
+h2 {
+  margin-bottom:0px;
 }
-h2,h3 {
+h3 {
   margin-left: -10px;
   text-align:left;
 }
@@ -66,19 +61,33 @@ input {
   text-align:center;
   font-size:large;
 }
-    </style>
+@media screen and (max-width: 800px) {
+  h2 {
+    margin-bottom:0px;
+    text-align:center;
+  }  form {
+    text-align:left;
+    margin-left:0px;
+  }    
+  .column {
+    float: none;
+    width: 100%;
+  }
+}
+  </style>
   </head>
+      <h2>Advanced Settings</h2>
   <body style="background-color: rgb(119, 196, 135);">
   <div class="row">
     <div class="column first">
     <form action="write_advanced.php" method="POST">
-      <h3>Advanced Settings</h3>
 <?php 
 if (file_exists('/home/pi/BirdNET-Pi/thisrun.txt')) {
   $config = parse_ini_file('/home/pi/BirdNET-Pi/thisrun.txt');
 } elseif (file_exists('/home/pi/BirdNET-Pi/firstrun.ini')) {
   $config = parse_ini_file('/home/pi/BirdNET-Pi/firstrun.ini');
 } ?>
+      <h3>Defaults</h3>
       <label for="full_disk">Full Disk Behavior: </label>
       <input name="full_disk" type="text" value="<?php print($config['FULL_DISK']);?>" /><br>
       <label for="rec_card">Audio Card: </label>
diff --git a/scripts/config.php b/scripts/config.php
index 4775895..08edfa8 100644
--- a/scripts/config.php
+++ b/scripts/config.php
@@ -41,17 +41,13 @@ a {
 	cursor: pointer;
 	text-align: center;
 }
-@media screen and (max-width: 800px) {
-	.column {
-		float: none;
-		width: 100%;
-	}
-}
+
 form {
   text-align:left;
+  margin-left:20px;
 }
-h1 {
-  text-align:center;
+h2 {
+  margin-bottom:0px;
 }
 h3 {
   margin-left: -10px;
@@ -64,7 +60,21 @@ input {
   text-align:center;
   font-size:large;
 }
-    </style>
+@media screen and (max-width: 800px) {
+  h2 {
+    margin-bottom:0px;
+    text-align:center;
+  }
+  form {
+    text-align:left;
+    margin-left:0px;
+  }	
+  .column {
+		float: none;
+		width: 100%;
+	}
+}
+  </style>
   </head>
       <h2>Basic Settings</h2>
   <body style="background-color: rgb(119, 196, 135);">
@@ -77,11 +87,12 @@ if (file_exists('/home/pi/BirdNET-Pi/thisrun.txt')) {
 } elseif (file_exists('/home/pi/BirdNET-Pi/firstrun.ini')) {
   $config = parse_ini_file('/home/pi/BirdNET-Pi/firstrun.ini');
 } ?>
+      <h3>Required</h3>
       <label for="latitude">Latitude: </label>
       <input name="latitude" type="text" value="<?php print($config['LATITUDE']);?>" /><br>
       <label for="longitude">Longitude: </label>
       <input name="longitude" type="text" value="<?php print($config['LONGITUDE']);?>" />
-      <h4>Optional Services</h4>
+      <h3>Optional</h3>
       <label for="birdweather_id">BirdWeather ID: </label>
       <input name="birdweather_id" type="text" value="<?php print($config['BIRDWEATHER_ID']);?>" /><br>
       <label for="pushed_app_key">Pushed App Key: </label>
diff --git a/scripts/index.html b/scripts/index.html
index 34420fb..5652e8e 100644
--- a/scripts/index.html
+++ b/scripts/index.html
@@ -57,19 +57,19 @@ a {
 		<div class="column first">
 
 			<form action="/scripts/stop_core_services.php" onclick="return confirm('Stop core services?')">
-				<button type="submit" class="block">Stop Core BirdNET-Pi Services</button>
+				<button type="submit" class="block">Stop Core Services</button>
 			</form>
 			<form action="/scripts/restart_services.php" onclick="return confirm('Restart ALL services?')">
-				<button type="submit" class="block">Restart ALL BirdNET-Pi Services</button>
+				<button type="submit" class="block">Restart ALL Services</button>
 			</form>
 			<form action="/scripts/restart_birdnet_analysis.php">
-				<button type="submit" class="block">Restart BirdNET Analysis Service</button>
+				<button type="submit" class="block">Restart BirdNET Analysis</button>
 			</form>
 			<form action="/scripts/restart_birdnet_recording.php">
-				<button type="submit" class="block">Restart Recording Service</button>
+				<button type="submit" class="block">Restart Recording</button>
 			</form>
 			<form action="/scripts/restart_extraction.php">
-				<button type="submit" class="block">Restart Extraction Service</button>
+				<button type="submit" class="block">Restart Extraction</button>
 			</form>
 			<form action="/scripts/restart_caddy.php" onclick="return confirm('Restart Caddy? You will be disconnected for about 20 seconds.')">
 				<button type="submit" class="block">Restart Caddy</button>
@@ -80,17 +80,17 @@ a {
 				<button type="submit" class="block"><a target="_content" href="/scripts/adminer.php">Database Maintenance</a></button>
 			</form>
 			<form action="/scripts/config.php">
-				<button type="submit" class="block">Reconfigure System</button>
+				<button type="submit" class="block">Settings</button>
 			</form>
 			</form>
 			<form action="/scripts/reboot_system.php" onclick="return confirm('Are you sure you want to reboot?')">
-				<button type="submit" class="block">Reboot BirdNET-Pi</button>
+				<button type="submit" class="block">Reboot</button>
 			</form>
 			<form action="/scripts/update_birdnet.php" onclick="return confirm('BE SURE TO STASH ANY LOCAL CHANGES YOU HAVE MADE TO THE SYSTEM BEFORE UPDATING!!!')">
-				<button style="color:blue;" type="submit" class="block">Update BirdNET-Pi</button>
+				<button style="color:blue;" type="submit" class="block">Update</button>
 			</form>
 			<form action="/scripts/shutdown_system.php" onclick="return confirm('Are you sure you want to shutdown?')">
-				<button style="color: red;" type="submit" class="block">Shutdown BirdNET-Pi</button>
+				<button style="color: red;" type="submit" class="block">Shutdown</button>
 			</form>
 			<form action="/scripts/clear_all_data.php" onclick="return confirm('Clear ALL Data? This cannot be undone.')">
 				<button style="color: red;" type="submit" class="block">Clear ALL data</button>
