Index: HTML/EN/html/settings.js
===================================================================
--- HTML/EN/html/settings.js	(revision 12255)
+++ HTML/EN/html/settings.js	(working copy)
@@ -33,16 +33,20 @@
 		case "HOME":
 			url = "[% webroot %]home.html?"
 		break
-		case "BASIC_PLAYER_SETTINGS":
-			url = "[% webroot %]setup.html?page=BASIC_PLAYER_SETTINGS&playerid=[% playerid | uri %]"
-		break
-		case "BASIC_SERVER_SETTINGS":
-			url = "[% webroot %]setup.html?page=BASIC_SERVER_SETTINGS&"
-		break
 	}
 
 	if (option) {
-		window.location = url + 'player=[% playerURI %][% IF playerid %]&playerid=[% playerid | uri %][% END %]';
+		//window.location = url + 'player=[% playerURI %][% IF playerid %]&playerid=[% playerid | uri %][% END %]';
+		new Ajax.Updater( { success: 'settingsRegion' }, url, {
+			method: 'post',
+			postBody: 'ajaxUpdate=1&player=[% playerURI %][% IF playerid %]&playerid=[% playerid | uri %][% END %]',
+			evalScripts: true,
+			asynchronous: true,
+			onFailure: function(t) {
+				alert('Error -- ' + t.responseText);
+			}
+		} );
+		document.forms.settingsForm.action = url;
 	}
 }
 
Index: HTML/EN/settings/footer.html
===================================================================
--- HTML/EN/settings/footer.html	(revision 12255)
+++ HTML/EN/settings/footer.html	(working copy)
@@ -19,7 +19,7 @@
 [% END %]
 
 </div>
-
+[% IF NOT ajaxUpdate %]
 <div id="prefsSubmit">
 [% IF prefs || NOT playerid %]
 	[% IF NOT nosubmit %]<input name="saveSettings" id="saveSettings" type="submit" class="stdclick" value="[% "SAVE_SETTINGS" | string %]">[% END %]
@@ -31,3 +31,6 @@
 <!-- End settingsfooter.html -->
 [% PROCESS pagefooter.html %]
 
+[% ELSE %]
+</form>
+[% END %]
\ No newline at end of file
Index: HTML/EN/settings/header.html
===================================================================
--- HTML/EN/settings/header.html	(revision 12255)
+++ HTML/EN/settings/header.html	(working copy)
@@ -1,18 +1,7 @@
+[% IF NOT ajaxUpdate %]
 <!-- Begin settingsheader.html -->
 [% FILTER null %]
 
-	[% pwd_list = BLOCK %]
-
-		[% IF playerid %]
-			<a href="[% webroot %]settings/player/basic.html[% IF playerid %]?playerid=[% playerid | uri %][% END %]">[% "PLAYER_SETTINGS" | string %] [% IF playername %][% "FOR" | string %] [% playername %][% END %]</a>
-		[% ELSE %]
-			<a href="[% webroot %]settings/server/basic.html">[% "SERVER_SETTINGS" | string %]</a>
-		[% END %]
-
-		 / <a href="[% webroot %][% path %][% IF playerid %]?playerid=[% playerid | uri %][% ELSIF player %]?player=[% playerURI %][% END %]">[% page | string %]</a>
-
-	[% END %]
-
 	[% pageHeaderInfo = BLOCK %]
 		[%- PROCESS setting_chooser.html setting_chooser_noHome = 1 %]
 	[% END %]
@@ -26,7 +15,8 @@
 
 [% END %]
 
-[% pagetitle = page | string; pageicon = 'settings'; noSpacer = 1; PROCESS pageheader.html %] 
+[% IF playerid; pagetitle='PLAYER_SETTINGS' | string; ELSE; pagetitle = 'SERVER_SETTINGS' | string; END %]
+[% pageicon = 'settings'; noSpacer = 1; PROCESS pageheader.html %]
 
 <div class="statusarea">
 	[% IF warning %]
@@ -37,6 +27,7 @@
 <form name="settingsForm" id="settingsForm" method="post" action="[% webroot %][% path %][% IF playerid %]?playerid=[% playerid | uri %][% END %]">
 
 <div id="settingsRegion">
+[% END %]
 	<input type=hidden value="[% page %]" name="page">
 	[% IF playerid %]<input type=hidden value="[% playerid %]" name="playerid">[% END %]
 	[% IF player %]<input type=hidden value="[% player %]" name="player">[% END %]