diff --git a/modules/config_games/config_servers.php b/modules/config_games/config_servers.php
index 5e09b632..811fe5a4 100644
--- a/modules/config_games/config_servers.php
+++ b/modules/config_games/config_servers.php
@@ -58,10 +58,13 @@ function config_games_print_editor_css()
 .xml-node__attributes .attr-row{display:flex;gap:8px;align-items:center;margin-bottom:6px}
 .xml-node__attributes .attr-row input[type="text"]{flex:1}
 .xml-children{margin-top:10px;border-left:2px solid #2a2a2a;padding-left:12px}
-.xml-actions{text-align:right;margin-top:16px}
+.xml-actions{display:flex;justify-content:flex-end;margin-top:16px;padding:8px 18px 0}
 .xml-node__actions{display:flex;gap:8px;align-items:center}
 .xml-node__apply{background:#1c6dd0;border:1px solid #114b99;color:#fff;padding:6px 12px;border-radius:4px;cursor:pointer}
 .xml-node__apply:hover{background:#1f7aec}
+.xml-global-save{background:#1c6dd0;border:1px solid #114b99;color:#fff;padding:10px 28px;border-radius:4px;font-weight:600;text-transform:uppercase;letter-spacing:0.03em;cursor:pointer;transition:background 0.2s ease,transform 0.2s ease;box-shadow:0 2px 6px rgba(0,0,0,0.35)}
+.xml-global-save:hover{background:#1f7aec;transform:translateY(-1px)}
+.xml-global-save--top{float:right;margin:0 18px 12px 0}
 .xml-hint{font-size:0.85rem;color:#999;margin-top:4px}
 </style>
 CSS;
@@ -397,10 +400,10 @@ function exec_ogp_module() {
 				} else {
 					echo "<form action='?m=config_games&amp;home_cfg_id=".$home_cfg_id."' method='post'>";
 					echo "<input type='hidden' name='home_cfg_id' value='".(int)$home_cfg_id."'>";
-					echo "<button type='submit' name='save_xml' value='1' style='float:right;margin-bottom:10px;'>".get_lang('save')."</button>";
+					echo "<button type='submit' name='save_xml' value='1' class='xml-global-save xml-global-save--top'>".get_lang('save')."</button>";
 					echo "<div style='clear:both'></div>";
 					echo config_games_render_editor($xml);
-					echo "<div class='xml-actions'><button type='submit' name='save_xml' value='1'>".get_lang('save')."</button></div>";
+					echo "<div class='xml-actions'><button type='submit' name='save_xml' value='1' class='xml-global-save'>".get_lang('save')."</button></div>";
 					echo "</form>";
 					echo "<p class='note'>Use the action dropdown to remove entire sections. Attribute values left blank will be removed. Script sections such as post_install are fully editable.</p>";
 				}
diff --git a/modules/config_games/xml_config_creator.php b/modules/config_games/xml_config_creator.php
index a5dc8763..eaae2cc0 100644
--- a/modules/config_games/xml_config_creator.php
+++ b/modules/config_games/xml_config_creator.php
@@ -22,147 +22,143 @@
  *
  */
 
-function exec_ogp_module() {
-	?>
-	<h2>XML Config Creator</h2>
-	 <table BORDER=1>
-	 <tr>
-	 <td>
-	  Query protocol
-	 </td> 
-	 <form action="" method="POST">
-	 <td>
-	   <select name="protocol" onchange="this.form.submit()">
-		<option value="">None</option>
-		<option value="lgsl" <?php if(isset($_POST['protocol']) && $_POST['protocol'] == "lgsl") echo 'selected="selected"';?>>LGSL</option>
-		<option value="gameq" <?php if(isset($_POST['protocol']) && $_POST['protocol'] == "gameq") echo 'selected="selected"';?>>GameQ</option>
-	   </select>
-	 </td>
-	 </form>
-	</tr>
-	<form action='home.php?m=config_games&p=cli-params&type=cleared' method='POST' name='xml_creator'>
-	<?php
-	if(isset($_POST['protocol']))
-	{
-	echo "
-	<tr>
-	 <td>
-	  <input type='hidden' name='protocol' value='".$_POST['protocol']."'/>
-	";	
-	 if($_POST['protocol'] == "lgsl")
-	 {
-	   echo "LGSL Query Name</td><td><select name='query_name'>";
-	   require('protocol/lgsl/lgsl_protocol.php');
-	   $lgsl_type_list = lgsl_type_list(); 
-	   asort($lgsl_type_list);
-	   foreach ($lgsl_type_list as $type => $description)
-	   {
-		 echo "<option value='$type'>$description</option>";
-	   }
-	 }
-	 elseif($_POST['protocol'] == "gameq")
-	 {
-	  require_once 'protocol/GameQ/Autoloader.php';
+function exec_ogp_module()
+{
+	$selectedProtocol = isset($_POST['protocol']) ? $_POST['protocol'] : '';
+	$queryChoices = array();
+	$queryLabel = '';
 
-	  // Define the protocols path
-	  $protocols_path = "protocol/GameQ/Protocols/";
-
-	  // Grab the dir with all the classes available
-	  $dir = dir($protocols_path);
-
-	  $protocols = array();
-
-	  // Now lets loop the directories
-	  while (false !== ($entry = $dir->read()))
-	  {
-		if(!is_file($protocols_path.$entry))
-		{
-			continue;
+	if ($selectedProtocol === 'lgsl') {
+		require_once 'protocol/lgsl/lgsl_protocol.php';
+		$lgsl_type_list = lgsl_type_list();
+		asort($lgsl_type_list);
+		foreach ($lgsl_type_list as $type => $description) {
+			$queryChoices[$type] = $description;
 		}
-
-		// Figure out the class name
-		$class_name = 'GameQ\Protocols\\' . ucfirst(pathinfo($entry, PATHINFO_FILENAME));
-
-		// Lets get some info on the class
-		$reflection = new ReflectionClass($class_name);
-
-		// Check to make sure we can actually load the class
-		if(!$reflection->IsInstantiable())
-		{
-			continue;
+		$queryLabel = 'LGSL Query Name';
+	} elseif ($selectedProtocol === 'gameq') {
+		require_once 'protocol/GameQ/Autoloader.php';
+		$protocols_path = "protocol/GameQ/Protocols/";
+		$dir = dir($protocols_path);
+		$protocols = array();
+		while (false !== ($entry = $dir->read())) {
+			if (!is_file($protocols_path . $entry)) {
+				continue;
+			}
+			$class_name = 'GameQ\Protocols\\' . ucfirst(pathinfo($entry, PATHINFO_FILENAME));
+			$reflection = new ReflectionClass($class_name);
+			if (!$reflection->IsInstantiable()) {
+				continue;
+			}
+			$class = new $class_name;
+			$protocols[$class->name()] = array(
+				'name' => $class->nameLong(),
+			);
+			unset($class);
 		}
-
-		// Load up the class so we can get info
-		$class = new $class_name;
-
-		// Add it to the list
-		$protocols[$class->name()] = array(
-			'name' => $class->nameLong(),
-		);
-
-		// Unset the class
-		unset($class);
-	  }
-
-	  // Close the directory
-	  unset($dir);
-
-	  ksort($protocols);
-	  
-	  echo "GameQ Query Name</td><td><select name='query_name'>";
-	  
-	  foreach ($protocols AS $gameq => $info)
-	  {
-		echo "<option value='".$gameq."'>".htmlentities($info['name'])."</option>";
-	  }
-	 }
-	 echo "
-	  </select>
-	 </td>
-	</tr>";
+		unset($dir);
+		ksort($protocols);
+		foreach ($protocols as $gameq => $info) {
+			$queryChoices[$gameq] = $info['name'];
+		}
+		$queryLabel = 'GameQ Query Name';
 	}
-	else
-	?>
-	<tr>
-	 <td>
-	  OS:
-	 </td>
-	 <td>
-	  <select name="os">
-	   <option value="linux">Linux</option>
-	   <option value="win">Windows</option>
-	  </select>
-	 </td>
-	</tr>
-	<tr>
-	 <td>
-	  Architecture
-	 </td>
-	 <td>
-	  <select name="arch">
-	   <option value="32">32bit</option>
-	   <option value="64">64bit</option>
-	  </select>
-	 </td>
-	</tr>
-	<tr>
-	 <td>
-	  Installer
-	 </td>
-	 <td>
-	  <select name="installer">
-	   <option value="">None</option>
-	   <option value="steam">HLDSUpdateTool</option>
-	  </select>
-	 </td>
-	</tr>
-	<tr>
-	 <td>
-	 <input name="main" type="submit"/>
-	 </form>
-	 </td>
-	</tr>
-	</table>
-<?php
-}
 
+	$safeProtocol = htmlspecialchars($selectedProtocol, ENT_QUOTES, 'UTF-8');
+	echo <<<CSS
+<style>
+.xml-creator-wrapper{max-width:1100px;margin:0 auto;padding:20px;color:#eee;font-family:'Segoe UI',Tahoma,Arial,sans-serif}
+.xml-creator-title{margin-bottom:4px;font-size:1.8rem;font-weight:600}
+.xml-creator-lead{color:#bbb;margin-bottom:20px;max-width:900px}
+.xml-creator-card{background:#111;border:1px solid #222;border-radius:10px;padding:18px;margin-bottom:18px;box-shadow:0 8px 18px rgba(0,0,0,0.25)}
+.xml-creator-card label{display:block;font-size:0.9rem;color:#aaa;margin-bottom:6px;text-transform:uppercase;letter-spacing:0.08em}
+.xml-creator-card select,.xml-creator-card button,.xml-creator-card input[type="text"],.xml-creator-card input[type="number"]{width:100%;padding:10px 12px;border:1px solid #2f2f2f;border-radius:6px;background:#0c0c0c;color:#fff;font-size:1rem}
+.xml-creator-hint{font-size:0.85rem;color:#888;margin-top:6px}
+.xml-creator-grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(240px,1fr));gap:18px}
+.xml-creator-actions{display:flex;justify-content:flex-end;margin-top:12px}
+.xml-creator-note{font-size:0.9rem;color:#bbb;margin:12px 0 24px}
+.xml-creator-protocol-form{margin-bottom:26px}
+.xml-global-save{background:#1c6dd0;border:1px solid #114b99;color:#fff;padding:10px 28px;border-radius:4px;font-weight:600;text-transform:uppercase;letter-spacing:0.03em;cursor:pointer;transition:background 0.2s ease,transform 0.2s ease;box-shadow:0 2px 6px rgba(0,0,0,0.35)}
+.xml-global-save:hover{background:#1f7aec;transform:translateY(-1px)}
+</style>
+CSS;
+
+	echo "<div class='xml-creator-wrapper'>";
+	echo "<h2 class='xml-creator-title'>XML Config Creator</h2>";
+	echo "<p class='xml-creator-lead'>Use this guided workflow to spin up a brand new XML configuration template. Pick the query layer first, then define the operating system, architecture, and installer defaults before launching the step-by-step wizard.</p>";
+
+	echo "<form action='' method='POST' class='xml-creator-card xml-creator-protocol-form'>";
+	echo "<label for='protocol_select'>Query Protocol</label>";
+	echo "<select id='protocol_select' name='protocol' onchange='this.form.submit()'>";
+	$protocolOptions = array(
+		'' => 'No Query Layer',
+		'lgsl' => 'LGSL',
+		'gameq' => 'GameQ',
+	);
+	foreach ($protocolOptions as $value => $label) {
+		$safeValue = htmlspecialchars($value, ENT_QUOTES, 'UTF-8');
+		$safeLabel = htmlspecialchars($label, ENT_QUOTES, 'UTF-8');
+		$selected = ($selectedProtocol === $value) ? "selected='selected'" : '';
+		echo "<option value='{$safeValue}' {$selected}>{$safeLabel}</option>";
+	}
+	echo "</select>";
+	echo "<p class='xml-creator-hint'>Selecting a protocol automatically reloads this page and reveals available query names.</p>";
+	echo "</form>";
+
+	echo "<form action='home.php?m=config_games&p=cli-params&type=cleared' method='POST' class='xml-creator-form' name='xml_creator'>";
+	if ($selectedProtocol !== '') {
+		echo "<input type='hidden' name='protocol' value='{$safeProtocol}'/>";
+	}
+
+	echo "<div class='xml-creator-card'>";
+	if (!empty($queryChoices)) {
+		$label = htmlspecialchars($queryLabel, ENT_QUOTES, 'UTF-8');
+		echo "<label for='query_name'>{$label}</label>";
+		echo "<select id='query_name' name='query_name'>";
+		foreach ($queryChoices as $value => $labelText) {
+			$safeValue = htmlspecialchars($value, ENT_QUOTES, 'UTF-8');
+			$safeLabelText = htmlspecialchars($labelText, ENT_QUOTES, 'UTF-8');
+			echo "<option value='{$safeValue}'>{$safeLabelText}</option>";
+		}
+		echo "</select>";
+		echo "<p class='xml-creator-hint'>The query name informs the monitoring layer which protocol preset to use.</p>";
+	} else {
+		echo "<label>Query Name</label>";
+		echo "<div class='xml-creator-hint'>Select LGSL or GameQ above if this config should publish a query endpoint. You can skip this if the game is not queryable.</div>";
+	}
+	echo "</div>";
+
+	echo "<div class='xml-creator-grid'>";
+	echo "<div class='xml-creator-card'>";
+	echo "<label for='os_select'>Operating System</label>";
+	echo "<select id='os_select' name='os'>";
+	echo "<option value='linux'>Linux</option>";
+	echo "<option value='win'>Windows</option>";
+	echo "</select>";
+	echo "<p class='xml-creator-hint'>Defines which agent pool can install the server.</p>";
+	echo "</div>";
+
+	echo "<div class='xml-creator-card'>";
+	echo "<label for='arch_select'>Architecture</label>";
+	echo "<select id='arch_select' name='arch'>";
+	echo "<option value='32'>32-bit</option>";
+	echo "<option value='64'>64-bit</option>";
+	echo "</select>";
+	echo "<p class='xml-creator-hint'>Pick the CPU target that the XML should advertise.</p>";
+	echo "</div>";
+
+	echo "<div class='xml-creator-card'>";
+	echo "<label for='installer_select'>Installer</label>";
+	echo "<select id='installer_select' name='installer'>";
+	echo "<option value=''>None</option>";
+	echo "<option value='steam'>SteamCMD / HLDSUpdateTool</option>";
+	echo "</select>";
+	echo "<p class='xml-creator-hint'>Optional helper to bootstrap files directly from Steam.</p>";
+	echo "</div>";
+	echo "</div>";
+
+	echo "<p class='xml-creator-note'>When you click the button below the panel will send these settings into the XML creation wizard so the initial document already matches your desired platform.</p>";
+	echo "<div class='xml-creator-actions'><button type='submit' name='main' class='xml-global-save'>Launch Creator</button></div>";
+	echo "</form>";
+	echo "</div>";
+}