diff --git a/application/config/migration.php b/application/config/migration.php
index 77ec7206e..46009ce35 100644
--- a/application/config/migration.php
+++ b/application/config/migration.php
@@ -22,7 +22,7 @@
 |
 */
 
-$config['migration_version'] = 264;
+$config['migration_version'] = 265;
 
 /*
 |--------------------------------------------------------------------------
diff --git a/application/controllers/Api.php b/application/controllers/Api.php
index 119f43221..8b8ae5432 100644
--- a/application/controllers/Api.php
+++ b/application/controllers/Api.php
@@ -177,6 +177,85 @@ function station_info($key)
 		}
 	}
 
+	/**
+	 * Get station logbooks that have public slugs for the API key owner.
+	 * GET /api/logbook_public_slugs/{key}
+	 */
+	function logbook_public_slugs($key)
+	{
+		header('Content-type: application/json');
+
+		$this->load->model('api_model');
+		$this->load->model('logbooks_model');
+
+		if (!$key || $this->api_model->authorize($key) == 0) {
+			http_response_code(401);
+			echo json_encode(['status' => 'failed', 'reason' => 'missing or invalid api key']);
+			return;
+		}
+
+		$this->api_model->update_last_used($key);
+		$user_id = $this->api_model->key_userid($key);
+
+		$query = $this->logbooks_model->public_slugs_by_user($user_id);
+		$logbooks = array();
+
+		foreach ($query->result() as $row) {
+			$logbooks[] = array(
+				'logbook_id' => (int)$row->logbook_id,
+				'logbook_name' => $row->logbook_name,
+				'public_slug' => $row->public_slug,
+			);
+		}
+
+		http_response_code(200);
+		echo json_encode(array(
+			'status' => 'success',
+			'count' => count($logbooks),
+			'logbooks' => $logbooks,
+		), JSON_PRETTY_PRINT);
+	}
+
+	/**
+	 * Get all accessible station logbooks (owned + shared) that have public slugs for the API key owner.
+	 * GET /api/logbook_public_slugs_accessible/{key}
+	 */
+	function logbook_public_slugs_accessible($key)
+	{
+		header('Content-type: application/json');
+
+		$this->load->model('api_model');
+		$this->load->model('logbooks_model');
+
+		if (!$key || $this->api_model->authorize($key) == 0) {
+			http_response_code(401);
+			echo json_encode(['status' => 'failed', 'reason' => 'missing or invalid api key']);
+			return;
+		}
+
+		$this->api_model->update_last_used($key);
+		$user_id = $this->api_model->key_userid($key);
+
+		$query = $this->logbooks_model->public_slugs_accessible_by_user($user_id);
+		$logbooks = array();
+
+		foreach ($query->result() as $row) {
+			$logbooks[] = array(
+				'logbook_id' => (int)$row->logbook_id,
+				'logbook_name' => $row->logbook_name,
+				'public_slug' => $row->public_slug,
+				'access_level' => $row->access_level,
+			);
+		}
+
+		http_response_code(200);
+		echo json_encode(array(
+			'status' => 'success',
+			'count' => count($logbooks),
+			'logbooks' => $logbooks,
+		), JSON_PRETTY_PRINT);
+	}
+
 
 	/*
 	*
@@ -594,6 +673,187 @@ function logbook_check_country()
 		}
 	}
 
+	/**
+	 * Check worked and confirmation status for callsign and country.
+	 *
+	 * @api POST /api/logbook_worked_status
+	 * @header Content-Type application/json
+	 *
+	 * Required fields:
+	 * - key
+	 * - logbook_public_slug
+	 * - callsign
+	 *
+	 * Optional fields:
+	 * - band
+	 * - mode
+	 * - gridsquare
+	 */
+	function logbook_worked_status()
+	{
+		header('Content-type: application/json');
+
+		$this->load->model('api_model');
+
+		$obj = json_decode(file_get_contents("php://input"), true);
+		if ($obj === NULL) {
+			http_response_code(400);
+			echo json_encode(['status' => 'failed', 'reason' => "wrong JSON"]);
+			return;
+		}
+
+		if (!isset($obj['key']) || $this->api_model->authorize($obj['key']) == 0) {
+			http_response_code(401);
+			echo json_encode(['status' => 'failed', 'reason' => "missing api key"]);
+			return;
+		}
+
+		if (!isset($obj['logbook_public_slug']) || !isset($obj['callsign'])) {
+			http_response_code(401);
+			echo json_encode(['status' => 'failed', 'reason' => "missing fields"]);
+			return;
+		}
+
+		$this->load->model('logbook_model');
+		$this->load->model('logbooks_model');
+
+		$logbook_slug = trim($obj['logbook_public_slug']);
+		$callsign = strtoupper(trim($obj['callsign']));
+		$band = isset($obj['band']) && trim($obj['band']) !== '' ? strtoupper(trim($obj['band'])) : null;
+		$mode = isset($obj['mode']) && trim($obj['mode']) !== '' ? strtoupper(trim($obj['mode'])) : null;
+		$gridsquare = isset($obj['gridsquare']) && trim($obj['gridsquare']) !== '' ? strtoupper(trim($obj['gridsquare'])) : null;
+
+		$date = date("Y-m-d");
+		$callsign_dxcc_lookup = $this->logbook_model->dxcc_lookup($callsign, $date);
+		$country = isset($callsign_dxcc_lookup['entity']) ? $callsign_dxcc_lookup['entity'] : '';
+
+		if (!$this->logbooks_model->public_slug_exists($logbook_slug)) {
+			http_response_code(404);
+			echo json_encode(['status' => 'failed', 'reason' => "logbook not found"]);
+			return;
+		}
+
+		$logbook_id = $this->logbooks_model->public_slug_exists_logbook_id($logbook_slug);
+		if ($logbook_id == false) {
+			http_response_code(404);
+			echo json_encode(['status' => 'failed', 'reason' => $logbook_slug . " has no associated station locations"]);
+			return;
+		}
+
+		$logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($logbook_id);
+		if (!$logbooks_locations_array) {
+			http_response_code(404);
+			echo json_encode(['status' => 'failed', 'reason' => "Empty Logbook"]);
+			return;
+		}
+
+		$return = [
+			'callsign' => $callsign,
+			'country' => $country,
+			'band' => $band,
+			'mode' => $mode,
+			'gridsquare' => $gridsquare,
+			'worked' => [
+				'callsign_overall' => false,
+				'callsign_band' => $band !== null ? false : null,
+				'country_overall' => false,
+				'country_band' => $band !== null ? false : null,
+				'grid_overall' => $gridsquare !== null ? false : null,
+				'grid_band' => ($gridsquare !== null && $band !== null) ? false : null,
+			],
+			'confirmed' => [
+				'callsign' => [
+					'lotw' => false,
+					'qsl' => false,
+					'any' => false,
+				],
+				'country' => [
+					'lotw' => false,
+					'qsl' => false,
+					'any' => false,
+				],
+			],
+		];
+
+		$table_name = $this->config->item('table_name');
+		$main_mode = $mode !== null ? $this->logbook_model->get_main_mode_from_mode($mode) : null;
+
+		$this->db->where_in('station_id', $logbooks_locations_array);
+		$this->db->where('COL_CALL', $callsign);
+		$callsign_overall_query = $this->db->get($table_name, 1, 0);
+		$return['worked']['callsign_overall'] = $callsign_overall_query->num_rows() > 0;
+
+		if ($band !== null) {
+			$this->db->where_in('station_id', $logbooks_locations_array);
+			$this->db->where('COL_CALL', $callsign);
+			$this->db->where('COL_BAND', $band);
+			if ($main_mode !== null) {
+				$this->db->where('COL_MODE', $main_mode);
+			}
+			$callsign_band_query = $this->db->get($table_name, 1, 0);
+			$return['worked']['callsign_band'] = $callsign_band_query->num_rows() > 0;
+		}
+
+		if ($country !== '') {
+			$this->db->where_in('station_id', $logbooks_locations_array);
+			$this->db->where('COL_COUNTRY', urldecode($country));
+			$country_overall_query = $this->db->get($table_name, 1, 0);
+			$return['worked']['country_overall'] = $country_overall_query->num_rows() > 0;
+
+			if ($band !== null) {
+				$this->db->where_in('station_id', $logbooks_locations_array);
+				$this->db->where('COL_COUNTRY', urldecode($country));
+				$this->db->where('COL_BAND', $band);
+				if ($main_mode !== null) {
+					$this->db->where('COL_MODE', $main_mode);
+				}
+				$country_band_query = $this->db->get($table_name, 1, 0);
+				$return['worked']['country_band'] = $country_band_query->num_rows() > 0;
+			}
+		}
+
+		if ($gridsquare !== null) {
+			$grid_overall_result = $this->logbook_model->check_if_grid_worked_in_logbook($gridsquare, $logbooks_locations_array, null);
+			$return['worked']['grid_overall'] = $grid_overall_result > 0;
+
+			if ($band !== null) {
+				$grid_band_result = $this->logbook_model->check_if_grid_worked_in_logbook($gridsquare, $logbooks_locations_array, $band);
+				$return['worked']['grid_band'] = $grid_band_result > 0;
+			}
+		}
+
+		$this->db->where_in('station_id', $logbooks_locations_array);
+		$this->db->where('COL_CALL', $callsign);
+		$this->db->where("COL_LOTW_QSL_RCVD='Y'");
+		$callsign_lotw_query = $this->db->get($table_name, 1, 0);
+		$return['confirmed']['callsign']['lotw'] = $callsign_lotw_query->num_rows() > 0;
+
+		$this->db->where_in('station_id', $logbooks_locations_array);
+		$this->db->where('COL_CALL', $callsign);
+		$this->db->where("COL_QSL_RCVD='Y'");
+		$callsign_qsl_query = $this->db->get($table_name, 1, 0);
+		$return['confirmed']['callsign']['qsl'] = $callsign_qsl_query->num_rows() > 0;
+		$return['confirmed']['callsign']['any'] = $return['confirmed']['callsign']['lotw'] || $return['confirmed']['callsign']['qsl'];
+
+		if ($country !== '') {
+			$this->db->where_in('station_id', $logbooks_locations_array);
+			$this->db->where('COL_COUNTRY', urldecode($country));
+			$this->db->where("COL_LOTW_QSL_RCVD='Y'");
+			$country_lotw_query = $this->db->get($table_name, 1, 0);
+			$return['confirmed']['country']['lotw'] = $country_lotw_query->num_rows() > 0;
+
+			$this->db->where_in('station_id', $logbooks_locations_array);
+			$this->db->where('COL_COUNTRY', urldecode($country));
+			$this->db->where("COL_QSL_RCVD='Y'");
+			$country_qsl_query = $this->db->get($table_name, 1, 0);
+			$return['confirmed']['country']['qsl'] = $country_qsl_query->num_rows() > 0;
+			$return['confirmed']['country']['any'] = $return['confirmed']['country']['lotw'] || $return['confirmed']['country']['qsl'];
+		}
+
+		http_response_code(200);
+		echo json_encode($return, JSON_PRETTY_PRINT);
+	}
+
 	/* ENDPOINT for Rig Control */
 
 	function radio()
diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php
index 939a6ffc2..756285e22 100644
--- a/application/controllers/Logbook.php
+++ b/application/controllers/Logbook.php
@@ -92,6 +92,30 @@ function jsonentity($adif)
 		echo json_encode($return, JSON_PRETTY_PRINT);
 	}
 
+	function jsondxcc($tempcallsign)
+	{
+		$callsign = $this->security->xss_clean($tempcallsign);
+
+		$this->load->model('user_model');
+		if (!$this->user_model->authorize($this->config->item('auth_mode'))) {
+			return;
+		}
+
+		// Convert - in Callsign to / Used for URL processing
+		$callsign = str_replace("-", "/", $callsign);
+		$callsign = str_replace("Ø", "0", $callsign);
+
+		$return = [
+			"callsign" => strtoupper($callsign),
+			"dxcc" => false,
+		];
+
+		$return['dxcc'] = $this->cached_dxcc_lookup($callsign);
+
+		header('Content-Type: application/json');
+		echo json_encode($return, JSON_PRETTY_PRINT);
+	}
+
 	function json($tempcallsign, $temptype, $tempband, $tempmode, $tempstation_id = null)
 	{
 		// Cleaning for security purposes
@@ -134,18 +158,25 @@ function json($tempcallsign, $temptype, $tempband, $tempmode, $tempstation_id =
 			"qsl_manager" => "",
 			"bearing" 		=> "",
 			"workedBefore" => false,
+			"callsignWorkedBefore" => false,
+			"callsignConfirmed" => false,
 			"timesWorked" => 0,
 			"lotw_member" => $lotw_member,
 			"lotw_days" => $lotw_days,
 			"image" => "",
 		];
 
-		$return['dxcc'] = $this->dxcheck($callsign);
+		$return['dxcc'] = $this->cached_dxcc_lookup($callsign);
 
 		$lookupcall = $this->get_plaincall($callsign);
 
 		$return['partial'] = $this->partial($lookupcall);
 
+		$this->load->model('logbooks_model');
+		$logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
+		$user_default_confirmation = $this->session->userdata('user_default_confirmation');
+		$recent_details = $this->logbook_model->get_recent_callsign_details($callsign, $this->session->userdata('user_id'));
+
 		$callbook = $this->logbook_model->loadCallBook($callsign, $this->config->item('use_fullname'));
 
 		if ($this->session->userdata('user_measurement_base') == NULL) {
@@ -154,16 +185,19 @@ function json($tempcallsign, $temptype, $tempband, $tempmode, $tempstation_id =
 			$measurement_base = $this->session->userdata('user_measurement_base');
 		}
 
-		$return['callsign_name'] 		= $this->nval($callbook['name'] ?? '', $this->logbook_model->call_name($callsign));
-		$return['callsign_qra'] 		= $this->nval($callbook['gridsquare'] ?? '',  $this->logbook_model->call_qra($callsign));
+		$return['callsign_name'] 		= $this->nval($callbook['name'] ?? '', $recent_details['name']);
+		$return['callsign_qra'] 		= $this->nval($callbook['gridsquare'] ?? '',  $recent_details['gridsquare']);
 		$return['callsign_distance'] 	= $this->distance($return['callsign_qra']);
-		$return['callsign_qth'] 		= $this->nval($callbook['city'] ?? '', $this->logbook_model->call_qth($callsign));
-		$return['callsign_iota'] 		= $this->nval($callbook['iota'] ?? '', $this->logbook_model->call_iota($callsign));
-		$return['qsl_manager'] 			= $this->nval($callbook['qslmgr'] ?? '', $this->logbook_model->call_qslvia($callsign));
-		$return['callsign_state'] 		= $this->nval($callbook['state'] ?? '', $this->logbook_model->call_state($callsign));
-		$return['callsign_us_county'] 	= $this->nval($callbook['us_county'] ?? '', $this->logbook_model->call_us_county($callsign));
-		$return['workedBefore'] 		= $this->worked_grid_before($return['callsign_qra'], $type, $band, $mode);
-		$return['confirmed'] 		= $this->confirmed_grid_before($return['callsign_qra'], $type, $band, $mode);
+		$return['callsign_qth'] 		= $this->nval($callbook['city'] ?? '', $recent_details['qth']);
+		$return['callsign_iota'] 		= $this->nval($callbook['iota'] ?? '', $recent_details['iota']);
+		$return['qsl_manager'] 			= $this->nval($callbook['qslmgr'] ?? '', $recent_details['qsl_via']);
+		$return['callsign_state'] 		= $this->nval($callbook['state'] ?? '', $recent_details['state']);
+		$return['callsign_us_county'] 	= $this->nval($callbook['us_county'] ?? '', $recent_details['us_county']);
+		$return['workedBefore'] 		= $this->worked_grid_before($return['callsign_qra'], $type, $band, $mode, $logbooks_locations_array);
+		$return['confirmed'] 		= $this->confirmed_grid_before($return['callsign_qra'], $type, $band, $mode, $logbooks_locations_array, $user_default_confirmation);
+		$callsign_status = $this->callsign_status($callsign, $type, $band, $mode, $logbooks_locations_array, $user_default_confirmation);
+		$return['callsignWorkedBefore'] = $callsign_status['workedBefore'];
+		$return['callsignConfirmed'] = $callsign_status['confirmed'];
 		$return['timesWorked'] 		= $this->logbook_model->times_worked($lookupcall);
 
 		if ($this->session->userdata('user_show_profile_image')) {
@@ -213,39 +247,109 @@ function nval($val1, $val2)
 		return (($val2 ?? "") === "" ? ($val1 ?? "") : ($val2 ?? ""));
 	}
 
-	function confirmed_grid_before($gridsquare, $type, $band, $mode)
+	private function build_confirmation_where($user_default_confirmation)
 	{
-		if (strlen($gridsquare) < 4)
-			return false;
-
-		$this->load->model('logbooks_model');
-		$logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
-		$user_default_confirmation = $this->session->userdata('user_default_confirmation');
-
-		if (!empty($logbooks_locations_array)) {
-			$extrawhere = '';
-			if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) {
-				$extrawhere = "COL_QSL_RCVD='Y'";
+		$extrawhere = '';
+		if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) {
+			$extrawhere = "COL_QSL_RCVD='Y'";
+		}
+		if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) {
+			if ($extrawhere != '') {
+				$extrawhere .= " OR";
 			}
-			if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) {
-				if ($extrawhere != '') {
-					$extrawhere .= " OR";
-				}
-				$extrawhere .= " COL_LOTW_QSL_RCVD='Y'";
+			$extrawhere .= " COL_LOTW_QSL_RCVD='Y'";
+		}
+		if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'E') !== false) {
+			if ($extrawhere != '') {
+				$extrawhere .= " OR";
 			}
-			if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'E') !== false) {
-				if ($extrawhere != '') {
-					$extrawhere .= " OR";
-				}
-				$extrawhere .= " COL_EQSL_QSL_RCVD='Y'";
+			$extrawhere .= " COL_EQSL_QSL_RCVD='Y'";
+		}
+
+		if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Z') !== false) {
+			if ($extrawhere != '') {
+				$extrawhere .= " OR";
 			}
+			$extrawhere .= " COL_QRZCOM_QSO_DOWNLOAD_STATUS='Y'";
+		}
 
-			if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Z') !== false) {
-				if ($extrawhere != '') {
-					$extrawhere .= " OR";
-				}
-				$extrawhere .= " COL_QRZCOM_QSO_DOWNLOAD_STATUS='Y'";
+		return $extrawhere;
+	}
+
+	private function callsign_status($callsign, $type, $band, $mode, $logbooks_locations_array, $user_default_confirmation)
+	{
+		$return = [
+			"workedBefore" => false,
+			"confirmed" => false,
+		];
+
+		if (empty($logbooks_locations_array)) {
+			return $return;
+		}
+
+		$this->load->model('logbook_model');
+
+		if ($type == "SAT") {
+			$this->db->where('COL_PROP_MODE', 'SAT');
+		} else {
+			$this->db->where('COL_MODE', $this->logbook_model->get_main_mode_from_mode($mode));
+			$this->db->where('COL_BAND', $band);
+			$this->db->where('COL_PROP_MODE !=', 'SAT');
+		}
+		$this->db->where_in('station_id', $logbooks_locations_array);
+		$this->db->where('COL_CALL', strtoupper($callsign));
+
+		$query = $this->db->get($this->config->item('table_name'), 1, 0);
+		foreach ($query->result() as $workedBeforeRow) {
+			$return['workedBefore'] = true;
+		}
+
+		$extrawhere = $this->build_confirmation_where($user_default_confirmation);
+
+		if ($type == "SAT") {
+			$this->db->where('COL_PROP_MODE', 'SAT');
+			if ($extrawhere != '') {
+				$this->db->where('(' . $extrawhere . ')');
+			} else {
+				$this->db->where("1=0");
 			}
+		} else {
+			$this->load->model('logbook_model');
+			$this->db->where('COL_MODE', $this->logbook_model->get_main_mode_from_mode($mode));
+			$this->db->where('COL_BAND', $band);
+			$this->db->where('COL_PROP_MODE !=', 'SAT');
+			if ($extrawhere != '') {
+				$this->db->where('(' . $extrawhere . ')');
+			} else {
+				$this->db->where("1=0");
+			}
+		}
+		$this->db->where_in('station_id', $logbooks_locations_array);
+		$this->db->where('COL_CALL', strtoupper($callsign));
+
+		$query = $this->db->get($this->config->item('table_name'), 1, 0);
+		foreach ($query->result() as $workedBeforeRow) {
+			$return['confirmed'] = true;
+		}
+
+		return $return;
+	}
+
+	function confirmed_grid_before($gridsquare, $type, $band, $mode, $logbooks_locations_array = null, $user_default_confirmation = null)
+	{
+		if (strlen($gridsquare) < 4)
+			return false;
+
+		if ($logbooks_locations_array === null) {
+			$this->load->model('logbooks_model');
+			$logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
+		}
+		if ($user_default_confirmation === null) {
+			$user_default_confirmation = $this->session->userdata('user_default_confirmation');
+		}
+
+		if (!empty($logbooks_locations_array)) {
+			$extrawhere = $this->build_confirmation_where($user_default_confirmation);
 
 
 			if ($type == "SAT") {
@@ -283,13 +387,15 @@ function confirmed_grid_before($gridsquare, $type, $band, $mode)
 		return false;
 	}
 
-	function worked_grid_before($gridsquare, $type, $band, $mode)
+	function worked_grid_before($gridsquare, $type, $band, $mode, $logbooks_locations_array = null)
 	{
 		if (strlen($gridsquare) < 4)
 			return false;
 
-		$this->load->model('logbooks_model');
-		$logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
+		if ($logbooks_locations_array === null) {
+			$this->load->model('logbooks_model');
+			$logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
+		}
 
 		if (!empty($logbooks_locations_array)) {
 			if ($type == "SAT") {
@@ -1186,6 +1292,30 @@ function dxcheck($call = "", $date = "")
 		return $ans;
 	}
 
+	private function cached_dxcc_lookup($call)
+	{
+		$normalized_call = strtoupper(trim((string)$call));
+		if ($normalized_call === '') {
+			return false;
+		}
+
+		$cache_key = 'dxcc_lookup_' . md5($normalized_call . '|' . date('Y-m-d'));
+		$cache_ttl = 3600; // 1 hour
+
+		$this->load->driver('cache', array('adapter' => 'file', 'backup' => 'file'));
+		$cached = $this->cache->get($cache_key);
+		if ($cached !== false) {
+			return $cached;
+		}
+
+		$dxcc = $this->dxcheck($normalized_call);
+		if ($dxcc !== false && $dxcc !== null) {
+			$this->cache->save($cache_key, $dxcc, $cache_ttl);
+		}
+
+		return $dxcc;
+	}
+
 	function getentity($adif)
 	{
 		$this->load->model("logbook_model");
diff --git a/application/controllers/Qso.php b/application/controllers/Qso.php
index ce3df2d71..b34b21ea7 100755
--- a/application/controllers/Qso.php
+++ b/application/controllers/Qso.php
@@ -122,6 +122,12 @@ public function index()
 				'operator_callsign' => $this->input->post('operator_callsign'),
 				'transmit_power' => $this->input->post('transmit_power')
 			);
+
+            $propMode = strtoupper(trim((string)($qso_data['prop_mode'] ?? '')));
+            if ($propMode !== 'SAT') {
+                $qso_data['sat_name'] = '';
+                $qso_data['sat_mode'] = '';
+            }
 			// ];
 
 			setcookie("radio", $qso_data['radio'], time()+3600*24*99);
@@ -162,6 +168,83 @@ public function saveqso() {
         $this->logbook_model->create_qso();
     }
 
+    /*
+     * AJAX endpoint for QSO entry form to avoid full page reload on save.
+     */
+    public function ajax_saveqso() {
+        $this->load->library('form_validation');
+        $this->load->model('logbook_model');
+
+        $this->form_validation->set_rules('start_date', 'Date', 'required');
+        $this->form_validation->set_rules('start_time', 'Time', 'required');
+        $this->form_validation->set_rules('callsign', 'Callsign', 'required');
+        $this->form_validation->set_rules('band', 'Band', 'required');
+        $this->form_validation->set_rules('mode', 'Mode', 'required');
+        $this->form_validation->set_rules('locator', 'Locator', 'callback_check_locator');
+
+        if ($this->form_validation->run() == FALSE) {
+            $validation_errors = array();
+            $fields = array('start_date', 'start_time', 'callsign', 'band', 'mode', 'locator');
+            foreach ($fields as $field) {
+                $field_error = form_error($field, '', '');
+                if (!empty($field_error)) {
+                    $validation_errors[$field] = strip_tags($field_error);
+                }
+            }
+
+            return $this->output
+                ->set_content_type('application/json')
+                ->set_output(json_encode(array(
+                    'status' => 'error',
+                    'message' => 'Please correct the form errors and try again.',
+                    'validation_errors' => $validation_errors,
+                )));
+        }
+
+        $qso_data = array(
+            'start_date' => $this->input->post('start_date'),
+            'start_time' => $this->input->post('start_time'),
+            'end_time' => $this->input->post('end_time'),
+            'time_stamp' => time(),
+            'band' => $this->input->post('band'),
+            'band_rx' => $this->input->post('band_rx'),
+            'freq' => $this->input->post('freq_display'),
+            'freq_rx' => $this->input->post('freq_display_rx'),
+            'mode' => $this->input->post('mode'),
+            'sat_name' => $this->input->post('sat_name'),
+            'sat_mode' => $this->input->post('sat_mode'),
+            'prop_mode' => $this->input->post('prop_mode'),
+            'radio' => $this->input->post('radio'),
+            'station_profile_id' => $this->input->post('station_profile'),
+            'operator_callsign' => $this->input->post('operator_callsign'),
+            'transmit_power' => $this->input->post('transmit_power')
+        );
+
+        $propMode = strtoupper(trim((string)($qso_data['prop_mode'] ?? '')));
+        if ($propMode !== 'SAT') {
+            $qso_data['sat_name'] = '';
+            $qso_data['sat_mode'] = '';
+        }
+
+        setcookie("radio", $qso_data['radio'], time() + 3600 * 24 * 99);
+        setcookie("station_profile_id", $qso_data['station_profile_id'], time() + 3600 * 24 * 99);
+
+        $this->session->set_userdata($qso_data);
+
+        if ($this->input->post('sat_name')) {
+            $this->session->set_userdata('prop_mode', 'SAT');
+        }
+
+        $this->logbook_model->create_qso();
+
+        return $this->output
+            ->set_content_type('application/json')
+            ->set_output(json_encode(array(
+                'status' => 'ok',
+                'message' => 'QSO Added',
+            )));
+    }
+
 	function edit() {
 
 		$this->load->model('logbook_model');
@@ -740,6 +823,12 @@ public function component_past_contacts() {
     $data['current_page'] = $page;
     $data['limit'] = $limit;
 
+        // This endpoint is polled by HTMX and must not be cached.
+        $this->output->set_header('Cache-Control: no-store, no-cache, must-revalidate, max-age=0');
+        $this->output->set_header('Cache-Control: post-check=0, pre-check=0', false);
+        $this->output->set_header('Pragma: no-cache');
+        $this->output->set_header('Expires: Sat, 01 Jan 2000 00:00:00 GMT');
+
     // Load view
     $this->load->view('qso/components/previous_contacts', $data);
    }
diff --git a/application/controllers/Stationdiary.php b/application/controllers/Stationdiary.php
index bad844bbb..480e686b5 100644
--- a/application/controllers/Stationdiary.php
+++ b/application/controllers/Stationdiary.php
@@ -70,7 +70,7 @@ public function index($callsign = NULL, $offset = 0)
 		$cleanCallsign = strtoupper($resolution['callsign']);
 		$pageOffset = is_numeric($offset) ? (int)$offset : 0;
 		$cacheVersion = $this->note->get_public_diary_cache_version($user_id);
-		$renderVersion = 'public_diary_render_v2';
+		$renderVersion = 'public_diary_render_v5';
 		$cacheKey = 'public_station_diary_' . md5($cleanCallsign . '_' . $pageOffset . '_' . $cacheVersion . '_' . $renderVersion);
 
 		$cachedHtml = $this->cache->get($cacheKey);
@@ -110,12 +110,13 @@ public function index($callsign = NULL, $offset = 0)
 		$this->pagination->initialize($config);
 
 		$data['callsign'] = $cleanCallsign;
-		$data['entries'] = $this->note->get_public_station_diary_entries($user_id, $perPage, $pageOffset);
+		$data['entries'] = $this->note->get_public_station_diary_entries($user_id, $perPage, $pageOffset, FALSE);
 		$data['pagination_links'] = $this->pagination->create_links();
 		$data['page_title'] = 'Station Diary - ' . $cleanCallsign;
 		$data['rss_url'] = site_url('station-diary/' . rawurlencode($cleanCallsign) . '/rss');
 		$data['qso_datetime_format'] = $this->get_public_qso_datetime_format($resolution['user_date_format'] ?? NULL);
 		$data['is_single_entry'] = false;
+		$data['defer_qso_list'] = true;
 		$data['current_entry_permalink'] = '';
 
 		$html = $this->load->view('station_diary/public_index', $data, TRUE);
@@ -192,6 +193,7 @@ public function entry($callsign = NULL, $entry_id = 0)
 		$data['rss_url'] = site_url('station-diary/' . rawurlencode($cleanCallsign) . '/rss');
 		$data['qso_datetime_format'] = $this->get_public_qso_datetime_format($resolution['user_date_format'] ?? NULL);
 		$data['is_single_entry'] = true;
+		$data['defer_qso_list'] = false;
 		$data['current_entry_permalink'] = site_url('station-diary/' . rawurlencode($cleanCallsign) . '/entry/' . (int)$entry->id);
 		$data['entry_reaction_totals'] = $entryReactionTotals;
 		$data['visitor_reaction'] = null;
@@ -247,7 +249,11 @@ public function react($callsign = NULL, $entry_id = 0)
 			return;
 		}
 
-		$this->note->invalidate_public_diary_cache_for_note($entryId, $user_id);
+		$cleanCallsign = strtoupper($resolution['callsign']);
+		$cacheVersion = $this->note->get_public_diary_cache_version($user_id);
+		$renderVersion = 'public_diary_render_v4';
+		$entryCacheKey = 'public_station_diary_entry_' . md5($cleanCallsign . '_' . $entryId . '_' . $cacheVersion . '_' . $renderVersion);
+		$this->cache->delete($entryCacheKey);
 
 		$totals = $this->note->get_station_diary_reaction_totals($entryId);
 		$visitorReaction = $this->note->get_station_diary_visitor_reaction($entryId, $visitorHash);
@@ -259,6 +265,67 @@ public function react($callsign = NULL, $entry_id = 0)
 		));
 	}
 
+	public function get_filtered_qsos()
+	{
+		$this->output->set_content_type('application/json');
+
+		if (strtolower($this->input->method()) !== 'post') {
+			echo json_encode(array('success' => false, 'message' => 'Invalid request method'));
+			return;
+		}
+
+		$callsign = $this->input->post('callsign', TRUE);
+		$entryId = (int)$this->input->post('entry_id', TRUE);
+		$startDate = trim((string)$this->input->post('start_date', TRUE));
+		$endDate = trim((string)$this->input->post('end_date', TRUE));
+		$logbookId = (int)$this->input->post('logbook_id', TRUE);
+		$satOnly = $this->input->post('sat_only', TRUE) === '1';
+
+		if ($this->security->xss_clean($callsign, TRUE) === FALSE || $entryId <= 0) {
+			echo json_encode(array('success' => false, 'message' => 'Invalid request'));
+			return;
+		}
+
+		$resolution = $this->note->resolve_public_user_by_callsign($callsign);
+		if (!isset($resolution['status']) || $resolution['status'] !== 'ok') {
+			echo json_encode(array('success' => false, 'message' => 'Not found'));
+			return;
+		}
+
+		$userId = (int)$resolution['user_id'];
+		$entry = $this->note->get_public_station_diary_entry($userId, $entryId);
+		if (!$entry) {
+			echo json_encode(array('success' => false, 'message' => 'Entry not found'));
+			return;
+		}
+
+		$entryDate = date('Y-m-d', strtotime($entry->created_at));
+		if ($startDate === '') {
+			$startDate = !empty($entry->qso_date_start) ? $entry->qso_date_start : $entryDate;
+		}
+		if ($endDate === '') {
+			$endDate = !empty($entry->qso_date_end) ? $entry->qso_date_end : $entryDate;
+		}
+
+		if (!preg_match('/^\d{4}-\d{2}-\d{2}$/', $startDate) || !preg_match('/^\d{4}-\d{2}-\d{2}$/', $endDate)) {
+			echo json_encode(array('success' => false, 'message' => 'Invalid date format'));
+			return;
+		}
+
+		if ($logbookId <= 0) {
+			$logbookId = !empty($entry->logbook_id) ? (int)$entry->logbook_id : 0;
+		}
+
+		$qsoSummary = $this->note->get_qso_summary_for_date_range($userId, $startDate, $endDate, $logbookId, $satOnly);
+		$qsoList = $this->note->get_qso_list_for_date_range($userId, $startDate, $endDate, $logbookId, $satOnly);
+
+		echo json_encode(array(
+			'success' => true,
+			'qso_list' => $qsoList,
+			'highlight_dx' => $qsoSummary['highlight_dx'] ?? null,
+		));
+	}
+
 	public function get_qso_map_data()
 	{
 		$this->output->set_content_type('application/json');
@@ -329,4 +396,5 @@ public function get_qso_map_data()
 
 		// Merge and return
 		echo json_encode(array_merge($plotArray, $stationArray));
-	}}
\ No newline at end of file
+	}
+}
\ No newline at end of file
diff --git a/application/controllers/User.php b/application/controllers/User.php
index dc4d6f676..409698e10 100644
--- a/application/controllers/User.php
+++ b/application/controllers/User.php
@@ -685,6 +685,8 @@ function edit()
 			$data['dashboard_lotw_card'] = false;
 			$data['dashboard_vuccgrids_card'] = false;
 			$data['dashboard_map_greyline'] = true;
+			$data['menu_show_qsl_cards'] = true;
+			$data['menu_show_sstv_images'] = false;
 
 			$dashboard_options = $this->user_options_model->get_options('dashboard')->result();
 
@@ -750,6 +752,17 @@ function edit()
 				}
 			}
 
+			$menu_options = $this->user_options_model->get_options('menu')->result();
+			foreach ($menu_options as $item) {
+				if ($item->option_name == 'show_qsl_cards' && $item->option_key == 'enabled') {
+					$data['menu_show_qsl_cards'] = ($item->option_value == 'true');
+				}
+
+				if ($item->option_name == 'show_sstv_images' && $item->option_key == 'enabled') {
+					$data['menu_show_sstv_images'] = ($item->option_value == 'true');
+				}
+			}
+
 			// [QSO Form] Load field visibility preferences
 			$data['qso_fields'] = [
 				'rst' => true, 'name' => true, 'qth' => true, 'locator' => true, 'comment' => true,
@@ -934,6 +947,22 @@ function edit()
 							$this->user_options_model->set_option('dashboard', 'dashboard_map_greyline', array('enabled' => 'false'));
 						}
 
+						if (isset($_POST['user_menu_show_sstv_images'])) {
+							$this->user_options_model->set_option('menu', 'show_sstv_images', array('enabled' => 'true'));
+							$this->session->set_userdata('user_show_sstv_images', true);
+						} else {
+							$this->user_options_model->set_option('menu', 'show_sstv_images', array('enabled' => 'false'));
+							$this->session->set_userdata('user_show_sstv_images', false);
+						}
+
+						if (isset($_POST['user_menu_show_qsl_cards'])) {
+							$this->user_options_model->set_option('menu', 'show_qsl_cards', array('enabled' => 'true'));
+							$this->session->set_userdata('user_show_qsl_cards', true);
+						} else {
+							$this->user_options_model->set_option('menu', 'show_qsl_cards', array('enabled' => 'false'));
+							$this->session->set_userdata('user_show_qsl_cards', false);
+						}
+
 						// [QSO Form] Save field visibility preferences
 						$qso_field_keys = ['rst', 'name', 'qth', 'locator', 'comment',
 							'station_tab', 'freq_tx', 'freq_rx', 'band_rx', 'transmit_power', 'operator_callsign',
diff --git a/application/migrations/265_add_station_time_on_index.php b/application/migrations/265_add_station_time_on_index.php
new file mode 100644
index 000000000..eb26bec29
--- /dev/null
+++ b/application/migrations/265_add_station_time_on_index.php
@@ -0,0 +1,36 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+class Migration_add_station_time_on_index extends CI_Migration {
+
+	public function up()
+	{
+		$table = $this->config->item('table_name');
+		if (empty($table)) {
+			return;
+		}
+
+		$this->db->db_debug = false;
+		$indexExists = $this->db->query("SHOW INDEX FROM `{$table}` WHERE Key_name = 'idx_station_time_on'")->num_rows();
+		if ($indexExists == 0) {
+			$this->db->query("ALTER TABLE `{$table}` ADD INDEX `idx_station_time_on` (`station_id`, `COL_TIME_ON`)");
+		}
+		$this->db->db_debug = true;
+	}
+
+	public function down()
+	{
+		$table = $this->config->item('table_name');
+		if (empty($table)) {
+			return;
+		}
+
+		$this->db->db_debug = false;
+		$indexExists = $this->db->query("SHOW INDEX FROM `{$table}` WHERE Key_name = 'idx_station_time_on'")->num_rows();
+		if ($indexExists > 0) {
+			$this->db->query("ALTER TABLE `{$table}` DROP INDEX `idx_station_time_on`");
+		}
+		$this->db->db_debug = true;
+	}
+}
diff --git a/application/migrations/266_tag_2_8_12.php b/application/migrations/266_tag_2_8_12.php
new file mode 100644
index 000000000..640485d27
--- /dev/null
+++ b/application/migrations/266_tag_2_8_12.php
@@ -0,0 +1,30 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+/*
+*   Tag Cloudlog as 2.8.12 Migration
+*/
+
+class Migration_tag_2_8_12 extends CI_Migration {
+
+    public function up()
+    {
+
+        // Tag Cloudlog 2.8.12
+        $this->db->where('option_name', 'version');
+        $this->db->update('options', array('option_value' => '2.8.12'));
+
+        // Trigger Version Info Dialog
+        $this->db->where('option_type', 'version_dialog');
+        $this->db->where('option_name', 'confirmed');
+        $this->db->update('user_options', array('option_value' => 'false'));
+
+    }
+
+    public function down()
+    {
+        $this->db->where('option_name', 'version');
+        $this->db->update('options', array('option_value' => '2.8.11'));
+    }
+}
\ No newline at end of file
diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index bb2dfbf10..5363310e0 100755
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -1639,6 +1639,74 @@ function call_lookup_result($callsign)
     return $data;
   }
 
+  /**
+   * Get recent callsign details for a user in a single query and derive the
+   * latest non-empty value per field in PHP.
+   */
+  function get_recent_callsign_details($callsign, $user_id, $limit = 100)
+  {
+    $details = array(
+      'name' => '',
+      'gridsquare' => '',
+      'qth' => '',
+      'iota' => '',
+      'qsl_via' => '',
+      'state' => '',
+      'us_county' => null,
+    );
+
+    $this->db->select('COL_NAME, COL_GRIDSQUARE, COL_QTH, COL_IOTA, COL_QSL_VIA, COL_STATE, COL_CNTY, COL_TIME_ON');
+    $this->db->join('station_profile', 'station_profile.station_id = ' . $this->config->item('table_name') . '.station_id');
+    $this->db->where('COL_CALL', $callsign);
+    $this->db->where('station_profile.user_id', $user_id);
+    $this->db->order_by('COL_TIME_ON', 'desc');
+    $this->db->limit($limit);
+    $query = $this->db->get($this->config->item('table_name'));
+
+    if ($query->num_rows() === 0) {
+      return $details;
+    }
+
+    foreach ($query->result() as $row) {
+      if ($details['name'] === '' && !empty($row->COL_NAME)) {
+        $details['name'] = $row->COL_NAME;
+      }
+      if ($details['gridsquare'] === '' && !empty($row->COL_GRIDSQUARE)) {
+        $details['gridsquare'] = strtoupper($row->COL_GRIDSQUARE);
+      }
+      if ($details['qth'] === '' && !empty($row->COL_QTH)) {
+        $details['qth'] = $row->COL_QTH;
+      }
+      if ($details['iota'] === '' && !empty($row->COL_IOTA)) {
+        $details['iota'] = $row->COL_IOTA;
+      }
+      if ($details['qsl_via'] === '' && !empty($row->COL_QSL_VIA)) {
+        $details['qsl_via'] = $row->COL_QSL_VIA;
+      }
+      if ($details['state'] === '' && !empty($row->COL_STATE)) {
+        $details['state'] = $row->COL_STATE;
+      }
+      if ($details['us_county'] === null && !empty($row->COL_CNTY)) {
+        $county_parts = explode(',', $row->COL_CNTY, 2);
+        $details['us_county'] = isset($county_parts[1]) ? trim($county_parts[1]) : trim($county_parts[0]);
+      }
+
+      if (
+        $details['name'] !== '' &&
+        $details['gridsquare'] !== '' &&
+        $details['qth'] !== '' &&
+        $details['iota'] !== '' &&
+        $details['qsl_via'] !== '' &&
+        $details['state'] !== '' &&
+        $details['us_county'] !== null
+      ) {
+        break;
+      }
+    }
+
+    return $details;
+  }
+
   /* Callsign QRA */
   function call_qra($callsign)
   {
diff --git a/application/models/Logbooks_model.php b/application/models/Logbooks_model.php
index 00d832907..78cbd78eb 100644
--- a/application/models/Logbooks_model.php
+++ b/application/models/Logbooks_model.php
@@ -243,6 +243,42 @@ function public_slug_exists_logbook_id($slug) {
 		}
 	}
 
+	function public_slugs_by_user($user_id) {
+		$clean_user_id = $this->security->xss_clean($user_id);
+
+		$this->db->select('logbook_id, logbook_name, public_slug');
+		$this->db->from('station_logbooks');
+		$this->db->where('user_id', $clean_user_id);
+		$this->db->where('public_slug IS NOT NULL', null, false);
+		$this->db->where("public_slug != ''", null, false);
+		$this->db->order_by('logbook_name', 'ASC');
+
+		return $this->db->get();
+	}
+
+	function public_slugs_accessible_by_user($user_id) {
+		$clean_user_id = $this->security->xss_clean($user_id);
+
+		$this->db->select('station_logbooks.logbook_id, station_logbooks.logbook_name, station_logbooks.public_slug,
+			CASE
+				WHEN station_logbooks.user_id = '.$this->db->escape($clean_user_id).' THEN "owner"
+				ELSE slp.permission_level
+			END as access_level', FALSE);
+		$this->db->from('station_logbooks');
+		$this->db->join('station_logbooks_permissions slp',
+			'slp.logbook_id = station_logbooks.logbook_id AND slp.user_id = '.$this->db->escape($clean_user_id),
+			'left');
+		$this->db->group_start();
+			$this->db->where('station_logbooks.user_id', $clean_user_id);
+			$this->db->or_where('slp.user_id', $clean_user_id);
+		$this->db->group_end();
+		$this->db->where('station_logbooks.public_slug IS NOT NULL', null, false);
+		$this->db->where("station_logbooks.public_slug != ''", null, false);
+		$this->db->order_by('station_logbooks.logbook_name', 'ASC');
+
+		return $this->db->get();
+	}
+
 	function is_public_slug_available($slug) {
 		// Clean public_slug
 		$clean_slug = $this->security->xss_clean($slug);
diff --git a/application/models/Note.php b/application/models/Note.php
index 260a589ab..a7ec9742f 100644
--- a/application/models/Note.php
+++ b/application/models/Note.php
@@ -401,7 +401,7 @@ public function count_public_station_diary_entries($user_id) {
 		return (int)$this->db->count_all_results();
 	}
 
-	public function get_public_station_diary_entries($user_id, $limit = 10, $offset = 0) {
+	public function get_public_station_diary_entries($user_id, $limit = 10, $offset = 0, $include_qso_list = TRUE) {
 		$this->db->from('notes');
 		$this->db->where('user_id', (int)$user_id);
 		$this->db->where('cat', 'Station Diary');
@@ -419,6 +419,8 @@ public function get_public_station_diary_entries($user_id, $limit = 10, $offset
 		}
 
 		$imagesMap = $this->get_diary_images($ids);
+		$qsoSummaryMemo = array();
+		$qsoListMemo = array();
 		foreach ($entries as $entry) {
 			$entry->images = isset($imagesMap[$entry->id]) ? $imagesMap[$entry->id] : array();
 			$entry->qso_summary = null;
@@ -430,14 +432,37 @@ public function get_public_station_diary_entries($user_id, $limit = 10, $offset
 				$dateStart = !empty($entry->qso_date_start) ? $entry->qso_date_start : $entryDate;
 				$dateEnd = !empty($entry->qso_date_end) ? $entry->qso_date_end : $entryDate;
 				$satOnly = (int)$entry->qso_satellite_only === 1;
+				$memoKey = implode('|', array(
+					(int)$user_id,
+					(string)$dateStart,
+					(string)$dateEnd,
+					(string)($entry->logbook_id ?? ''),
+					$satOnly ? '1' : '0',
+				));
 				
 				// Use date range filtering if dates are set, otherwise fall back to single-day filtering
 				if (!empty($entry->qso_date_start) || !empty($entry->qso_date_end)) {
-					$entry->qso_summary = $this->get_qso_summary_for_date_range($user_id, $dateStart, $dateEnd, $entry->logbook_id, $satOnly);
-					$entry->qso_list = $this->get_qso_list_for_date_range($user_id, $dateStart, $dateEnd, $entry->logbook_id, $satOnly);
+					if (!array_key_exists($memoKey, $qsoSummaryMemo)) {
+						$qsoSummaryMemo[$memoKey] = $this->get_qso_summary_for_date_range($user_id, $dateStart, $dateEnd, $entry->logbook_id, $satOnly);
+					}
+					$entry->qso_summary = $qsoSummaryMemo[$memoKey];
+					if ($include_qso_list) {
+						if (!array_key_exists($memoKey, $qsoListMemo)) {
+							$qsoListMemo[$memoKey] = $this->get_qso_list_for_date_range($user_id, $dateStart, $dateEnd, $entry->logbook_id, $satOnly);
+						}
+						$entry->qso_list = $qsoListMemo[$memoKey];
+					}
 				} else {
-					$entry->qso_summary = $this->get_qso_summary_for_date($user_id, $entryDate, $entry->logbook_id);
-					$entry->qso_list = $this->get_qso_list_for_date($user_id, $entryDate, $entry->logbook_id);
+					if (!array_key_exists($memoKey, $qsoSummaryMemo)) {
+						$qsoSummaryMemo[$memoKey] = $this->get_qso_summary_for_date($user_id, $entryDate, $entry->logbook_id);
+					}
+					$entry->qso_summary = $qsoSummaryMemo[$memoKey];
+					if ($include_qso_list) {
+						if (!array_key_exists($memoKey, $qsoListMemo)) {
+							$qsoListMemo[$memoKey] = $this->get_qso_list_for_date($user_id, $entryDate, $entry->logbook_id);
+						}
+						$entry->qso_list = $qsoListMemo[$memoKey];
+					}
 				}
 			}
 		}
@@ -577,9 +602,16 @@ private function get_user_station_ids($user_id) {
 	}
 
 	private function get_station_ids_for_summary($user_id, $logbook_id = NULL) {
+		static $memoized_station_ids = array();
+		$cacheKey = (int)$user_id . '|' . (string)($logbook_id === NULL ? 'null' : $logbook_id);
+		if (array_key_exists($cacheKey, $memoized_station_ids)) {
+			return $memoized_station_ids[$cacheKey];
+		}
+
 		if ($logbook_id === NULL || $logbook_id === '' || $logbook_id === 0 || $logbook_id === '0') {
 			// No logbook specified, use all user stations
-			return $this->get_user_station_ids($user_id);
+			$memoized_station_ids[$cacheKey] = $this->get_user_station_ids($user_id);
+			return $memoized_station_ids[$cacheKey];
 		}
 
 		// Get stations associated with the specified logbook
@@ -605,10 +637,121 @@ private function get_station_ids_for_summary($user_id, $logbook_id = NULL) {
 			foreach ($verify_query->result() as $row) {
 				$verified_ids[] = (int)$row->station_id;
 			}
-			return $verified_ids;
+			$memoized_station_ids[$cacheKey] = $verified_ids;
+			return $memoized_station_ids[$cacheKey];
 		}
 
-		return $station_ids;
+		$memoized_station_ids[$cacheKey] = $station_ids;
+		return $memoized_station_ids[$cacheKey];
+	}
+
+	private function get_day_bounds($date) {
+		$start = date('Y-m-d 00:00:00', strtotime($date));
+		$end = date('Y-m-d 00:00:00', strtotime($date . ' +1 day'));
+		return array($start, $end);
+	}
+
+	private function get_date_range_bounds($start_date, $end_date) {
+		$start = date('Y-m-d 00:00:00', strtotime($start_date));
+		$end = date('Y-m-d 00:00:00', strtotime($end_date . ' +1 day'));
+		return array($start, $end);
+	}
+
+	private function get_primary_qso_grid($candidate) {
+		$grid = strtoupper(trim((string)($candidate->COL_GRIDSQUARE ?? '')));
+		if ($grid !== '') {
+			return $grid;
+		}
+
+		$vuccGrids = strtoupper(trim((string)($candidate->COL_VUCC_GRIDS ?? '')));
+		if ($vuccGrids === '') {
+			return '';
+		}
+
+		$parts = explode(',', $vuccGrids);
+		foreach ($parts as $part) {
+			$part = trim($part);
+			if ($part !== '') {
+				return $part;
+			}
+		}
+
+		return '';
+	}
+
+	private function get_dxcc_coordinates_for_candidate($candidate, &$dxccLookupCache) {
+		$dxccLat = $candidate->dxcc_lat ?? null;
+		$dxccLong = $candidate->dxcc_long ?? null;
+
+		if (is_numeric($dxccLat) && is_numeric($dxccLong)) {
+			return array((float)$dxccLat, (float)$dxccLong);
+		}
+
+		$call = strtoupper(trim((string)($candidate->COL_CALL ?? '')));
+		if ($call === '') {
+			return array(null, null);
+		}
+
+		$date = date('Ymd');
+		if (!empty($candidate->COL_TIME_ON)) {
+			$timestamp = strtotime($candidate->COL_TIME_ON);
+			if ($timestamp !== FALSE) {
+				$date = date('Ymd', $timestamp);
+			}
+		}
+
+		$cacheKey = $call . '|' . $date;
+		if (!array_key_exists($cacheKey, $dxccLookupCache)) {
+			$this->load->model('logbook_model');
+			$lookup = $this->logbook_model->dxcc_lookup($call, $date);
+			if (is_array($lookup) && isset($lookup['lat'], $lookup['long']) && is_numeric($lookup['lat']) && is_numeric($lookup['long'])) {
+				$dxccLookupCache[$cacheKey] = array((float)$lookup['lat'], (float)$lookup['long']);
+			} else {
+				$dxccLookupCache[$cacheKey] = array(null, null);
+			}
+		}
+
+		return $dxccLookupCache[$cacheKey];
+	}
+
+	private function resolve_highlight_candidate_distance_km($candidate, &$dxccLookupCache) {
+		$stationGrid = trim((string)($candidate->station_gridsquare ?? ''));
+
+		if ($stationGrid !== '') {
+			$workedGrid = $this->get_primary_qso_grid($candidate);
+			if ($workedGrid !== '') {
+				return (float)$this->qra->distance($stationGrid, $workedGrid, 'K');
+			}
+
+			list($dxccLat, $dxccLong) = $this->get_dxcc_coordinates_for_candidate($candidate, $dxccLookupCache);
+			if ($dxccLat !== null && $dxccLong !== null) {
+				$stationCoords = $this->qra->qra2latlong($stationGrid);
+				if (is_array($stationCoords) && isset($stationCoords[0], $stationCoords[1]) && is_numeric($stationCoords[0]) && is_numeric($stationCoords[1])) {
+					return (float)distance((float)$stationCoords[0], (float)$stationCoords[1], $dxccLat, $dxccLong, 'K');
+				}
+			}
+		}
+
+		return (float)($candidate->COL_DISTANCE ?? 0);
+	}
+
+	private function build_highlight_dx_from_candidates($highlight_candidates) {
+		$highlight = null;
+		if (!empty($highlight_candidates)) {
+			$this->load->library('Qra');
+			$best_distance = 0;
+			$dxccLookupCache = array();
+			foreach ($highlight_candidates as $candidate) {
+				$dist = $this->resolve_highlight_candidate_distance_km($candidate, $dxccLookupCache);
+				if ($dist > $best_distance) {
+					$best_distance = $dist;
+					$highlight = $candidate;
+					$highlight->COL_DISTANCE = (int)round($dist);
+				}
+			}
+		}
+
+		return $highlight;
 	}
 
 	public function get_qso_list_for_date($user_id, $date, $logbook_id = NULL) {
@@ -618,11 +761,13 @@ public function get_qso_list_for_date($user_id, $date, $logbook_id = NULL) {
 		}
 
 		$table = $this->config->item('table_name');
+		list($dayStart, $dayEnd) = $this->get_day_bounds($date);
 
 		$this->db->select('COL_CALL, COL_TIME_ON, COL_BAND, COL_MODE, COL_SUBMODE, COL_COUNTRY, COL_GRIDSQUARE, COL_VUCC_GRIDS, COL_RST_SENT, COL_RST_RCVD, COL_FREQ, COL_DXCC, COL_DISTANCE, COL_PROP_MODE, COL_SAT_NAME, COL_SAT_MODE');
 		$this->db->from($table);
 		$this->db->where_in('station_id', $station_ids);
-		$this->db->where('DATE(COL_TIME_ON)', $date);
+		$this->db->where('COL_TIME_ON >=', $dayStart);
+		$this->db->where('COL_TIME_ON <', $dayEnd);
 		$this->db->order_by('COL_TIME_ON', 'ASC');
 		$this->db->limit(100); // Reasonable limit for public display
 
@@ -637,18 +782,21 @@ public function get_qso_summary_for_date($user_id, $date, $logbook_id = NULL) {
 		}
 
 		$table = $this->config->item('table_name');
+		list($dayStart, $dayEnd) = $this->get_day_bounds($date);
 
 		$this->db->select('COUNT(*) AS total_qsos, COUNT(DISTINCT COL_DXCC) AS dxcc_worked');
 		$this->db->from($table);
 		$this->db->where_in('station_id', $station_ids);
-		$this->db->where('DATE(COL_TIME_ON)', $date);
+		$this->db->where('COL_TIME_ON >=', $dayStart);
+		$this->db->where('COL_TIME_ON <', $dayEnd);
 		$overview = $this->db->get()->row();
 
 		$this->db->distinct();
 	$this->db->select('LOWER(COL_BAND) AS band, COL_BAND+0 AS band_num', FALSE);
 	$this->db->from($table);
 	$this->db->where_in('station_id', $station_ids);
-	$this->db->where('DATE(COL_TIME_ON)', $date);
+	$this->db->where('COL_TIME_ON >=', $dayStart);
+	$this->db->where('COL_TIME_ON <', $dayEnd);
 	$this->db->where('COL_BAND IS NOT NULL', null, FALSE);
 	$this->db->where('COL_BAND !=', '');
 	$this->db->order_by('band_num', 'ASC');
@@ -658,19 +806,22 @@ public function get_qso_summary_for_date($user_id, $date, $logbook_id = NULL) {
 		$this->db->select('(CASE WHEN COL_SUBMODE IS NOT NULL AND COL_SUBMODE != "" THEN UPPER(COL_SUBMODE) ELSE UPPER(COL_MODE) END) AS mode_label', FALSE);
 		$this->db->from($table);
 		$this->db->where_in('station_id', $station_ids);
-		$this->db->where('DATE(COL_TIME_ON)', $date);
+		$this->db->where('COL_TIME_ON >=', $dayStart);
+		$this->db->where('COL_TIME_ON <', $dayEnd);
 		$this->db->where('COL_MODE IS NOT NULL', null, FALSE);
 		$this->db->where('COL_MODE !=', '');
 		$this->db->order_by('mode_label', 'ASC');
 		$modesResult = $this->db->get()->result();
 
-		// Get highlight DX - prefer stored distance, but also consider QSOs with a
-		// gridsquare (or VUCC grids) that have no stored distance so they are not excluded.
-		$this->db->select('t.COL_CALL, t.COL_COUNTRY, t.COL_DISTANCE, t.COL_GRIDSQUARE, t.COL_VUCC_GRIDS, sp.station_gridsquare', FALSE);
+		// Get highlight DX candidates. Distance is re-calculated in PHP using grid first,
+		// and a DXCC location fallback when worked grid is missing.
+		$this->db->select('t.COL_CALL, t.COL_COUNTRY, t.COL_TIME_ON, t.COL_DXCC, t.COL_DISTANCE, t.COL_GRIDSQUARE, t.COL_VUCC_GRIDS, sp.station_gridsquare, de.lat AS dxcc_lat, de.`long` AS dxcc_long', FALSE);
 		$this->db->from($table . ' t');
 		$this->db->join('station_profile sp', 'sp.station_id = t.station_id', 'left');
+		$this->db->join('dxcc_entities de', 'de.adif = t.COL_DXCC', 'left');
 		$this->db->where_in('t.station_id', $station_ids);
-		$this->db->where('DATE(t.COL_TIME_ON)', $date);
+		$this->db->where('t.COL_TIME_ON >=', $dayStart);
+		$this->db->where('t.COL_TIME_ON <', $dayEnd);
 		$this->db->group_start();
 			$this->db->where('t.COL_DISTANCE >', 0);
 			$this->db->or_group_start();
@@ -690,25 +841,7 @@ public function get_qso_summary_for_date($user_id, $date, $logbook_id = NULL) {
 		$this->db->limit(50);
 		$highlight_candidates = $this->db->get()->result();
 
-		$highlight = null;
-		if (!empty($highlight_candidates)) {
-			$this->load->library('Qra');
-			$best_distance = 0;
-			foreach ($highlight_candidates as $candidate) {
-				$dist = (float)($candidate->COL_DISTANCE ?? 0);
-				if ($dist <= 0 && !empty($candidate->station_gridsquare)) {
-					$grid = !empty($candidate->COL_GRIDSQUARE) ? $candidate->COL_GRIDSQUARE : ($candidate->COL_VUCC_GRIDS ?? '');
-					if (!empty($grid)) {
-						$dist = (float)$this->qra->distance($candidate->station_gridsquare, $grid, 'K');
-					}
-				}
-				if ($dist > $best_distance) {
-					$best_distance = $dist;
-					$highlight = $candidate;
-					$highlight->COL_DISTANCE = (int)round($dist);
-				}
-			}
-		}
+		$highlight = $this->build_highlight_dx_from_candidates($highlight_candidates);
 
 		$bands = array();
 		foreach ($bandsResult as $band) {
@@ -798,12 +931,13 @@ public function get_qso_list_for_date_range($user_id, $start_date, $end_date, $l
 		}
 
 		$table = $this->config->item('table_name');
+		list($rangeStart, $rangeEnd) = $this->get_date_range_bounds($start_date, $end_date);
 
 		$this->db->select('COL_CALL, COL_TIME_ON, COL_BAND, COL_MODE, COL_SUBMODE, COL_COUNTRY, COL_GRIDSQUARE, COL_VUCC_GRIDS, COL_RST_SENT, COL_RST_RCVD, COL_FREQ, COL_DXCC, COL_DISTANCE, COL_PROP_MODE, COL_SAT_NAME, COL_SAT_MODE');
 		$this->db->from($table);
 		$this->db->where_in('station_id', $station_ids);
-		$this->db->where('DATE(COL_TIME_ON) >=', $start_date);
-		$this->db->where('DATE(COL_TIME_ON) <=', $end_date);
+		$this->db->where('COL_TIME_ON >=', $rangeStart);
+		$this->db->where('COL_TIME_ON <', $rangeEnd);
 		
 		if ($sat_only) {
 			$this->db->where('COL_PROP_MODE', 'SAT');
@@ -823,12 +957,13 @@ public function get_qso_summary_for_date_range($user_id, $start_date, $end_date,
 		}
 
 		$table = $this->config->item('table_name');
+		list($rangeStart, $rangeEnd) = $this->get_date_range_bounds($start_date, $end_date);
 
 		$this->db->select('COUNT(*) AS total_qsos, COUNT(DISTINCT COL_DXCC) AS dxcc_worked');
 		$this->db->from($table);
 		$this->db->where_in('station_id', $station_ids);
-		$this->db->where('DATE(COL_TIME_ON) >=', $start_date);
-		$this->db->where('DATE(COL_TIME_ON) <=', $end_date);
+		$this->db->where('COL_TIME_ON >=', $rangeStart);
+		$this->db->where('COL_TIME_ON <', $rangeEnd);
 		
 		if ($sat_only) {
 			$this->db->where('COL_PROP_MODE', 'SAT');
@@ -841,8 +976,8 @@ public function get_qso_summary_for_date_range($user_id, $start_date, $end_date,
 		$this->db->select('LOWER(COL_BAND) AS band, COL_BAND+0 AS band_num', FALSE);
 		$this->db->from($table);
 		$this->db->where_in('station_id', $station_ids);
-		$this->db->where('DATE(COL_TIME_ON) >=', $start_date);
-		$this->db->where('DATE(COL_TIME_ON) <=', $end_date);
+		$this->db->where('COL_TIME_ON >=', $rangeStart);
+		$this->db->where('COL_TIME_ON <', $rangeEnd);
 		$this->db->where('COL_BAND IS NOT NULL', null, FALSE);
 		$this->db->where('COL_BAND !=', '');
 		
@@ -858,8 +993,8 @@ public function get_qso_summary_for_date_range($user_id, $start_date, $end_date,
 		$this->db->select('(CASE WHEN COL_SUBMODE IS NOT NULL AND COL_SUBMODE != "" THEN UPPER(COL_SUBMODE) ELSE UPPER(COL_MODE) END) AS mode_label', FALSE);
 		$this->db->from($table);
 		$this->db->where_in('station_id', $station_ids);
-		$this->db->where('DATE(COL_TIME_ON) >=', $start_date);
-		$this->db->where('DATE(COL_TIME_ON) <=', $end_date);
+		$this->db->where('COL_TIME_ON >=', $rangeStart);
+		$this->db->where('COL_TIME_ON <', $rangeEnd);
 		$this->db->where('COL_MODE IS NOT NULL', null, FALSE);
 		$this->db->where('COL_MODE !=', '');
 		
@@ -870,14 +1005,15 @@ public function get_qso_summary_for_date_range($user_id, $start_date, $end_date,
 		$this->db->order_by('mode_label', 'ASC');
 		$modesResult = $this->db->get()->result();
 
-		// Get highlight DX - prefer stored distance, but also consider QSOs with a
-		// gridsquare (or VUCC grids) that have no stored distance so they are not excluded.
-		$this->db->select('t.COL_CALL, t.COL_COUNTRY, t.COL_DISTANCE, t.COL_GRIDSQUARE, t.COL_VUCC_GRIDS, sp.station_gridsquare', FALSE);
+		// Get highlight DX candidates. Distance is re-calculated in PHP using grid first,
+		// and a DXCC location fallback when worked grid is missing.
+		$this->db->select('t.COL_CALL, t.COL_COUNTRY, t.COL_TIME_ON, t.COL_DXCC, t.COL_DISTANCE, t.COL_GRIDSQUARE, t.COL_VUCC_GRIDS, sp.station_gridsquare, de.lat AS dxcc_lat, de.`long` AS dxcc_long', FALSE);
 		$this->db->from($table . ' t');
 		$this->db->join('station_profile sp', 'sp.station_id = t.station_id', 'left');
+		$this->db->join('dxcc_entities de', 'de.adif = t.COL_DXCC', 'left');
 		$this->db->where_in('t.station_id', $station_ids);
-		$this->db->where('DATE(t.COL_TIME_ON) >=', $start_date);
-		$this->db->where('DATE(t.COL_TIME_ON) <=', $end_date);
+		$this->db->where('t.COL_TIME_ON >=', $rangeStart);
+		$this->db->where('t.COL_TIME_ON <', $rangeEnd);
 
 		if ($sat_only) {
 			$this->db->where('t.COL_PROP_MODE', 'SAT');
@@ -902,25 +1038,7 @@ public function get_qso_summary_for_date_range($user_id, $start_date, $end_date,
 		$this->db->limit(50);
 		$highlight_candidates = $this->db->get()->result();
 
-		$highlight = null;
-		if (!empty($highlight_candidates)) {
-			$this->load->library('Qra');
-			$best_distance = 0;
-			foreach ($highlight_candidates as $candidate) {
-				$dist = (float)($candidate->COL_DISTANCE ?? 0);
-				if ($dist <= 0 && !empty($candidate->station_gridsquare)) {
-					$grid = !empty($candidate->COL_GRIDSQUARE) ? $candidate->COL_GRIDSQUARE : ($candidate->COL_VUCC_GRIDS ?? '');
-					if (!empty($grid)) {
-						$dist = (float)$this->qra->distance($candidate->station_gridsquare, $grid, 'K');
-					}
-				}
-				if ($dist > $best_distance) {
-					$best_distance = $dist;
-					$highlight = $candidate;
-					$highlight->COL_DISTANCE = (int)round($dist);
-				}
-			}
-		}
+		$highlight = $this->build_highlight_dx_from_candidates($highlight_candidates);
 
 		$bands = array();
 		foreach ($bandsResult as $band) {
diff --git a/application/models/User_model.php b/application/models/User_model.php
index 7b79b877e..731cc3a4e 100644
--- a/application/models/User_model.php
+++ b/application/models/User_model.php
@@ -430,6 +430,16 @@ function update_session($id) {
 		$CI =& get_instance();
         $CI->load->model('user_options_model');
         $callbook_type_object = $CI->user_options_model->get_options('callbook')->result();
+		$show_qsl_cards_option = $CI->user_options_model->get_options(
+			'menu',
+			array('option_name' => 'show_qsl_cards', 'option_key' => 'enabled'),
+			$id
+		)->row();
+		$show_sstv_images_option = $CI->user_options_model->get_options(
+			'menu',
+			array('option_name' => 'show_sstv_images', 'option_key' => 'enabled'),
+			$id
+		)->row();
 
         // Get the callbook type
         if (isset($callbook_type_object[1]->option_value)) {
@@ -453,6 +463,15 @@ function update_session($id) {
         }
 
 		$u = $this->get_by_id($id);
+		$has_eqsl_credentials = ($u->row()->user_eqsl_name != '' && $u->row()->user_eqsl_password != '');
+		$show_qsl_cards = true;
+		if (isset($show_qsl_cards_option->option_value)) {
+			$show_qsl_cards = ($show_qsl_cards_option->option_value == 'true');
+		}
+		$show_sstv_images = false;
+		if (isset($show_sstv_images_option->option_value)) {
+			$show_sstv_images = ($show_sstv_images_option->option_value == 'true');
+		}
 
 		$userdata = array(
 			'user_id'		 => $u->row()->user_id,
@@ -464,6 +483,9 @@ function update_session($id) {
 			'user_lotw_name'	 => $u->row()->user_lotw_name,
 			'user_eqsl_name'	 => $u->row()->user_eqsl_name,
 			'user_eqsl_qth_nickname' => $u->row()->user_eqsl_qth_nickname,
+			'has_eqsl_credentials' => $has_eqsl_credentials,
+			'user_show_qsl_cards' => $show_qsl_cards,
+			'user_show_sstv_images' => $show_sstv_images,
 			'user_hash'		 => $this->_hash($u->row()->user_id."-".$u->row()->user_type),
 			'radio' => isset($_COOKIE["radio"])?$_COOKIE["radio"]:"",
 			'station_profile_id' => isset($_COOKIE["station_profile_id"])?$_COOKIE["station_profile_id"]:"",
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index ff16237eb..9a88042ca 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -2093,6 +2093,10 @@ function getUTCDateStamp(el) {
     </script>
 
     <script>
+        let catRequestCounter = 0;
+        let lastProcessedCatRequest = 0;
+        let catSelectionContextVersion = 0;
+
         // Helper function to update a UI element with CAT data
         const cat2UI = (ui, cat, allowEmpty = true, allowZero = true, callbackOnUpdate) => {
             if (
@@ -2109,9 +2113,26 @@ function getUTCDateStamp(el) {
 
         // Update UI from CAT data
         const updateFromCAT = (radioID) => {
-            if (radioID === '0') return;
+            if (!radioID || radioID === '0' || radioID === 'undefined') return;
+
+            const requestedRadioID = String(radioID);
+            const requestId = ++catRequestCounter;
+            const requestContextVersion = catSelectionContextVersion;
+
+            $.getJSON(`radio/json/${requestedRadioID}`, (data) => {
+                const currentSelectedRadioID = String($('select.radios option:selected').val() || '0');
+
+                // Ignore stale CAT responses when radio selection changed or newer requests have already been applied.
+                if (
+                    requestContextVersion !== catSelectionContextVersion ||
+                    currentSelectedRadioID !== requestedRadioID ||
+                    requestId < lastProcessedCatRequest
+                ) {
+                    return;
+                }
+
+                lastProcessedCatRequest = requestId;
 
-            $.getJSON(`radio/json/${radioID}`, (data) => {
                 if (data.error) {
                     if (data.error === 'not_logged_in') {
                         handleLoginError();
@@ -2215,6 +2236,8 @@ function getUTCDateStamp(el) {
         const resetUI = () => {
             $("#sat_name, #sat_mode, #frequency, #frequency_rx, #band_rx").val("");
             $("#selectPropagation").val($("#selectPropagation option:first").val());
+            // Clear CAT value cache so re-selecting a radio with identical values still repopulates fields.
+            $('#frequency, #frequency_rx, #sat_name, #sat_mode, #transmit_power, #selectPropagation, #mode').removeData('catValue');
             $(".radio_timeout_error").remove();
         };
 
@@ -2252,6 +2275,7 @@ function getUTCDateStamp(el) {
 
             // Trigger updateFromCAT when any <select> with class 'radios' changes
             $('.radios').on('change', function() {
+                catSelectionContextVersion++;
                 const selectedRadioID = $(this).val();
                 if (selectedRadioID === '0') {
                     resetUI();
diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php
index 4b117ebe8..ffedfec0f 100644
--- a/application/views/interface_assets/header.php
+++ b/application/views/interface_assets/header.php
@@ -68,6 +68,25 @@
 
 	<nav class="navbar navbar-expand-lg navbar-light bg-light main-nav">
 		<div class="container">
+			<?php
+			$show_eqsl_menu = (bool) $this->session->userdata('has_eqsl_credentials');
+			$show_qsl_cards_setting = $this->session->userdata('user_show_qsl_cards');
+			$show_qsl_cards_menu = true;
+			if ($show_qsl_cards_setting !== NULL && $show_qsl_cards_setting !== '') {
+				$show_qsl_cards_menu = filter_var($show_qsl_cards_setting, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
+				if ($show_qsl_cards_menu === NULL) {
+					$show_qsl_cards_menu = true;
+				}
+			}
+			$show_sstv_images_setting = $this->session->userdata('user_show_sstv_images');
+			$show_sstv_menu = false;
+			if ($show_sstv_images_setting !== NULL && $show_sstv_images_setting !== '') {
+				$show_sstv_menu = filter_var($show_sstv_images_setting, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
+				if ($show_sstv_menu === NULL) {
+					$show_sstv_menu = false;
+				}
+			}
+			?>
 			<a class="navbar-brand" href="<?php echo site_url(); ?>">Cloudlog</a> <?php if (ENVIRONMENT == "development") { ?><span class="badge text-bg-danger"><?php echo lang('menu_badge_developer_mode'); ?></span><?php } ?>
 
 			<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
@@ -82,12 +101,18 @@
 							<a class="dropdown-item" href="<?php echo site_url('logbook'); ?>"><i class="fas fa-atlas"></i> <?php echo lang('menu_overview'); ?></a>
 							<div class="dropdown-divider"></div>
 							<a class="dropdown-item" href="<?php echo site_url('logbookadvanced'); ?>"><i class="fas fa-book-open"></i> <?php echo lang('menu_advanced'); ?></a>
-							<div class="dropdown-divider"></div>
-							<a class="dropdown-item" href="<?php echo site_url('qsl'); ?>" title="QSL"><i class="fas fa-envelope"></i> <?php echo lang('menu_view_qsl'); ?></a>
-							<div class="dropdown-divider"></div>
-							<a class="dropdown-item" href="<?php echo site_url('eqsl'); ?>" title="eQSL"><i class="fas fa-at"></i> <?php echo lang('menu_view_eqsl'); ?></a>
-							<div class="dropdown-divider"></div>
-							<a class="dropdown-item" href="<?php echo site_url('sstv'); ?>" title="SSTV"><i class="fa fa-image"></i> <?php echo lang('menu_view_sstv'); ?></a>
+							<?php if ($show_qsl_cards_menu) { ?>
+								<div class="dropdown-divider"></div>
+								<a class="dropdown-item" href="<?php echo site_url('qsl'); ?>" title="QSL"><i class="fas fa-envelope"></i> <?php echo lang('menu_view_qsl'); ?></a>
+							<?php } ?>
+							<?php if ($show_eqsl_menu) { ?>
+								<div class="dropdown-divider"></div>
+								<a class="dropdown-item" href="<?php echo site_url('eqsl'); ?>" title="eQSL"><i class="fas fa-at"></i> <?php echo lang('menu_view_eqsl'); ?></a>
+							<?php } ?>
+							<?php if ($show_sstv_menu) { ?>
+								<div class="dropdown-divider"></div>
+								<a class="dropdown-item" href="<?php echo site_url('sstv'); ?>" title="SSTV"><i class="fa fa-image"></i> <?php echo lang('menu_view_sstv'); ?></a>
+							<?php } ?>
 						</div>
 					</li>
 
diff --git a/application/views/logbooks/index.php b/application/views/logbooks/index.php
index 82fbffbc3..8609d26ee 100644
--- a/application/views/logbooks/index.php
+++ b/application/views/logbooks/index.php
@@ -117,11 +117,13 @@ class="btn btn-info btn-sm"
                                 </td>
                                 <td class="align-middle text-center">
                                     <div class="d-flex justify-content-center gap-1">
+                                        <!-- Edit: always visible -->
                                         <a href="<?php echo site_url('logbooks/edit')."/".$row->logbook_id; ?>" 
                                            class="btn btn-primary btn-sm"
                                            title="<?php echo lang('station_logbooks_edit_logbook') . ': ' . $row->logbook_name;?>">
                                             <i class="fas fa-edit"></i>
                                         </a>
+                                        <!-- Embed code: only if logbook has a public slug -->
                                         <?php if($row->public_slug != '') { ?>
                                             <button class="btn btn-success btn-sm" 
                                                     title="Get Embed Code"
@@ -130,14 +132,20 @@ class="btn btn-primary btn-sm"
                                                     onclick="setEmbedCode('<?php echo $row->public_slug; ?>', '<?php echo addslashes($row->logbook_name); ?>')">
                                                 <i class="fas fa-code"></i>
                                             </button>
+                                        <?php } else { ?>
+                                            <button class="btn btn-success btn-sm" style="visibility:hidden;" tabindex="-1" aria-hidden="true"><i class="fas fa-code"></i></button>
                                         <?php } ?>
+                                        <!-- Share: only if owner or admin -->
                                         <?php if($row->user_id == $this->session->userdata('user_id') || (isset($row->access_level) && $row->access_level == 'admin')) { ?>
                                             <a href="<?php echo site_url('logbooks/manage_sharing')."/".$row->logbook_id; ?>" 
                                                class="btn btn-info btn-sm" 
                                                title="Manage Sharing">
                                                 <i class="fas fa-users"></i>
                                             </a>
+                                        <?php } else { ?>
+                                            <button class="btn btn-info btn-sm" style="visibility:hidden;" tabindex="-1" aria-hidden="true"><i class="fas fa-users"></i></button>
                                         <?php } ?>
+                                        <!-- Delete: only if not active logbook and owner -->
                                         <?php if($this->session->userdata('active_station_logbook') != $row->logbook_id && $row->user_id == $this->session->userdata('user_id')) { ?>
                                             <a href="<?php echo site_url('Logbooks/delete')."/".$row->logbook_id; ?>" 
                                                class="btn btn-danger btn-sm" 
@@ -145,6 +153,8 @@ class="btn btn-danger btn-sm"
                                                onclick="return confirm('<?php echo lang('station_logbooks_confirm_delete') . $row->logbook_name; ?>');">
                                                 <i class="fas fa-trash"></i>
                                             </a>
+                                        <?php } else { ?>
+                                            <button class="btn btn-danger btn-sm" style="visibility:hidden;" tabindex="-1" aria-hidden="true"><i class="fas fa-trash"></i></button>
                                         <?php } ?>
                                     </div>
                                 </td>
diff --git a/application/views/qso/components/previous_contacts.php b/application/views/qso/components/previous_contacts.php
index f68905acb..22b1d8f6f 100644
--- a/application/views/qso/components/previous_contacts.php
+++ b/application/views/qso/components/previous_contacts.php
@@ -1,4 +1,4 @@
-<div id="qso-last-table">
+<div id="qso-last-table-content" hx-get="<?php echo site_url('/qso/component_past_contacts?page=' . (int)$current_page); ?>" hx-trigger="every 5s" hx-target="this" hx-swap="outerHTML" hx-vals='js:{_t: Date.now()}'>
 
 <div class="table-responsive" style="font-size: 0.95rem;">
   <table class="table">
@@ -55,7 +55,7 @@
     <!-- Previous Button -->
     <li class="page-item <?php echo ($current_page == 0) ? 'disabled' : ''; ?>">
       <?php if ($current_page > 0): ?>
-        <a class="page-link" href="#" hx-get="<?php echo site_url('/qso/component_past_contacts?page=' . ($current_page - 1)); ?>" hx-target="#qso-last-table" hx-swap="outerHTML">
+        <a class="page-link" href="#" hx-get="<?php echo site_url('/qso/component_past_contacts?page=' . ($current_page - 1)); ?>" hx-target="#qso-last-table-content" hx-swap="outerHTML">
           <?php echo lang('prev'); ?>
         </a>
       <?php else: ?>
@@ -65,17 +65,16 @@
 
     <!-- Page Numbers -->
     <?php
-    $start_page = max(0, $current_page - 2);
-    $end_page = min($total_pages - 1, $current_page + 2);
+    // Keep pagination compact: only show a sliding window near the current page.
+    $visible_pages = 7;
+    $half_window = (int) floor($visible_pages / 2);
+    $start_page = max(0, $current_page - $half_window);
+    $end_page = min($total_pages - 1, $start_page + $visible_pages - 1);
+    $start_page = max(0, $end_page - $visible_pages + 1);
 
     if ($start_page > 0): ?>
-      <li class="page-item">
-        <a class="page-link" href="#" hx-get="<?php echo site_url('/qso/component_past_contacts?page=0'); ?>" hx-target="#qso-last-table" hx-swap="outerHTML">1</a>
-      </li>
-      <?php if ($start_page > 1): ?>
-        <li class="page-item disabled"><span class="page-link">...</span></li>
-      <?php endif;
-    endif;
+      <li class="page-item disabled"><span class="page-link">...</span></li>
+    <?php endif;
 
     for ($i = $start_page; $i <= $end_page; $i++):
       $page_num = $i + 1;
@@ -84,7 +83,7 @@
         <?php if ($current_page == $i): ?>
           <span class="page-link"><?php echo $page_num; ?></span>
         <?php else: ?>
-          <a class="page-link" href="#" hx-get="<?php echo site_url('/qso/component_past_contacts?page=' . $i); ?>" hx-target="#qso-last-table" hx-swap="outerHTML">
+          <a class="page-link" href="#" hx-get="<?php echo site_url('/qso/component_past_contacts?page=' . $i); ?>" hx-target="#qso-last-table-content" hx-swap="outerHTML">
             <?php echo $page_num; ?>
           </a>
         <?php endif; ?>
@@ -92,20 +91,13 @@
     <?php endfor;
 
     if ($end_page < $total_pages - 1): ?>
-      <?php if ($end_page < $total_pages - 2): ?>
-        <li class="page-item disabled"><span class="page-link">...</span></li>
-      <?php endif; ?>
-      <li class="page-item">
-        <a class="page-link" href="#" hx-get="<?php echo site_url('/qso/component_past_contacts?page=' . ($total_pages - 1)); ?>" hx-target="#qso-last-table" hx-swap="outerHTML">
-          <?php echo $total_pages; ?>
-        </a>
-      </li>
+      <li class="page-item disabled"><span class="page-link">...</span></li>
     <?php endif; ?>
 
     <!-- Next Button -->
     <li class="page-item <?php echo ($current_page >= $total_pages - 1) ? 'disabled' : ''; ?>">
       <?php if ($current_page < $total_pages - 1): ?>
-        <a class="page-link" href="#" hx-get="<?php echo site_url('/qso/component_past_contacts?page=' . ($current_page + 1)); ?>" hx-target="#qso-last-table" hx-swap="outerHTML">
+        <a class="page-link" href="#" hx-get="<?php echo site_url('/qso/component_past_contacts?page=' . ($current_page + 1)); ?>" hx-target="#qso-last-table-content" hx-swap="outerHTML">
           <?php echo lang('next'); ?>
         </a>
       <?php else: ?>
diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index 4c0680677..88cb2a1a2 100755
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -26,7 +26,7 @@ function switchMode(url) {
     <div class="col-sm-5">
       <div class="card">
 
-        <form id="qso_input" method="post" action="<?php echo site_url('qso') . "?manual=" . $manual; ?>" name="qsos" autocomplete="off" onReset="resetTimers(<?php echo $manual; ?>);">
+        <form id="qso_input" method="post" action="<?php echo site_url('qso') . "?manual=" . $manual; ?>" data-ajax-save-url="<?php echo site_url('qso/ajax_saveqso'); ?>" name="qsos" autocomplete="off" onReset="resetTimers(<?php echo $manual; ?>);">
 
           <div class="card-header">
             <ul style="font-size: 15px;" class="nav nav-tabs card-header-tabs pull-right" id="myTab" role="tablist">
@@ -710,6 +710,8 @@ function switchMode(url) {
 
     <div class="col-sm-7">
 
+      <div id="notice-alerts-container">
+
       <?php if ($notice) { ?>
         <div id="notice-alerts" class="alert alert-info" role="alert">
           <?php echo $notice; ?>
@@ -722,6 +724,8 @@ function switchMode(url) {
         </div>
       <?php } ?>
 
+      </div>
+
       <!-- QSO Map -->
       <div class="card qso-map">
         <div id="qsomap" class="map-leaflet" style="width: 100%; height: 200px;"></div>
@@ -934,12 +938,11 @@ function switchMode(url) {
                 <div id="qso-callhistory-results"></div>
               </div>
 
-              <div id="partial_view" style="font-size: 0.95rem;"></div>
+              <div id="partial_view" style="display: none; font-size: 0.95rem;"></div>
 
-              <div id="qso-last-table" hx-get="<?php echo site_url('/qso/component_past_contacts'); ?>" hx-trigger="load, every 5s">
+              <div id="qso-last-table" hx-get="<?php echo site_url('/qso/component_past_contacts'); ?>" hx-trigger="load">
 
               </div>
-              <small class="mt-0.5 d-block"><?php echo lang('qso_previous_max_shown'); ?></small>
             </div>
 
             <!-- DXCC Summary Tab -->
@@ -1265,15 +1268,15 @@ function openBandmapFullscreen() {
         });
       }
 
-      // Sync cluster band filter to follow the QSO form's band when a radio is selected
+      // Sync cluster band filter to follow the QSO form's band
       this.syncBandFromRadio();
 
-      // Follow band changes on the QSO form (only when a radio is active)
+      // Follow band changes on the QSO form
       $('#band').on('change.qsoCluster', function() {
         self.syncBandFromRadio();
       });
 
-      // When radio selection changes, re-sync (switches to All if set to None)
+      // When radio selection changes, re-sync
       $('#radio').on('change.qsoCluster', function() {
         self.syncBandFromRadio();
       });
@@ -1467,11 +1470,6 @@ function openBandmapFullscreen() {
 
     syncBandFromRadio: function() {
       if (!this.trackBand) return;
-      var radioVal = $('#radio').val();
-      if (!radioVal || radioVal === '0') {
-        this.setBandFilter('all');
-        return;
-      }
       var band = $('#band').val();
       if (band) { this.setBandFilter(band); }
     },
diff --git a/application/views/station_diary/public_index.php b/application/views/station_diary/public_index.php
index cc76ac133..2a9b1d260 100644
--- a/application/views/station_diary/public_index.php
+++ b/application/views/station_diary/public_index.php
@@ -334,7 +334,7 @@
 		</div>
 	</div>
 
-	<div class="qso-summary-container">
+	<div class="qso-summary-container" id="qso-summary-<?php echo (int)$entry->id; ?>">
 										<?php if (!empty($entry->qso_summary['highlight_dx'])) { ?>
 											<div class="alert alert-info mb-3">
 												<div class="small mb-1"><strong>Highlight DX:</strong></div>
@@ -346,38 +346,49 @@
 											</div>
 										<?php } ?>
 										
-									<?php if (!empty($entry->qso_list)) { ?>
-										<?php
-										$entryDate = date('Y-m-d', strtotime($entry->created_at));
-										$mapDateFrom = !empty($entry->qso_date_start) ? $entry->qso_date_start : $entryDate;
-										$mapDateTo = !empty($entry->qso_date_end) ? $entry->qso_date_end : $entryDate;
-										$mapLogbookId = !empty($entry->logbook_id) ? (int)$entry->logbook_id : 0;
-										$mapSatOnly = (int)($entry->qso_satellite_only ?? 0) === 1 ? '1' : '0';
-										?>
-										
-										<div class="mb-2">
-											<button type="button" class="btn btn-sm btn-outline-primary no-print me-2" onclick="toggleQsoMap(<?php echo (int)$entry->id; ?>, '<?php echo htmlspecialchars($mapDateFrom, ENT_QUOTES); ?>', '<?php echo htmlspecialchars($mapDateTo, ENT_QUOTES); ?>', <?php echo $mapLogbookId; ?>, '<?php echo $mapSatOnly; ?>')">
-												<i class="fas fa-map-marked-alt me-1"></i><span id="map-toggle-text-<?php echo (int)$entry->id; ?>">Show QSO Map</span>
-											</button>
-										</div>
-										
-										<div id="qso-map-<?php echo (int)$entry->id; ?>" class="mb-3" style="display: none; width: 100%; height: 450px; border: 1px solid #ddd; border-radius: 4px;"></div>
-										
-										<details class="mt-2">
-											<summary class="fw-bold" style="cursor: pointer; color: #2f4f73;">View QSO List (<span class="qso-count"><?php echo count($entry->qso_list); ?></span> contacts)</summary>
-											<div class="table-responsive mt-2">
-												<table class="table table-sm table-striped">
-													<thead>
-														<tr>
-															<th>Date/Time</th>
-															<th>Call</th>
-															<th>Band</th>
-															<th>Mode</th>
-															<th>Country</th>
-															<th>Grid</th>
-														</tr>
-													</thead>
-													<tbody class="qso-table-body">
+									<?php
+									$entryDate = date('Y-m-d', strtotime($entry->created_at));
+									$mapDateFrom = !empty($entry->qso_date_start) ? $entry->qso_date_start : $entryDate;
+									$mapDateTo = !empty($entry->qso_date_end) ? $entry->qso_date_end : $entryDate;
+									$mapLogbookId = !empty($entry->logbook_id) ? (int)$entry->logbook_id : 0;
+									$mapSatOnly = (int)($entry->qso_satellite_only ?? 0) === 1 ? '1' : '0';
+									?>
+
+									<div class="mb-2">
+										<button type="button" class="btn btn-sm btn-outline-primary no-print me-2" onclick="toggleQsoMap(<?php echo (int)$entry->id; ?>, '<?php echo htmlspecialchars($mapDateFrom, ENT_QUOTES); ?>', '<?php echo htmlspecialchars($mapDateTo, ENT_QUOTES); ?>', <?php echo $mapLogbookId; ?>, '<?php echo $mapSatOnly; ?>')">
+											<i class="fas fa-map-marked-alt me-1"></i><span id="map-toggle-text-<?php echo (int)$entry->id; ?>">Show QSO Map</span>
+										</button>
+									</div>
+
+									<div id="qso-map-<?php echo (int)$entry->id; ?>" class="mb-3" style="display: none; width: 100%; height: 450px; border: 1px solid #ddd; border-radius: 4px;"></div>
+
+									<?php
+									$qsoCount = !empty($entry->qso_list) ? count($entry->qso_list) : 0;
+									$lazyClass = (!empty($defer_qso_list) && empty($is_single_entry) && $qsoCount === 0) ? ' qso-list-lazy' : '';
+									?>
+									<details class="mt-2<?php echo $lazyClass; ?>"
+										data-entry-id="<?php echo (int)$entry->id; ?>"
+										data-callsign="<?php echo htmlspecialchars($callsign, ENT_QUOTES); ?>"
+										data-start-date="<?php echo htmlspecialchars($mapDateFrom, ENT_QUOTES); ?>"
+										data-end-date="<?php echo htmlspecialchars($mapDateTo, ENT_QUOTES); ?>"
+										data-logbook-id="<?php echo (int)$mapLogbookId; ?>"
+										data-sat-only="<?php echo htmlspecialchars($mapSatOnly, ENT_QUOTES); ?>"
+										data-loaded="<?php echo $qsoCount > 0 ? '1' : '0'; ?>">
+										<summary class="fw-bold" style="cursor: pointer; color: #2f4f73;">View QSO List</summary>
+										<div class="table-responsive mt-2">
+											<table class="table table-sm table-striped">
+												<thead>
+													<tr>
+														<th>Date/Time</th>
+														<th>Call</th>
+														<th>Band</th>
+														<th>Mode</th>
+														<th>Country</th>
+														<th>Grid</th>
+													</tr>
+												</thead>
+												<tbody class="qso-table-body">
+													<?php if (!empty($entry->qso_list)) { ?>
 														<?php foreach ($entry->qso_list as $qso) { ?>
 															<tr>
 																<td><?php echo date($publicQsoDateTimeFormat, strtotime($qso->COL_TIME_ON)); ?></td>
@@ -396,11 +407,13 @@
 																<td><?php echo htmlspecialchars($qso->COL_GRIDSQUARE ?? '-', ENT_QUOTES); ?></td>
 															</tr>
 														<?php } ?>
-													</tbody>
-												</table>
-											</div>
-										</details>
-									<?php } ?>
+													<?php } elseif (!empty($defer_qso_list) && empty($is_single_entry)) { ?>
+														<tr><td colspan="6" class="text-center text-muted">Expand to load QSO list...</td></tr>
+													<?php } ?>
+												</tbody>
+											</table>
+										</div>
+									</details>
 								</div>
 								<?php } ?>
 
@@ -469,6 +482,99 @@
 	</div>
 
 	<script>
+		function escapeHtml(text) {
+			return (text || '').toString()
+				.replace(/&/g, '&amp;')
+				.replace(/</g, '&lt;')
+				.replace(/>/g, '&gt;');
+		}
+
+		function formatQsoDateTime(dateValue) {
+			const date = new Date(dateValue);
+			if (isNaN(date.getTime())) {
+				return dateValue || '';
+			}
+			const dateStr = date.toLocaleDateString('en-GB');
+			const timeStr = date.toLocaleTimeString('en-GB', {hour: '2-digit', minute: '2-digit'});
+			return `${dateStr} ${timeStr}`;
+		}
+
+		function renderQsoRows(tbody, qsos) {
+			if (!tbody) {
+				return;
+			}
+
+			if (!qsos || qsos.length === 0) {
+				tbody.innerHTML = '<tr><td colspan="6" class="text-center text-muted">No QSOs match the selected filters</td></tr>';
+				return;
+			}
+
+			tbody.innerHTML = qsos.map(qso => {
+				const isSatelliteQso = ((qso.COL_PROP_MODE || '').toUpperCase() === 'SAT') || !!qso.COL_SAT_NAME;
+				const bandOrSatellite = isSatelliteQso ? (qso.COL_SAT_NAME || 'SAT') : (qso.COL_BAND || '-');
+				return `<tr><td>${escapeHtml(formatQsoDateTime(qso.COL_TIME_ON))}</td><td><strong>${escapeHtml(qso.COL_CALL)}</strong></td><td>${escapeHtml(bandOrSatellite)}</td><td>${escapeHtml((qso.COL_SUBMODE || qso.COL_MODE) || '-')}</td><td>${escapeHtml(qso.COL_COUNTRY || '-')}</td><td>${escapeHtml(qso.COL_GRIDSQUARE || qso.COL_VUCC_GRIDS || '-')}</td></tr>`;
+			}).join('');
+		}
+
+		document.querySelectorAll('details.qso-list-lazy').forEach(detailsEl => {
+			detailsEl.addEventListener('toggle', function() {
+				if (!detailsEl.open) {
+					return;
+				}
+
+				if (detailsEl.dataset.loaded === '1') {
+					return;
+				}
+
+				const tbody = detailsEl.querySelector('.qso-table-body');
+				const countEl = detailsEl.querySelector('.qso-count');
+				if (tbody) {
+					tbody.innerHTML = '<tr><td colspan="6" class="text-center text-muted">Loading QSO list...</td></tr>';
+				}
+
+				const formData = new URLSearchParams();
+				formData.append('callsign', detailsEl.dataset.callsign || '');
+				formData.append('entry_id', detailsEl.dataset.entryId || '0');
+				formData.append('start_date', detailsEl.dataset.startDate || '');
+				formData.append('end_date', detailsEl.dataset.endDate || '');
+				formData.append('logbook_id', detailsEl.dataset.logbookId || '0');
+				formData.append('sat_only', detailsEl.dataset.satOnly || '0');
+				
+				fetch('<?php echo site_url('stationdiary/get_filtered_qsos'); ?>', {
+					method: 'POST',
+					headers: {'Content-Type': 'application/x-www-form-urlencoded'},
+					body: formData.toString()
+				})
+				.then(r => r.json())
+				.then(data => {
+					if (!data || !data.success) {
+						throw new Error((data && data.message) ? data.message : 'Unable to load QSO list');
+					}
+
+					renderQsoRows(tbody, data.qso_list || []);
+					detailsEl.dataset.loaded = '1';
+					if (countEl) {
+						countEl.textContent = (data.qso_list || []).length;
+					}
+
+					const container = document.querySelector(`#qso-summary-${detailsEl.dataset.entryId}`);
+					if (container && data.highlight_dx) {
+						const dxCall = container.querySelector('.highlight-dx-call');
+						const dxCountry = container.querySelector('.highlight-dx-country');
+						const dxDistance = container.querySelector('.highlight-dx-distance');
+						if (dxCall) dxCall.textContent = data.highlight_dx.COL_CALL || '-';
+						if (dxCountry) dxCountry.textContent = data.highlight_dx.COL_COUNTRY || '-';
+						if (dxDistance) dxDistance.textContent = parseInt(data.highlight_dx.COL_DISTANCE || 0, 10);
+					}
+				})
+				.catch(() => {
+					if (tbody) {
+						tbody.innerHTML = '<tr><td colspan="6" class="text-center text-muted">Unable to load QSO list</td></tr>';
+					}
+				});
+			});
+		});
+
 		document.querySelectorAll('.qso-date-filter, .qso-satellite-filter').forEach(el => {
 			el.addEventListener('change', function() {
 				const entryId = this.dataset.entryId;
@@ -508,20 +614,7 @@
 						if (countEl) countEl.textContent = data.qso_list.length;
 						
 						const tbody = container.querySelector('.qso-table-body');
-						if (tbody && data.qso_list.length > 0) {
-							tbody.innerHTML = data.qso_list.map(qso => {
-								const qsoDate = new Date(qso.COL_TIME_ON);
-								const dateStr = qsoDate.toLocaleDateString('en-GB');
-								const timeStr = qsoDate.toLocaleTimeString('en-GB', {hour: '2-digit', minute: '2-digit'});
-								const dateTimeStr = `${dateStr} ${timeStr}`;
-													const isSatelliteQso = ((qso.COL_PROP_MODE || '').toUpperCase() === 'SAT') || !!qso.COL_SAT_NAME;
-													const bandOrSatellite = isSatelliteQso ? (qso.COL_SAT_NAME || 'SAT') : (qso.COL_BAND || '-');
-								const ent = (text) => (text || '').replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
-													return `<tr><td>${dateTimeStr}</td><td><strong>${ent(qso.COL_CALL)}</strong></td><td>${ent(bandOrSatellite)}</td><td>${ent((qso.COL_SUBMODE || qso.COL_MODE) || '-')}</td><td>${ent(qso.COL_COUNTRY || '-')}</td><td>${ent(qso.COL_GRIDSQUARE || qso.COL_VUCC_GRIDS || '-')}</td></tr>`;
-							}).join('');
-						} else if (tbody) {
-							tbody.innerHTML = '<tr><td colspan="6" class="text-center text-muted">No QSOs match the selected filters</td></tr>';
-						}
+						renderQsoRows(tbody, data.qso_list || []);
 					}
 				})
 				.catch(e => console.error('Filter error:', e));
diff --git a/application/views/user/edit.php b/application/views/user/edit.php
index 9c92c4844..02438074d 100644
--- a/application/views/user/edit.php
+++ b/application/views/user/edit.php
@@ -36,9 +36,81 @@
 	<?php } ?>
 
 	<?php $this->load->helper('form'); ?>
+	<style>
+
+
+		@media (min-width: 992px) {
+			.settings-nav {
+				position: sticky;
+				top: 1rem;
+			}
+		}
+
+		.user_edit .accordion-header {
+			display: none;
+		}
+
+		.user_edit .accordion-item {
+			border: 0;
+		}
+
+		.user_edit .accordion-body {
+			padding: 0;
+		}
+
+		.user_edit .accordion-body > .row {
+			margin-bottom: 1rem;
+		}
+
+		/* Present each settings card stack as one column, similar to GitHub settings. */
+		.user_edit .accordion-body > .row > [class*="col-"] {
+			flex: 0 0 100%;
+			max-width: 100%;
+		}
+
+		.user_edit .card {
+			border: 1px solid var(--gh-border);
+			box-shadow: none;
+			margin-bottom: 1rem;
+		}
+
+		.user_edit .card-header {
+			background: var(--gh-bg-subtle);
+			font-weight: 600;
+			font-size: 0.95rem;
+			padding: 0.7rem 1rem;
+		}
+
+		.user_edit .card-body {
+			padding: 1rem;
+		}
+
+		.user_edit label {
+			font-size: 0.88rem;
+			font-weight: 600;
+		}
+
+		.user_edit small,
+		.user_edit .form-text {
+			font-size: 0.8rem;
+			color: var(--gh-muted);
+		}
+	</style>
 
 	<form method="post" action="<?php echo $user_form_action; ?>" name="users" autocomplete="off">
-		<div class="accordion user_edit">
+		<div class="row g-4">
+			<div class="col-lg-3">
+				<div class="list-group settings-nav" id="settings-nav">
+					<button type="button" class="list-group-item list-group-item-action active" data-target="panelsStayOpen-B_user_general"><?php echo lang('account_general_information'); ?></button>
+					<button type="button" class="list-group-item list-group-item-action" data-target="panelsStayOpen-B_cloudlog_general"><?php echo lang('account_cloudlog_preferences'); ?></button>
+					<button type="button" class="list-group-item list-group-item-action" data-target="panelsStayOpen-B_default_value"><?php echo lang('account_default_values'); ?></button>
+					<button type="button" class="list-group-item list-group-item-action" data-target="panelsStayOpen-B_confirmation_account"><?php echo lang('account_third_party_services'); ?></button>
+					<button type="button" class="list-group-item list-group-item-action" data-target="panelsStayOpen-B_miscellaneous">Hardware</button>
+					<button type="button" class="list-group-item list-group-item-action" data-target="panelsStayOpen-B_qso_form">QSO Form</button>
+				</div>
+			</div>
+			<div class="col-lg-9">
+				<div class="accordion user_edit">
 			<!-- ZONE 1 / USER -->
 			<div class="accordion-item">
 				<h2 class="accordion-header" id="panelsStayOpen-H_user_general">
@@ -355,6 +427,233 @@
 								</div>
 							</div>
 
+							<div class="row mb-3">
+								<!-- Menu Options -->
+								<div class="col-md">
+									<div class="card">
+										<div class="card-header"><?php echo lang('account_main_menu'); ?></div>
+										<div class="card-body">
+											<div class="mb-3">
+												<label for="shownotes"><?php echo lang('account_show_notes_in_the_main_menu'); ?></label>
+												<?php if (!isset($user_show_notes)) {
+													$user_show_notes = '0';
+												} ?>
+												<select class="form-select" id="shownotes" name="user_show_notes">
+													<option value="1" <?php if ($user_show_notes == 1) {
+																			echo " selected =\"selected\"";
+																		} ?>><?php echo lang('general_word_yes'); ?></option>
+													<option value="0" <?php if ($user_show_notes == 0) {
+																			echo " selected =\"selected\"";
+																		} ?>><?php echo lang('general_word_no'); ?></option>
+												</select>
+											</div>
+
+											<hr />
+											<div class="mb-3">
+												<label for="quicklog"><?php echo lang('account_quicklog_feature'); ?></label>
+												<?php if (!isset($user_quicklog)) {
+													$user_quicklog = '0';
+												} ?>
+												<select class="form-select" id="quicklog" name="user_quicklog">
+													<option value="1" <?php if ($user_quicklog == 1) {
+																			echo " selected =\"selected\"";
+																		} ?>><?php echo lang('general_word_yes'); ?></option>
+													<option value="0" <?php if ($user_quicklog == 0) {
+																			echo " selected =\"selected\"";
+																		} ?>><?php echo lang('general_word_no'); ?></option>
+												</select>
+												<small id="SelectDateFormatHelp" class="form-text text-muted"><?php echo lang('account_quicklog_feature_hint'); ?></small>
+											</div>
+
+											<div class="mb-3">
+												<label for="quicklog_enter"><?php echo lang('account_quicklog_enter'); ?></label>
+												<?php if (!isset($user_quicklog_enter)) {
+													$user_quicklog_enter = '0';
+												} ?>
+												<select class="form-select" id="quicklog_enter" name="user_quicklog_enter">
+													<option value="0" <?php if ($user_quicklog_enter == 0) {
+																			echo " selected =\"selected\"";
+																		} ?>><?php echo lang('account_quicklog_enter_log'); ?></option>
+													<option value="1" <?php if ($user_quicklog_enter == 1) {
+																			echo " selected =\"selected\"";
+																		} ?>><?php echo lang('account_quicklog_enter_search'); ?></option>
+												</select>
+												<small id="SelectDateFormatHelp" class="form-text text-muted"><?php echo lang('account_quicklog_enter_hint'); ?></small>
+											</div>
+
+											<hr />
+											<p class="text-muted mb-2">Control optional Logbook menu links for QSL Cards and SSTV Images.</p>
+											<div class="form-check form-switch mb-2">
+												<input name="user_menu_show_qsl_cards" class="form-check-input" type="checkbox" role="switch" id="ShowQslCardsInMenuCheck" <?php if (!isset($menu_show_qsl_cards) || $menu_show_qsl_cards) {
+													echo 'checked';
+												} ?>>
+												<label class="form-check-label" for="ShowQslCardsInMenuCheck">Show "View QSL Cards" in Logbook menu</label>
+											</div>
+											<div class="form-check form-switch">
+												<input name="user_menu_show_sstv_images" class="form-check-input" type="checkbox" role="switch" id="ShowSstvImagesInMenuCheck" <?php if (isset($menu_show_sstv_images) && $menu_show_sstv_images) {
+													echo 'checked';
+												} ?>>
+												<label class="form-check-label" for="ShowSstvImagesInMenuCheck">Show "View SSTV Images" in Logbook menu</label>
+											</div>
+										</div>
+									</div>
+								</div>
+
+								<!-- Map Setting -->
+								<?php if ($this->session->userdata('user_id') == $this->uri->segment(3)) { ?>
+									<div class="col-md">
+										<div class="card">
+											<div class="card-header"><?php echo $this->lang->line('account_map_params'); ?></div>
+											<div class="card-body">
+												<div class="row"> <!-- Station -->
+													<div class="mb-3 col-md-4">
+														<label>&nbsp;</label><br /><label><?php echo $this->lang->line('gen_hamradio_station'); ?></label>
+													</div>
+													<div class="mb-3 col-md-3">
+														<label><?php echo $this->lang->line('general_word_icon'); ?></label><br />
+														<div class="icon_selectBox" data-boxcontent="station">
+															<input type="hidden" name="user_map_station_icon" value="<?php echo $user_map_station_icon; ?>">
+															<div class="form-select icon_overSelect"><?php echo (($user_map_station_icon == "0") ? substr($this->lang->line('general_word_not_display'), 0, 10) . '.' : ("<i class='" . $user_map_station_icon . "'></i>")); ?></div>
+														</div>
+														<div class="col-md-3 icon_selectBox_data" data-boxcontent="station">
+															<?php foreach ($map_icon_select['station'] as $val) {
+																echo "<label data-value='" . $val . "'>" . (($val == "0") ? $this->lang->line('general_word_not_display') : ("<i class='" . $val . "'></i>")) . "</label>";
+															} ?>
+														</div>
+													</div>
+													<div class="mb-3 col-md-2">
+														<label><?php echo $this->lang->line('general_word_colors'); ?></label><br /><input type="color" class="form-control user_icon_color" name="user_map_station_color" id="user_map_station_color" value="<?php echo $user_map_station_color; ?>" style="padding:initial;<?php echo ($user_map_station_icon == "0") ? 'display:none;' : ''; ?>" data-icon="station" />
+													</div>
+												</div>
+												<div class="row"> <!-- QSO (default) -->
+													<div class="mb-3 col-md-4">
+														<label><?php echo $this->lang->line('account_map_qso_by_default'); ?></label>
+													</div>
+													<div class="mb-3 col-md-3">
+														<div class="icon_selectBox" data-boxcontent="qso">
+															<input type="hidden" name="user_map_qso_icon" value="<?php echo $user_map_qso_icon; ?>">
+															<div class="form-select icon_overSelect"><?php echo "<i class='" . $user_map_qso_icon . "'></i>"; ?></div>
+														</div>
+														<div class="col-md-3 icon_selectBox_data" data-boxcontent="qso">
+															<?php foreach ($map_icon_select['qso'] as $val) {
+																echo "<label data-value='" . $val . "'><i class='" . $val . "'></i></label>";
+															} ?>
+														</div>
+													</div>
+													<div class="mb-3 col-md-2">
+														<input type="color" class="form-control user_icon_color" name="user_map_qso_color" id="user_map_qso_color" value="<?php echo $user_map_qso_color; ?>" style="padding:initial;" data-icon="qso" />
+													</div>
+												</div>
+												<div class="row"> <!-- QSO (confirmed) -->
+													<div class="mb-3 col-md-4">
+														<label><?php echo $this->lang->line('account_map_qso_confirm'); ?></label>
+														<small class="form-text text-muted"><?php echo lang('account_map_qso_confirm_same_qso'); ?></small>
+													</div>
+													<div class="mb-3 col-md-3">
+														<div class="icon_selectBox" data-boxcontent="qsoconfirm">
+															<input type="hidden" name="user_map_qsoconfirm_icon" value="<?php echo $user_map_qsoconfirm_icon; ?>">
+															<div class="form-select icon_overSelect"><?php echo (($user_map_qsoconfirm_icon == "0") ? $this->lang->line('general_word_no') : ("<i class='" . $user_map_qsoconfirm_icon . "'></i>")); ?></div>
+														</div>
+														<div class="col-md-3 icon_selectBox_data" data-boxcontent="qsoconfirm">
+															<?php foreach ($map_icon_select['qsoconfirm'] as $val) {
+																echo "<label data-value='" . $val . "'>" . (($val == "0") ? $this->lang->line('general_word_no') : ("<i class='" . $val . "'></i>")) . "</label>";
+															} ?>
+														</div>
+													</div>
+													<div class="md-3 col-md-2">
+														<input type="color" class="form-control user_icon_color" name="user_map_qsoconfirm_color" id="user_map_qsoconfirm_color" value="<?php echo $user_map_qsoconfirm_color; ?>" style="padding:initial;<?php echo ($user_map_qsoconfirm_icon == "0") ? 'display:none;' : ''; ?>" data-icon="qsoconfirm" />
+													</div>
+												</div>
+												<div class="row">
+													<div class="md-3 col-md-4">
+														<label><?php echo $this->lang->line('gen_hamradio_gridsquare_show'); ?></label>
+													</div>
+													<div class="md-3 col-md-3">
+														<select class="form-select" id="user_map_gridsquare_show" name="user_map_gridsquare_show">
+															<option value="1" <?php if ($user_map_gridsquare_show == 1) {
+																					echo " selected =\"selected\"";
+																				} ?>><?php echo lang('general_word_yes'); ?></option>
+															<option value="0" <?php if ($user_map_gridsquare_show == 0) {
+																					echo " selected =\"selected\"";
+																				} ?>><?php echo lang('general_word_no'); ?></option>
+														</select>
+													</div>
+												</div>
+											</div>
+										</div>
+									</div>
+								<?php } ?>
+							</div>
+
+						</div>
+					</div>
+				</div>
+				<!-- ZONE 3 / Default Value -->
+				<div class="accordion-item">
+					<h2 class="accordion-header" id="panelsStayOpen-H_default_value">
+						<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-B_default_value" aria-expanded="false" aria-controls="panelsStayOpen-B_default_value">
+							<?php echo lang('account_default_values'); ?></button>
+					</h2>
+					<div id="panelsStayOpen-B_default_value" class="accordion-collapse collapse" aria-labelledby="panelsStayOpen-H_default_value">
+						<div class="accordion-body">
+							<div class="row">
+								<!-- Default -->
+								<div class="col-md">
+									<div class="card">
+										<!--<div class="card-header"><?php echo lang('account_default_band_settings'); ?></div>-->
+										<div class="card-body">
+											<div class="mb-3">
+												<label for="user_default_band"><?php echo lang('account_gridmap_default_band'); ?></label>
+												<?php if (!isset($user_default_band)) {
+													$user_default_band = 'All';
+												} ?>
+												<select id="user_default_band" class="form-select" name="user_default_band">
+													<option value="All">All</option>;
+													<?php foreach ($bands as $band) {
+														echo '<option value="' . $band . '" ' . (($user_default_band == $band) ? ' selected="selected"' : '') . '>' . $band . '</option>' . "\n";
+													} ?>
+												</select>
+											</div>
+											<div class="mb-3">
+												<label class="my-1 me-2"><?php echo lang('account_qsl_settings'); ?></label>
+												<div class="form-check-inline">
+													<?php echo '<input class="form-check-input" type="checkbox" name="user_default_confirmation_qsl" id="user_default_confirmation_qsl"';
+													if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) {
+														echo ' checked';
+													}
+													echo '>'; ?>
+													<label class="form-check-label" for="user_default_confirmation_qsl"><?php echo lang('gen_hamradio_qsl'); ?></label>
+												</div>
+												<div class="form-check-inline">
+													<?php echo '<input class="form-check-input" type="checkbox" name="user_default_confirmation_lotw" id="user_default_confirmation_lotw"';
+													if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) {
+														echo ' checked';
+													}
+													echo '>'; ?>
+													<label class="form-check-label" for="user_default_confirmation_lotw"><?php echo lang('lotw_short'); ?></label>
+												</div>
+												<div class="form-check-inline">
+													<?php echo '<input class="form-check-input" type="checkbox" name="user_default_confirmation_eqsl" id="user_default_confirmation_eqsl"';
+													if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'E') !== false) {
+														echo ' checked';
+													}
+													echo '>'; ?>
+													<label class="form-check-label" for="user_default_confirmation_eqsl"><?php echo lang('account_eqsl'); ?></label>
+												</div>
+												<div class="form-check-inline">
+													<?php echo '<input class="form-check-input" type="checkbox" name="user_default_confirmation_qrz" id="user_default_confirmation_qrz"';
+													if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Z') !== false) {
+														echo ' checked';
+													}
+													echo '>'; ?>
+													<label class="form-check-label" for="user_default_confirmation_qrz">QRZ.com</label>
+												</div>
+											</div>
+										</div>
+									</div>
+								</div>
+							</div>
+
 							<div class="row mb-3">
 								<!-- Logbook fields Setting -->
 								<div class="col-md">
@@ -762,159 +1061,16 @@
 								</div>
 							</div>
 
-							<div class="row mb-3">
-								<!-- Menu Options -->
+							<div class="row">
+								<!-- Previous QSL -->
 								<div class="col-md">
 									<div class="card">
-										<div class="card-header"><?php echo lang('account_main_menu'); ?></div>
+										<div class="card-header"><?php echo lang('account_previous_qsl_type'); ?></div>
 										<div class="card-body">
 											<div class="mb-3">
-												<label for="shownotes"><?php echo lang('account_show_notes_in_the_main_menu'); ?></label>
-												<?php if (!isset($user_show_notes)) {
-													$user_show_notes = '0';
-												} ?>
-												<select class="form-select" id="shownotes" name="user_show_notes">
-													<option value="1" <?php if ($user_show_notes == 1) {
-																			echo " selected =\"selected\"";
-																		} ?>><?php echo lang('general_word_yes'); ?></option>
-													<option value="0" <?php if ($user_show_notes == 0) {
-																			echo " selected =\"selected\"";
-																		} ?>><?php echo lang('general_word_no'); ?></option>
-												</select>
-											</div>
-
-											<hr />
-											<div class="mb-3">
-												<label for="quicklog"><?php echo lang('account_quicklog_feature'); ?></label>
-												<?php if (!isset($user_quicklog)) {
-													$user_quicklog = '0';
-												} ?>
-												<select class="form-select" id="quicklog" name="user_quicklog">
-													<option value="1" <?php if ($user_quicklog == 1) {
-																			echo " selected =\"selected\"";
-																		} ?>><?php echo lang('general_word_yes'); ?></option>
-													<option value="0" <?php if ($user_quicklog == 0) {
-																			echo " selected =\"selected\"";
-																		} ?>><?php echo lang('general_word_no'); ?></option>
-												</select>
-												<small id="SelectDateFormatHelp" class="form-text text-muted"><?php echo lang('account_quicklog_feature_hint'); ?></small>
-											</div>
-
-											<div class="mb-3">
-												<label for="quicklog_enter"><?php echo lang('account_quicklog_enter'); ?></label>
-												<?php if (!isset($user_quicklog_enter)) {
-													$user_quicklog_enter = '0';
-												} ?>
-												<select class="form-select" id="quicklog_enter" name="user_quicklog_enter">
-													<option value="0" <?php if ($user_quicklog_enter == 0) {
-																			echo " selected =\"selected\"";
-																		} ?>><?php echo lang('account_quicklog_enter_log'); ?></option>
-													<option value="1" <?php if ($user_quicklog_enter == 1) {
-																			echo " selected =\"selected\"";
-																		} ?>><?php echo lang('account_quicklog_enter_search'); ?></option>
-												</select>
-												<small id="SelectDateFormatHelp" class="form-text text-muted"><?php echo lang('account_quicklog_enter_hint'); ?></small>
-											</div>
-										</div>
-									</div>
-								</div>
-
-								<!-- Map Setting -->
-								<?php if ($this->session->userdata('user_id') == $this->uri->segment(3)) { ?>
-									<div class="col-md">
-										<div class="card">
-											<div class="card-header"><?php echo $this->lang->line('account_map_params'); ?></div>
-											<div class="card-body">
-												<div class="row"> <!-- Station -->
-													<div class="mb-3 col-md-4">
-														<label>&nbsp;</label><br /><label><?php echo $this->lang->line('gen_hamradio_station'); ?></label>
-													</div>
-													<div class="mb-3 col-md-3">
-														<label><?php echo $this->lang->line('general_word_icon'); ?></label><br />
-														<div class="icon_selectBox" data-boxcontent="station">
-															<input type="hidden" name="user_map_station_icon" value="<?php echo $user_map_station_icon; ?>">
-															<div class="form-select icon_overSelect"><?php echo (($user_map_station_icon == "0") ? substr($this->lang->line('general_word_not_display'), 0, 10) . '.' : ("<i class='" . $user_map_station_icon . "'></i>")); ?></div>
-														</div>
-														<div class="col-md-3 icon_selectBox_data" data-boxcontent="station">
-															<?php foreach ($map_icon_select['station'] as $val) {
-																echo "<label data-value='" . $val . "'>" . (($val == "0") ? $this->lang->line('general_word_not_display') : ("<i class='" . $val . "'></i>")) . "</label>";
-															} ?>
-														</div>
-													</div>
-													<div class="mb-3 col-md-2">
-														<label><?php echo $this->lang->line('general_word_colors'); ?></label><br /><input type="color" class="form-control user_icon_color" name="user_map_station_color" id="user_map_station_color" value="<?php echo $user_map_station_color; ?>" style="padding:initial;<?php echo ($user_map_station_icon == "0") ? 'display:none;' : ''; ?>" data-icon="station" />
-													</div>
-												</div>
-												<div class="row"> <!-- QSO (default) -->
-													<div class="mb-3 col-md-4">
-														<label><?php echo $this->lang->line('account_map_qso_by_default'); ?></label>
-													</div>
-													<div class="mb-3 col-md-3">
-														<div class="icon_selectBox" data-boxcontent="qso">
-															<input type="hidden" name="user_map_qso_icon" value="<?php echo $user_map_qso_icon; ?>">
-															<div class="form-select icon_overSelect"><?php echo "<i class='" . $user_map_qso_icon . "'></i>"; ?></div>
-														</div>
-														<div class="col-md-3 icon_selectBox_data" data-boxcontent="qso">
-															<?php foreach ($map_icon_select['qso'] as $val) {
-																echo "<label data-value='" . $val . "'><i class='" . $val . "'></i></label>";
-															} ?>
-														</div>
-													</div>
-													<div class="mb-3 col-md-2">
-														<input type="color" class="form-control user_icon_color" name="user_map_qso_color" id="user_map_qso_color" value="<?php echo $user_map_qso_color; ?>" style="padding:initial;" data-icon="qso" />
-													</div>
-												</div>
-												<div class="row"> <!-- QSO (confirmed) -->
-													<div class="mb-3 col-md-4">
-														<label><?php echo $this->lang->line('account_map_qso_confirm'); ?></label>
-														<small class="form-text text-muted"><?php echo lang('account_map_qso_confirm_same_qso'); ?></small>
-													</div>
-													<div class="mb-3 col-md-3">
-														<div class="icon_selectBox" data-boxcontent="qsoconfirm">
-															<input type="hidden" name="user_map_qsoconfirm_icon" value="<?php echo $user_map_qsoconfirm_icon; ?>">
-															<div class="form-select icon_overSelect"><?php echo (($user_map_qsoconfirm_icon == "0") ? $this->lang->line('general_word_no') : ("<i class='" . $user_map_qsoconfirm_icon . "'></i>")); ?></div>
-														</div>
-														<div class="col-md-3 icon_selectBox_data" data-boxcontent="qsoconfirm">
-															<?php foreach ($map_icon_select['qsoconfirm'] as $val) {
-																echo "<label data-value='" . $val . "'>" . (($val == "0") ? $this->lang->line('general_word_no') : ("<i class='" . $val . "'></i>")) . "</label>";
-															} ?>
-														</div>
-													</div>
-													<div class="md-3 col-md-2">
-														<input type="color" class="form-control user_icon_color" name="user_map_qsoconfirm_color" id="user_map_qsoconfirm_color" value="<?php echo $user_map_qsoconfirm_color; ?>" style="padding:initial;<?php echo ($user_map_qsoconfirm_icon == "0") ? 'display:none;' : ''; ?>" data-icon="qsoconfirm" />
-													</div>
-												</div>
-												<div class="row">
-													<div class="md-3 col-md-4">
-														<label><?php echo $this->lang->line('gen_hamradio_gridsquare_show'); ?></label>
-													</div>
-													<div class="md-3 col-md-3">
-														<select class="form-select" id="user_map_gridsquare_show" name="user_map_gridsquare_show">
-															<option value="1" <?php if ($user_map_gridsquare_show == 1) {
-																					echo " selected =\"selected\"";
-																				} ?>><?php echo lang('general_word_yes'); ?></option>
-															<option value="0" <?php if ($user_map_gridsquare_show == 0) {
-																					echo " selected =\"selected\"";
-																				} ?>><?php echo lang('general_word_no'); ?></option>
-														</select>
-													</div>
-												</div>
-											</div>
-										</div>
-									</div>
-								<?php } ?>
-							</div>
-
-							<div class="row">
-								<!-- Previous QSL -->
-								<div class="col-md">
-									<div class="card">
-										<div class="card-header"><?php echo lang('account_previous_qsl_type'); ?></div>
-										<div class="card-body">
-											<div class="mb-3">
-												<label for="profileimages"><?php echo lang('account_select_the_type_of_qsl_to_show_in_the_previous_qsos_section'); ?></label>
-												<?php if (!isset($user_previous_qsl_type)) {
-													$user_previous_qsl_type = '0';
+												<label for="profileimages"><?php echo lang('account_select_the_type_of_qsl_to_show_in_the_previous_qsos_section'); ?></label>
+												<?php if (!isset($user_previous_qsl_type)) {
+													$user_previous_qsl_type = '0';
 												} ?>
 												<select class="form-select" id="previousqsltype" name="user_previous_qsl_type">
 													<option value="0" <?php if ($user_previous_qsl_type == 0) {
@@ -936,74 +1092,8 @@
 									</div>
 								</div>
 							</div>
-						</div>
-					</div>
-				</div>
-				<!-- ZONE 3 / Default Value -->
-				<div class="accordion-item">
-					<h2 class="accordion-header" id="panelsStayOpen-H_default_value">
-						<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-B_default_value" aria-expanded="false" aria-controls="panelsStayOpen-B_default_value">
-							<?php echo lang('account_default_values'); ?></button>
-					</h2>
-					<div id="panelsStayOpen-B_default_value" class="accordion-collapse collapse" aria-labelledby="panelsStayOpen-H_default_value">
-						<div class="accordion-body">
-							<div class="row">
-								<!-- Default -->
-								<div class="col-md">
-									<div class="card">
-										<!--<div class="card-header"><?php echo lang('account_default_band_settings'); ?></div>-->
-										<div class="card-body">
-											<div class="mb-3">
-												<label for="user_default_band"><?php echo lang('account_gridmap_default_band'); ?></label>
-												<?php if (!isset($user_default_band)) {
-													$user_default_band = 'All';
-												} ?>
-												<select id="user_default_band" class="form-select" name="user_default_band">
-													<option value="All">All</option>;
-													<?php foreach ($bands as $band) {
-														echo '<option value="' . $band . '" ' . (($user_default_band == $band) ? ' selected="selected"' : '') . '>' . $band . '</option>' . "\n";
-													} ?>
-												</select>
-											</div>
-											<div class="mb-3">
-												<label class="my-1 me-2"><?php echo lang('account_qsl_settings'); ?></label>
-												<div class="form-check-inline">
-													<?php echo '<input class="form-check-input" type="checkbox" name="user_default_confirmation_qsl" id="user_default_confirmation_qsl"';
-													if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) {
-														echo ' checked';
-													}
-													echo '>'; ?>
-													<label class="form-check-label" for="user_default_confirmation_qsl"><?php echo lang('gen_hamradio_qsl'); ?></label>
-												</div>
-												<div class="form-check-inline">
-													<?php echo '<input class="form-check-input" type="checkbox" name="user_default_confirmation_lotw" id="user_default_confirmation_lotw"';
-													if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) {
-														echo ' checked';
-													}
-													echo '>'; ?>
-													<label class="form-check-label" for="user_default_confirmation_lotw"><?php echo lang('lotw_short'); ?></label>
-												</div>
-												<div class="form-check-inline">
-													<?php echo '<input class="form-check-input" type="checkbox" name="user_default_confirmation_eqsl" id="user_default_confirmation_eqsl"';
-													if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'E') !== false) {
-														echo ' checked';
-													}
-													echo '>'; ?>
-													<label class="form-check-label" for="user_default_confirmation_eqsl"><?php echo lang('account_eqsl'); ?></label>
-												</div>
-												<div class="form-check-inline">
-													<?php echo '<input class="form-check-input" type="checkbox" name="user_default_confirmation_qrz" id="user_default_confirmation_qrz"';
-													if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Z') !== false) {
-														echo ' checked';
-													}
-													echo '>'; ?>
-													<label class="form-check-label" for="user_default_confirmation_qrz">QRZ.com</label>
-												</div>
-											</div>
-										</div>
-									</div>
-								</div>
-							</div>
+
+
 						</div>
 					</div>
 				</div>
@@ -1154,18 +1244,42 @@
 										</div>
 									</div>
 								</div>
+
 							</div>
-						</div>
-					</div>
-				</div>
-				<!-- ZONE 5 / Miscellaneous -->
-				<div class="accordion-item">
-					<h2 class="accordion-header" id="panelsStayOpen-H_miscellaneous">
-						<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-B_miscellaneous" aria-expanded="false" aria-controls="panelsStayOpen-B_miscellaneous">
-							<?php echo lang('account_miscellaneous'); ?></button>
-					</h2>
-					<div id="panelsStayOpen-B_miscellaneous" class="accordion-collapse collapse" aria-labelledby="panelsStayOpen-H_miscellaneous">
-						<div class="accordion-body">
+							<div class="row">
+								<!-- Hams.at Settings -->
+								<div class="col-md">
+									<div class="card">
+										<div class="card-header"><?php echo lang('account_hamsat'); ?></div>
+										<div class="card-body">
+											<div class="mb-3">
+												<label><?php echo lang('account_hamsat_private_feed_key'); ?></label>
+												<input class="form-control" type="text" name="user_hamsat_key" value="<?php if (isset($user_hamsat_key)) {
+														echo $user_hamsat_key;
+												} ?>" />
+												<small class="form-text text-muted"><?php echo lang('account_hamsat_hint'); ?></a></small>
+											</div>
+											<div class="mb-3">
+												<label><?php echo lang('account_hamsat_workable_only'); ?></label>
+												<?php if (!isset($user_hamsat_workable_only)) {
+													$user_hamsat_workable_only = '0';
+												} ?>
+												<select class="form-select" name="user_hamsat_workable_only" id="user_hamsat_workable_only">
+													<option value="0" <?php if ($user_hamsat_workable_only == 0) {
+														echo 'selected="selected"';
+													} ?>><?php echo lang('general_word_no'); ?></option>
+													<option value="1" <?php if ($user_hamsat_workable_only == 1) {
+														echo 'selected="selected"';
+													} ?>><?php echo lang('general_word_yes'); ?></option>
+												</select>
+												<small class="form-text text-muted"><?php echo lang('account_hamsat_workable_only_hint'); ?></small>
+											</div>
+										</div>
+									</div>
+								</div>
+
+							</div>
+
 							<div class="row">
 								<!-- AMSAT Upload -->
 								<div class="col-md">
@@ -1179,11 +1293,11 @@
 												} ?>
 												<select class="form-select" id="amsatstatusupload" name="user_amsat_status_upload">
 													<option value="1" <?php if ($user_amsat_status_upload == 1) {
-																			echo " selected =\"selected\"";
-																		} ?>><?php echo lang('general_word_yes'); ?></option>
+														echo " selected =\"selected\"";
+													} ?>><?php echo lang('general_word_yes'); ?></option>
 													<option value="0" <?php if ($user_amsat_status_upload == 0) {
-																			echo " selected =\"selected\"";
-																		} ?>><?php echo lang('general_word_no'); ?></option>
+														echo " selected =\"selected\"";
+													} ?>><?php echo lang('general_word_no'); ?></option>
 												</select>
 											</div>
 										</div>
@@ -1198,14 +1312,26 @@
 											<div class="mb-3">
 												<label><?php echo lang('account_user_mastodon'); ?></label>
 												<input class="form-control" type="text" name="user_mastodon_url" value="<?php if (isset($user_mastodon_url)) {
-																															echo $user_mastodon_url;
-																														} ?>" />
+																									echo $user_mastodon_url;
+																									} ?>" />
 												<small class="form-text text-muted"><?php echo lang('account_user_mastodon_hint'); ?></a></small>
 											</div>
 										</div>
 									</div>
 								</div>
-
+							</div>
+						</div>
+					</div>
+				</div>
+				<!-- ZONE 5 / Miscellaneous -->
+				<div class="accordion-item">
+					<h2 class="accordion-header" id="panelsStayOpen-H_miscellaneous">
+						<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-B_miscellaneous" aria-expanded="false" aria-controls="panelsStayOpen-B_miscellaneous">
+							Hardware</button>
+					</h2>
+					<div id="panelsStayOpen-B_miscellaneous" class="accordion-collapse collapse" aria-labelledby="panelsStayOpen-H_miscellaneous">
+						<div class="accordion-body">
+							<div class="row">
 								<!-- Winkeyer -->
 								<div class="col-md">
 									<div class="card">
@@ -1239,39 +1365,6 @@
 								</div>
 							</div>
 
-							<div class="row">
-								<!-- Hams.at Settings -->
-								<div class="col-md">
-									<div class="card">
-										<div class="card-header"><?php echo lang('account_hamsat'); ?></div>
-										<div class="card-body">
-											<div class="mb-3">
-												<label><?php echo lang('account_hamsat_private_feed_key'); ?></label>
-												<input class="form-control" type="text" name="user_hamsat_key" value="<?php if (isset($user_hamsat_key)) {
-																															echo $user_hamsat_key;
-																														} ?>" />
-												<small class="form-text text-muted"><?php echo lang('account_hamsat_hint'); ?></a></small>
-											</div>
-											<div class="mb-3">
-												<label><?php echo lang('account_hamsat_workable_only'); ?></label>
-												<?php if (!isset($user_hamsat_workable_only)) {
-													$user_hamsat_workable_only = '0';
-												} ?>
-												<select class="form-select" name="user_hamsat_workable_only" id="user_hamsat_workable_only">
-													<option value="0" <?php if ($user_hamsat_workable_only == 0) {
-																			echo 'selected="selected"';
-																		} ?>><?php echo lang('general_word_no'); ?></option>
-													<option value="1" <?php if ($user_hamsat_workable_only == 1) {
-																			echo 'selected="selected"';
-																		} ?>><?php echo lang('general_word_yes'); ?></option>
-												</select>
-												<small class="form-text text-muted"><?php echo lang('account_hamsat_workable_only_hint'); ?></small>
-											</div>
-										</div>
-									</div>
-								</div>
-
-							</div>
 						</div>
 					</div>
 				</div>
@@ -1298,6 +1391,7 @@
 							'dxcluster_tab' => true,
 						], $qso_fields);
 						?>
+						<p class="text-muted mb-3">These options control which fields and tabs are shown in the QSO Entry form. Disable items you do not use to keep the entry view simpler.</p>
 						<div class="row">
 							<div class="col-md">
 								<div class="card mb-3">
@@ -1428,6 +1522,8 @@
 					</div>
 				</div>
 			</div>
+		</div>
+			</div>
 		</div>
 		<input type="hidden" name="id" value="<?php echo $this->uri->segment(3); ?>" />
 		
@@ -1447,6 +1543,55 @@
 			</div>
 			<?php } ?>
 			
-			<button type="submit" class="btn btn-primary mb-5 mt-3"><i class="fas fa-save"></i> <?php echo lang('account_save_account_changes'); ?></button>
+			<div class="d-flex justify-content-end mb-5 mt-3">
+				<button type="submit" class="btn btn-primary"><i class="fas fa-save"></i> <?php echo lang('account_save_account_changes'); ?></button>
+			</div>
 	</form>
+	<script>
+		(function() {
+			const nav = document.getElementById('settings-nav');
+			if (!nav) {
+				return;
+			}
+
+			const navButtons = Array.from(nav.querySelectorAll('[data-target]'));
+			const panes = navButtons
+				.map((button) => document.getElementById(button.dataset.target))
+				.filter((pane) => pane !== null);
+
+			panes.forEach((pane) => {
+				pane.classList.remove('collapse');
+				pane.classList.add('settings-pane');
+			});
+
+			function setActive(targetId, updateHash) {
+				navButtons.forEach((button) => {
+					button.classList.toggle('active', button.dataset.target === targetId);
+				});
+
+				panes.forEach((pane) => {
+					pane.classList.toggle('d-none', pane.id !== targetId);
+					pane.classList.add('show');
+				});
+
+				if (updateHash) {
+					window.location.hash = targetId;
+				}
+			}
+
+			navButtons.forEach((button) => {
+				button.addEventListener('click', function() {
+					setActive(this.dataset.target, true);
+				});
+			});
+
+			const hashTarget = window.location.hash ? window.location.hash.substring(1) : null;
+			const defaultTarget = navButtons.length > 0 ? navButtons[0].dataset.target : null;
+			const activeTarget = navButtons.some((button) => button.dataset.target === hashTarget) ? hashTarget : defaultTarget;
+
+			if (activeTarget) {
+				setActive(activeTarget, false);
+			}
+		})();
+	</script>
 </div>
\ No newline at end of file
diff --git a/application/views/version_dialog/index.php b/application/views/version_dialog/index.php
index 03981fa3a..1103694ee 100644
--- a/application/views/version_dialog/index.php
+++ b/application/views/version_dialog/index.php
@@ -90,8 +90,116 @@
                         <?php
                         $versionDialogText = isset($this->optionslib) ? $this->optionslib->get_option('version_dialog_text') : null;
                         if ($versionDialogText !== null) {
-                            $versionDialogTextWithLinks = preg_replace('/(https?:\/\/[^\s<]+)/', '<a href="$1" target="_blank">$1</a>', $versionDialogText);
-                            echo nl2br($versionDialogTextWithLinks);
+                            // Apply markdown conversion to custom text
+                            $htmlContent = $versionDialogText;
+                            
+                            // Convert inline code (`) - protect inline code from other conversions
+                            $htmlContent = preg_replace('/`([^`]+)`/', '<code>$1</code>', $htmlContent);
+                            
+                            // Convert markdown horizontal rules (---, ***, ___) - split by line for robustness
+                            $lines = preg_split('/\r?\n/', $htmlContent);
+                            $processedLines = array();
+                            foreach ($lines as $line) {
+                                $trimmed = trim($line);
+                                // Check if line is ONLY HR markers (3+ of same character, optionally with spaces)
+                                if (preg_match('/^[ \t]{0,3}([\*\-_])\1{2,}[ \t]*$/', $trimmed)) {
+                                    $processedLines[] = '<hr />';
+                                } else {
+                                    $processedLines[] = $line;
+                                }
+                            }
+                            $htmlContent = implode("\n", $processedLines);
+                            
+                            // Convert blockquotes (>) before lists
+                            $htmlContent = preg_replace_callback(
+                                '/((?:^>[ \t]?.+$(?:\r?\n)?)+)/m',
+                                function($matches) {
+                                    $blockquoteContent = $matches[1];
+                                    $blockquoteContent = preg_replace('/^>[ \t]?/m', '', $blockquoteContent);
+                                    return "\n<blockquote>\n" . $blockquoteContent . "</blockquote>\n";
+                                },
+                                $htmlContent
+                            );
+                            
+                            // Convert strikethrough (~~text~~)
+                            $htmlContent = preg_replace('/~~(.+?)~~/s', '<del>$1</del>', $htmlContent);
+                            
+                            // Convert bullet points to list items
+                            $htmlContent = preg_replace_callback(
+                                '/((?:^[ \t]*[\*\-\+] .+$(?:\r?\n)?)+)/m',
+                                function($matches) {
+                                    $listContent = $matches[1];
+                                    // Handle task lists first
+                                    $listContent = preg_replace_callback(
+                                        '/^[ \t]*[\*\-\+] \[[ xX]\]/m',
+                                        function($m) {
+                                            $isChecked = strpos($m[0], '[x') !== false || strpos($m[0], '[X') !== false;
+                                            return '<input type="checkbox"' . ($isChecked ? ' checked' : '') . ' disabled> ';
+                                        },
+                                        $listContent
+                                    );
+                                    $listContent = preg_replace('/^[ \t]*[\*\-\+] (.+?)[ \t]*$/m', '<li>$1</li>', $listContent);
+                                    $listContent = preg_replace('/(<\/li>)\r?\n(?=<li>)/', '$1', $listContent);
+                                    return "\n<ul>\n" . $listContent . "</ul>\n";
+                                },
+                                $htmlContent
+                            );
+                            
+                            // Convert numbered lists
+                            $htmlContent = preg_replace_callback(
+                                '/((?:^[ \t]*\d+\. .+$(?:\r?\n)?)+)/m',
+                                function($matches) {
+                                    $listContent = $matches[1];
+                                    $listContent = preg_replace('/^[ \t]*\d+\. (.+?)[ \t]*$/m', '<li>$1</li>', $listContent);
+                                    $listContent = preg_replace('/(<\/li>)\r?\n(?=<li>)/', '$1', $listContent);
+                                    return "\n<ol>\n" . $listContent . "</ol>\n";
+                                },
+                                $htmlContent
+                            );
+                            
+                            // Convert headers
+                            $htmlContent = preg_replace('/^#### (.+)$/m', '<h5>$1</h5>', $htmlContent);
+                            $htmlContent = preg_replace('/^### (.+)$/m', '<h4>$1</h4>', $htmlContent);
+                            $htmlContent = preg_replace('/^## (.+)$/m', '<h3>$1</h3>', $htmlContent);
+                            $htmlContent = preg_replace('/^# (.+)$/m', '<h2>$1</h2>', $htmlContent);
+                            
+                            // Convert bold and italic
+                            $htmlContent = preg_replace('/\*\*(.+?)\*\*/', '<strong>$1</strong>', $htmlContent);
+                            $htmlContent = preg_replace('/__(.+?)__/', '<strong>$1</strong>', $htmlContent);
+                            $htmlContent = preg_replace('/(?<![*_])\*([^*\n]+)\*(?![*_])/', '<em>$1</em>', $htmlContent);
+                            $htmlContent = preg_replace('/(?<![*_])_([^_\n]+)_(?![*_])/', '<em>$1</em>', $htmlContent);
+                            
+                            // Convert images and links
+                            $htmlContent = preg_replace('/!\[([^\]]*)\]\(([^)]+)\)/', '<img src="$2" alt="$1" class="img-fluid" style="max-width: 100%; height: auto;" />', $htmlContent);
+                            $htmlContent = preg_replace('/\[([^\]]+)\]\(([^)]+)\)/', '<a href="$2" target="_blank">$1</a>', $htmlContent);
+                            
+                            // Convert GitHub usernames and URLs
+                            $htmlContent = preg_replace('/(?<![\w\/])@([a-zA-Z0-9_-]+)(?![\w])/', '<a href="https://github.com/$1" target="_blank">@$1</a>', $htmlContent);
+                            $htmlContent = preg_replace('/(?<!href=["|\']|">|>\s)(https?:\/\/[^\s<]+)/', '<a href="$1" target="_blank">$1</a>', $htmlContent);
+                            
+                            // Protect block elements from nl2br
+                            $htmlContent = preg_replace('/(<\/(?:h[1-6]|ul|ol|li|pre|blockquote)>)\r?\n/', '$1<!--BLOCK-->', $htmlContent);
+                            $htmlContent = preg_replace('/(<(?:ul|ol|pre|blockquote)>)\r?\n/', '$1<!--BLOCK-->', $htmlContent);
+                            $htmlContent = preg_replace('/(<hr\s*\/?>\r?\n)/', '$1<!--BLOCK-->', $htmlContent);
+                            
+                            // Convert line breaks
+                            $htmlContent = nl2br($htmlContent);
+                            
+                            // Remove block markers
+                            $htmlContent = preg_replace('/<!--BLOCK--><br\s*\/?>/', '', $htmlContent);
+                            $htmlContent = preg_replace('/<br\s*\/?><!--BLOCK-->/', '', $htmlContent);
+                            $htmlContent = preg_replace('/<!--BLOCK-->/', '', $htmlContent);
+                            
+                            // Cleanup extra br tags around block elements
+                            // Remove ALL consecutive br tags before block elements
+                            $htmlContent = preg_replace('/(?:<br\s*\/?>\s*)+(<(?:h[1-6]|ul|ol|li|pre|code|hr|blockquote)[^>]*>)/i', '$1', $htmlContent);
+                            $htmlContent = preg_replace('/(<\/(?:h[1-6]|ul|ol|li|pre|blockquote)>|<hr\s*\/?>\s*)\s*(?:<br\s*\/?>\s*)+/i', '$1', $htmlContent);
+                            $htmlContent = preg_replace('/(<br\s*\/?>){3,}/', '<br><br>', $htmlContent);
+                            
+                            // Remove br tags inside list items
+                            $htmlContent = preg_replace('/(<li>[^<]*)<br\s*\/?>(\s*<\/li>)/i', '$1$2', $htmlContent);
+                            
+                            echo $htmlContent;
                         } else {
                             echo 'No Version Dialog text set. Go to the Admin Menu and set one.';
                         }
@@ -141,13 +249,54 @@
                                     // Convert inline code (`) - protect inline code from other conversions
                                     $htmlContent = preg_replace('/`([^`]+)`/', '<code>$1</code>', $htmlContent);
                                     
+                                    // Convert markdown horizontal rules (---, ***, ___) - split by line for robustness
+                                    $lines = preg_split('/\r?\n/', $htmlContent);
+                                    $processedLines = array();
+                                    foreach ($lines as $line) {
+                                        $trimmed = trim($line);
+                                        // Check if line is ONLY HR markers (3+ of same character, optionally with spaces)
+                                        if (preg_match('/^[ \t]{0,3}([\*\-_])\1{2,}[ \t]*$/', $trimmed)) {
+                                            $processedLines[] = '<hr />';
+                                        } else {
+                                            $processedLines[] = $line;
+                                        }
+                                    }
+                                    $htmlContent = implode("\n", $processedLines);
+                                    
+                                    // Convert blockquotes (>) before lists to avoid interference
+                                    $htmlContent = preg_replace_callback(
+                                        '/((?:^>[ \t]?.+$(?:\r?\n)?)+)/m',
+                                        function($matches) {
+                                            $blockquoteContent = $matches[1];
+                                            // Remove leading > from each line and trim
+                                            $blockquoteContent = preg_replace('/^>[ \t]?/m', '', $blockquoteContent);
+                                            // Wrap in <blockquote> tags
+                                            return "\n<blockquote>\n" . $blockquoteContent . "</blockquote>\n";
+                                        },
+                                        $htmlContent
+                                    );
+                                    
+                                    // Convert strikethrough (~~text~~)
+                                    $htmlContent = preg_replace('/~~(.+?)~~/s', '<del>$1</del>', $htmlContent);
+                                    
                                     // Convert bullet points to list items (must be done before bold/italic to avoid interference)
                                     $htmlContent = preg_replace_callback(
                                         '/((?:^[ \t]*[\*\-\+] .+$(?:\r?\n)?)+)/m',
                                         function($matches) {
                                             $listContent = $matches[1];
-                                            // Convert each bullet point to <li>
-                                            $listContent = preg_replace('/^[ \t]*[\*\-\+] (.+)$/m', '<li>$1</li>', $listContent);
+                                            // Handle task lists first: [ ] or [x] or [X]
+                                            $listContent = preg_replace_callback(
+                                                '/^[ \t]*[\*\-\+] \[[ xX]\]/m',
+                                                function($m) {
+                                                    $isChecked = strpos($m[0], '[x') !== false || strpos($m[0], '[X') !== false;
+                                                    return '<input type="checkbox"' . ($isChecked ? ' checked' : '') . ' disabled> ';
+                                                },
+                                                $listContent
+                                            );
+                                            // Convert each bullet point to <li>, stripping trailing whitespace
+                                            $listContent = preg_replace('/^[ \t]*[\*\-\+] (.+?)[ \t]*$/m', '<li>$1</li>', $listContent);
+                                            // Remove newlines between list items to prevent nl2br from adding extra breaks
+                                            $listContent = preg_replace('/(<\/li>)\r?\n(?=<li>)/', '$1', $listContent);
                                             // Wrap in <ul> tags
                                             return "\n<ul>\n" . $listContent . "</ul>\n";
                                         },
@@ -159,8 +308,10 @@ function($matches) {
                                         '/((?:^[ \t]*\d+\. .+$(?:\r?\n)?)+)/m',
                                         function($matches) {
                                             $listContent = $matches[1];
-                                            // Convert each numbered item to <li>
-                                            $listContent = preg_replace('/^[ \t]*\d+\. (.+)$/m', '<li>$1</li>', $listContent);
+                                            // Convert each numbered item to <li>, stripping trailing whitespace
+                                            $listContent = preg_replace('/^[ \t]*\d+\. (.+?)[ \t]*$/m', '<li>$1</li>', $listContent);
+                                            // Remove newlines between list items to prevent nl2br from adding extra breaks
+                                            $listContent = preg_replace('/(<\/li>)\r?\n(?=<li>)/', '$1', $listContent);
                                             // Wrap in <ol> tags
                                             return "\n<ol>\n" . $listContent . "</ol>\n";
                                         },
@@ -194,8 +345,9 @@ function($matches) {
                                     $htmlContent = preg_replace('/(?<!href=["|\']|">|>\s)(https?:\/\/[^\s<]+)/', '<a href="$1" target="_blank">$1</a>', $htmlContent);
                                     
                                     // Replace newlines after block-level elements with a marker to prevent nl2br from converting them
-                                    $htmlContent = preg_replace('/(<\/(?:h[1-6]|ul|ol|li|pre)>)\r?\n/', '$1<!--BLOCK-->', $htmlContent);
-                                    $htmlContent = preg_replace('/(<(?:ul|ol|pre)>)\r?\n/', '$1<!--BLOCK-->', $htmlContent);
+                                    $htmlContent = preg_replace('/(<\/(?:h[1-6]|ul|ol|li|pre|blockquote)>)\r?\n/', '$1<!--BLOCK-->', $htmlContent);
+                                    $htmlContent = preg_replace('/(<(?:ul|ol|pre|blockquote)>)\r?\n/', '$1<!--BLOCK-->', $htmlContent);
+                                    $htmlContent = preg_replace('/(<hr\s*\/?>\r?\n)/', '$1<!--BLOCK-->', $htmlContent);
                                     
                                     // Convert line breaks to <br> tags
                                     $htmlContent = nl2br($htmlContent);
@@ -206,12 +358,14 @@ function($matches) {
                                     $htmlContent = preg_replace('/<!--BLOCK-->/', '', $htmlContent);
                                     
                                     // Additional cleanup: remove br tags immediately before and after block elements
-                                    $htmlContent = preg_replace('/<br\s*\/?>\s*(<(?:h[1-6]|ul|ol|li|pre|code)[^>]*>)/i', '$1', $htmlContent);
-                                    $htmlContent = preg_replace('/(<\/(?:h[1-6]|ul|ol|li|pre)>)\s*<br\s*\/?>/i', '$1', $htmlContent);
-                                    
-                                    // Remove multiple consecutive br tags (more than 2)
+                                    // Remove ALL consecutive br tags before block elements
+                                    $htmlContent = preg_replace('/(?:<br\s*\/?>\s*)+(<(?:h[1-6]|ul|ol|li|pre|code|hr|blockquote)[^>]*>)/i', '$1', $htmlContent);
+                                    $htmlContent = preg_replace('/(<\/(?:h[1-6]|ul|ol|li|pre|blockquote)>|<hr\s*\/?>\s*)\s*(?:<br\s*\/?>\s*)+/i', '$1', $htmlContent);
                                     $htmlContent = preg_replace('/(<br\s*\/?>){3,}/', '<br><br>', $htmlContent);
                                     
+                                    // Remove br tags inside list items
+                                    $htmlContent = preg_replace('/(<li>[^<]*)<br\s*\/?>(\s*<\/li>)/i', '$1$2', $htmlContent);
+                                    
                                     echo "<div class='release-notes mt-3'>" . $htmlContent . "</div>";
                                 } else {
                                     echo '<h4>v' . $current_version . '</h4>';
diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js
index f850b48b6..a99d6e3b6 100644
--- a/assets/js/sections/qso.js
+++ b/assets/js/sections/qso.js
@@ -1,5 +1,12 @@
 var lastCallsignUpdated=""
 var callsignLookupRequestId = 0;
+var callsignDxccQuickRequestId = 0;
+var callsignDxccQuickTimer = null;
+var isSubmitting = false;
+var lastResetCatSyncNoticeAt = 0;
+var suppressNextResetHandler = false;
+var previousContactsLookupMode = false;
+var htmxAutoRefreshTimer = null;
 
 function hasFieldValue(value) {
 	return value !== null && value !== undefined && String(value).trim() !== "";
@@ -9,6 +16,42 @@ function normalizeFieldValue(value) {
 	return String(value ?? "").trim();
 }
 
+function escapeNoticeValue(value) {
+	return String(value || '').replace(/[&<>"']/g, function(char) {
+		var escapes = {
+			'&': '&amp;',
+			'<': '&lt;',
+			'>': '&gt;',
+			'"': '&quot;',
+			"'": '&#39;'
+		};
+		return escapes[char] || char;
+	});
+}
+
+function showQsoNotice(message, alertType) {
+	var safeType = alertType || 'info';
+	var $container = $('#notice-alerts-container');
+	if ($container.length === 0) {
+		$container = $('<div id="notice-alerts-container"></div>');
+		var $rightColumn = $('.col-sm-7').first();
+		var $mapCard = $rightColumn.find('.qso-map').first();
+		if ($mapCard.length > 0) {
+			$container.insertBefore($mapCard);
+		} else if ($rightColumn.length > 0) {
+			$rightColumn.prepend($container);
+		}
+	}
+
+	$container.html('<div id="notice-alerts" class="alert alert-' + safeType + '" role="alert">' + message + '</div>');
+
+	setTimeout(function() {
+		$('#notice-alerts').fadeOut(300, function() {
+			$(this).remove();
+		});
+	}, 5000);
+}
+
 function shouldReplaceLookupField($field, incomingValue, fieldKey, approval) {
 	if (!hasFieldValue(incomingValue)) {
 		return false;
@@ -541,11 +584,11 @@ var favs={};
 	});
 
 	// Test Consistency value on submit form //
-	var isSubmitting = false;
 	$("#qso_input").off('submit').on('submit', function(e){
+		e.preventDefault();
+
 		// Prevent double submission
 		if (isSubmitting) {
-			e.preventDefault();
 			return false;
 		}
 		
@@ -557,6 +600,10 @@ var favs={};
 		if (_submit) {
 			// Mark as submitting and disable the submit button
 			isSubmitting = true;
+			$('#qso_input .warningOnSubmit').hide();
+			$('#qso_input .warningOnSubmit_txt').empty();
+
+			var $form = $(this);
 			var submitBtn = $(this).find('button[type="submit"]');
 			var originalText = submitBtn.data('original-text');
 			if (!originalText) {
@@ -566,9 +613,88 @@ var favs={};
 			}
 			submitBtn.prop('disabled', true);
 			submitBtn.html('<i class="fas fa-spinner fa-spin"></i> Saving...');
+
+			var ajaxSaveUrl = $form.data('ajax-save-url') || (base_url + 'index.php/qso/ajax_saveqso');
+
+			$.ajax({
+				url: ajaxSaveUrl,
+				type: 'POST',
+				data: $form.serialize(),
+				dataType: 'json',
+				success: function(response) {
+					if (response && response.status === 'ok') {
+						var savedCallsign = normalizeFieldValue($('#callsign').val()).toUpperCase();
+						var savedBand = normalizeFieldValue($('#band').val());
+						var savedMode = normalizeFieldValue($('#mode').val());
+						var savedSatName = normalizeFieldValue($('#sat_name').val());
+						var savedSatMode = normalizeFieldValue($('#sat_mode').val());
+						var postSaveDefaults = {
+							band: savedBand,
+							mode: savedMode,
+							sat_name: savedSatName,
+							sat_mode: savedSatMode
+						};
+						var saveMessage = (response && response.message) ? response.message : 'QSO Added';
+						if (savedCallsign && savedBand) {
+							saveMessage += ': <strong>' + escapeNoticeValue(savedCallsign) + ' on ' + escapeNoticeValue(savedBand) + '</strong>';
+						} else if (savedCallsign) {
+							saveMessage += ': <strong>' + escapeNoticeValue(savedCallsign) + '</strong>';
+						} else if (savedBand) {
+							saveMessage += ': <strong>on ' + escapeNoticeValue(savedBand) + '</strong>';
+						}
+
+						var qsoFormElement = document.getElementById('qso_input');
+						if (qsoFormElement) {
+							suppressNextResetHandler = true;
+							qsoFormElement.reset();
+						}
+
+						reset_fields();
+						if (document.getElementById('qsp-tab')) {
+							new bootstrap.Tab(document.getElementById('qsp-tab')).show();
+						}
+						reapplyPostSaveDefaults(postSaveDefaults);
+						showQsoNotice(saveMessage, 'info');
+
+						if (typeof htmx !== 'undefined' && document.getElementById('qso-last-table')) {
+							htmx.ajax('GET', base_url + 'index.php/qso/component_past_contacts', {
+								target: '#qso-last-table',
+								swap: 'innerHTML'
+							});
+						}
+
+						$('#callsign').focus();
+						$('#qso_input').data('initialForm', $('#qso_input').serialize());
+					} else {
+						var warningMessage = (response && response.message) ? response.message : 'Unable to save QSO. Please try again.';
+
+						if (response && response.validation_errors) {
+							var validationMessages = [];
+							$.each(response.validation_errors, function(_, msg) {
+								if (msg) {
+									validationMessages.push(msg);
+								}
+							});
+							if (validationMessages.length > 0) {
+								warningMessage = validationMessages.join('<br>');
+							}
+						}
+
+						$('#qso_input .warningOnSubmit_txt').html(warningMessage);
+						$('#qso_input .warningOnSubmit').show();
+					}
+				},
+				error: function() {
+					$('#qso_input .warningOnSubmit_txt').html('Unable to save QSO due to a network or server error.');
+					$('#qso_input .warningOnSubmit').show();
+				},
+				complete: function() {
+					resetSubmissionState();
+				}
+			});
 		}
 		
-		return _submit;
+		return false;
 	})
 	
 	// Prevent Enter key from causing double submissions
@@ -730,10 +856,47 @@ function resetSubmissionState() {
 	}
 }
 
+function resetCallsignLookupState() {
+	lastCallsignUpdated = '';
+	// Invalidate in-flight responses from older callsign lookups.
+	callsignLookupRequestId++;
+	callsignDxccQuickRequestId++;
+	if (callsignDxccQuickTimer) {
+		clearTimeout(callsignDxccQuickTimer);
+		callsignDxccQuickTimer = null;
+	}
+}
+
+function isLookupStillCurrent(requestId, find_callsign) {
+	if (requestId !== callsignLookupRequestId) {
+		return false;
+	}
+
+	var currentCallsign = $('#callsign').val().toUpperCase().replace(/\//g, "-").replace('Ø', '0');
+	return currentCallsign === find_callsign;
+}
+
+function clearSatelliteFields() {
+	$('#sat_name').val('');
+	$('#sat_mode').val('');
+	$('.satellite_modes_list').find('option').remove().end();
+	selected_sat = '';
+	selected_sat_mode = '';
+
+	if ($('#selectPropagation').val() === 'SAT') {
+		$('#selectPropagation').val('');
+	}
+}
+
+function clearCatTrackedFieldState() {
+	$('#frequency, #frequency_rx, #sat_name, #sat_mode, #transmit_power, #selectPropagation, #mode').removeData('catValue');
+}
+
 /* Function: reset_fields is used to reset the fields on the QSO page */
 function reset_fields() {
 	// Reset submission state
 	resetSubmissionState();
+	resetCallsignLookupState();
 
 	$('#locator_info').text("");
 	$('#country').val("");
@@ -745,13 +908,17 @@ function reset_fields() {
 	$('#qrz_info').text("");
 	$('#hamqth_info').text("");
 	$('#sota_info').text("");
+	$('#wwff_info').html('').attr('title', '');
+	$('#pota_info').html('').attr('title', '');
 	$('#dxcc_id').val("").trigger('change');
 	$('#cqz').val("");
 	$('#name').val("");
 	$('#qth').val("");
 	$('#locator').val("");
 	$('#iota_ref').val("");
-	$('#sota_ref').val("");
+	$select = $('#sota_ref').selectize();
+	selectize = $select[0] ? $select[0].selectize : null;
+	if (selectize) selectize.clear();
 	$("#locator").removeClass("confirmedGrid");
 	$("#locator").removeClass("workedGrid");
 	$("#locator").removeClass("newGrid");
@@ -767,7 +934,10 @@ function reset_fields() {
 	$('#callsign_info').text("");
 	$('#input_usa_state').val("");
 	$('#qso-last-table').show();
+	$('#partial_view').html('');
 	$('#partial_view').hide();
+	previousContactsLookupMode = false;
+	resumeAutoRefresh();
 	var $select = $('#wwff_ref').selectize();
 	var selectize = $select[0] ? $select[0].selectize : null;
 	if (selectize) selectize.clear();
@@ -781,12 +951,46 @@ function reset_fields() {
 	selectize = $select[0] ? $select[0].selectize : null;
 	if (selectize) selectize.clear();
 
+	clearSatelliteFields();
+	clearCatTrackedFieldState();
+
 	mymap.setView(pos, 12);
 	mymap.removeLayer(markers);
 	$('.callsign-suggest').hide();
 	$('.dxccsummary').remove();
 	$('#timesWorked').html(lang_qso_title_previous_contacts);
 	renderQsoCallhistoryPanel([], 'Type a callsign to see membership details from your uploaded call history files.');
+
+	// Reapply default RST values for the current mode (e.g., CW => 599).
+	if (typeof setRst === 'function') {
+		setRst($('.mode').val());
+	}
+}
+
+function reapplyPostSaveDefaults(defaults) {
+	if (!defaults) {
+		return;
+	}
+
+	if (typeof defaults.band !== 'undefined') {
+		$('#band').val(defaults.band);
+	}
+
+	if (typeof defaults.mode !== 'undefined') {
+		$('#mode').val(defaults.mode);
+	}
+
+	if (typeof defaults.sat_name !== 'undefined') {
+		$('#sat_name').val(defaults.sat_name);
+	}
+
+	if (typeof defaults.sat_mode !== 'undefined') {
+		$('#sat_mode').val(defaults.sat_mode);
+	}
+
+	if (typeof setRst === 'function') {
+		setRst($('#mode').val());
+	}
 }
 
 function resetTimers(manual) {
@@ -830,7 +1034,7 @@ $("#callsign").focusout(function() {
 		// Replace / in a callsign with - to stop urls breaking
 		$.getJSON(base_url + 'index.php/logbook/json/' + find_callsign + '/' + sat_type + '/' + json_band + '/' + json_mode + '/' + $('#stationProfile').val(), function(result)
 		{
-			if (requestId !== callsignLookupRequestId) {
+			if (!isLookupStillCurrent(requestId, find_callsign)) {
 				return;
 			}
 
@@ -838,63 +1042,37 @@ $("#callsign").focusout(function() {
 			var currentCallsign = $('#callsign').val().toUpperCase().replace(/\//g, "-").replace('Ø', '0');
 			if(currentCallsign === find_callsign) {
 
-				// Reset QSO fields
-				resetDefaultQSOFields();
-
-				if(result.dxcc.entity != undefined) {
-					$('#country').val(convert_case(result.dxcc.entity));
-					$('#callsign_info').text(convert_case(result.dxcc.entity));
-
-					if($("#sat_name" ).val() != "") {
-						//logbook/jsonlookupgrid/io77/SAT/0/0
-						$.getJSON(base_url + 'index.php/logbook/jsonlookupcallsign/' + find_callsign + '/SAT/0/0', function(result)
-						{
-							// Reset CSS values before updating
-							$('#callsign').removeClass("workedGrid");
-							$('#callsign').removeClass("confirmedGrid");
-							$('#callsign').removeClass("newGrid");
-							$('#callsign').attr('title', '');
-
-							if (result.confirmed) {
-								$('#callsign').addClass("confirmedGrid");
-								$('#callsign').attr('title', 'Callsign was already worked and confirmed in the past on this band and mode!');
-							} else if (result.workedBefore) {
-								$('#callsign').addClass("workedGrid");
-								$('#callsign').attr('title', 'Callsign was already worked in the past on this band and mode!');
-							}
-							else
-							{
-								$('#callsign').addClass("newGrid");
-								$('#callsign').attr('title', 'New Callsign!');
-							}
-						})
-					} else {
-						$.getJSON(base_url + 'index.php/logbook/jsonlookupcallsign/' + find_callsign + '/0/' + $("#band").val() +'/' + $("#mode").val(), function(result)
-						{
-							// Reset CSS values before updating
-							$('#callsign').removeClass("confirmedGrid");
-							$('#callsign').removeClass("workedGrid");
-							$('#callsign').removeClass("newGrid");
-							$('#callsign').attr('title', '');
-
-							if (result.confirmed) {
-								$('#callsign').addClass("confirmedGrid");
-								$('#callsign').attr('title', 'Callsign was already worked and confirmed in the past on this band and mode!');
-							} else if (result.workedBefore) {
-								$('#callsign').addClass("workedGrid");
-								$('#callsign').attr('title', 'Callsign was already worked in the past on this band and mode!');
-							} else {
-								$('#callsign').addClass("newGrid");
-								$('#callsign').attr('title', 'New Callsign!');
-							}
-
-						})
-					}
-
-					changebadge(result.dxcc.entity);
-
+			// Enter lookup mode - pause auto-refresh of logbook pagination
+			previousContactsLookupMode = true;
+			pauseAutoRefresh();
+
+			// Reset QSO fields but keep current DXCC badge/country to avoid flicker.
+			resetDefaultQSOFields(true);
+
+			if(result.dxcc.entity != undefined) {
+				$('#country').val(convert_case(result.dxcc.entity));
+				$('#callsign_info').text(convert_case(result.dxcc.entity));
+
+				// Reset CSS values before updating
+				$('#callsign').removeClass("confirmedGrid");
+				$('#callsign').removeClass("workedGrid");
+				$('#callsign').removeClass("newGrid");
+				$('#callsign').attr('title', '');
+
+				if (result.callsignConfirmed || result.confirmed) {
+					$('#callsign').addClass("confirmedGrid");
+					$('#callsign').attr('title', 'Callsign was already worked and confirmed in the past on this band and mode!');
+				} else if (result.callsignWorkedBefore) {
+					$('#callsign').addClass("workedGrid");
+					$('#callsign').attr('title', 'Callsign was already worked in the past on this band and mode!');
+				} else {
+					$('#callsign').addClass("newGrid");
+					$('#callsign').attr('title', 'New Callsign!');
 				}
 
+				changebadge(result.dxcc.entity);
+			}
+
 				if(result.lotw_member == "active") {
 					$('#lotw_info').text("LoTW");
 					if (result.lotw_days > 365) {
@@ -920,6 +1098,9 @@ $("#callsign").focusout(function() {
 				var dok_selectize = $dok_select[0] ? $dok_select[0].selectize : null;
 				if (result.dxcc.adif == '230') {
 					$.get(base_url + 'index.php/lookup/dok/' + $('#callsign').val().toUpperCase(), function(result) {
+						if (!isLookupStillCurrent(requestId, find_callsign)) {
+							return;
+						}
 						if (result && dok_selectize) {
 							dok_selectize.addOption({name: result});
 							dok_selectize.setValue(result, false);
@@ -929,7 +1110,7 @@ $("#callsign").focusout(function() {
 					if (dok_selectize) dok_selectize.clear();
 				}
 
-				$('#dxcc_id').val(result.dxcc.adif).trigger('change');
+				$('#dxcc_id').val(result.dxcc.adif);
 				$('#cqz').val(result.dxcc.cqz);
 				$('#ituz').val(result.dxcc.ituz);
 
@@ -956,7 +1137,7 @@ $("#callsign").focusout(function() {
 
 				var overwriteConflicts = getLookupOverwriteConflicts(result);
 				showLookupOverwriteModal(overwriteConflicts).then(function(approval) {
-					if (requestId !== callsignLookupRequestId) {
+					if (!isLookupStillCurrent(requestId, find_callsign)) {
 						return;
 					}
 
@@ -1013,12 +1194,22 @@ $("#callsign").focusout(function() {
 				if($('#iota_ref').val() == "") {
 					$('#iota_ref').val(result.callsign_iota);
 				}
-				// Hide the last QSO table
-				$('#qso-last-table').hide();
-				$('#partial_view').show();
 				/* display past QSOs */
-				$('#partial_view').html(result.partial);
-
+				var partialHtml = (typeof result.partial === 'string') ? result.partial : '';
+				
+				if (partialHtml.trim() !== '') {
+					// State 2: Callsign found in log with past QSOs
+					$('#partial_view').html(partialHtml);
+					setPreviousContactsPanelState(true);
+				} else {
+					// State 3: Callsign found but NO past QSOs in database
+					var noQsoMsg = '<div class="alert alert-info small mb-2">'
+						+ '<i class="fa fa-info-circle me-2"></i>'
+						+ 'No past QSOs with <strong>' + escapeNoticeValue(find_callsign) + '</strong>&mdash;see callbook details above.'
+						+ '</div>';
+					$('#partial_view').html(noQsoMsg);
+					setPreviousContactsPanelState(true);
+				}
 				// Get DXX Summary
 				getDxccResult(result.dxcc.adif, convert_case(result.dxcc.entity));
 			}
@@ -1031,6 +1222,43 @@ $("#callsign").focusout(function() {
 	}
 })
 
+function pauseAutoRefresh() {
+	if (typeof htmx !== 'undefined' && document.getElementById('qso-last-table-content')) {
+		var elem = document.getElementById('qso-last-table-content');
+		if (elem) {
+			elem.removeAttribute('hx-trigger');
+		}
+	}
+}
+
+function resumeAutoRefresh() {
+	if (typeof htmx !== 'undefined' && document.getElementById('qso-last-table-content')) {
+		var elem = document.getElementById('qso-last-table-content');
+		if (elem) {
+			elem.setAttribute('hx-trigger', 'every 5s');
+			htmx.process(elem);
+		}
+	}
+}
+
+function setPreviousContactsPanelState(showLookupDetails) {
+	if (showLookupDetails) {
+		// Show callsign-specific results (either QSOs found or "not found" message)
+		$('#qso-last-table').hide();
+		$('#qso-last-table').next('small').hide();
+		$('#partial_view').show();
+		previousContactsLookupMode = true;
+		return;
+	}
+
+	// Show paginated logbook (no callsign lookup active)
+	$('#qso-last-table').show();
+	$('#qso-last-table').next('small').show();
+	$('#partial_view').html('');
+	$('#partial_view').hide();
+	previousContactsLookupMode = false;
+}
+
 // Function to reset back to Previous Contacts tab
 function resetToPreviousContactsTab() {
 	// Clear DXCC Summary tab content
@@ -1040,15 +1268,66 @@ function resetToPreviousContactsTab() {
 		var previousContactsTab = new bootstrap.Tab(document.getElementById('previous-contacts-tab'));
 		previousContactsTab.show();
 	}
-	// Show the previous contacts table
-	$('#qso-last-table').show();
-	$('#partial_view').hide();
+	// Show the default previous contacts table and hide lookup details.
+	setPreviousContactsPanelState(false);
+}
+
+// Re-apply visibility state after HTMX updates the previous contacts markup.
+if (typeof htmx !== 'undefined' && document.body) {
+	document.body.addEventListener('htmx:afterSwap', function(evt) {
+		var detail = evt && evt.detail ? evt.detail : null;
+		var target = detail && detail.target ? detail.target : null;
+		if (!target) {
+			return;
+		}
+
+		if (target.id !== 'qso-last-table' && target.id !== 'qso-last-table-content') {
+			return;
+		}
+
+		// If we're in lookup mode, keep showing the partial_view (callsign-specific results)
+		// If we're not in lookup mode, show the main pagination table
+		if (previousContactsLookupMode) {
+			setPreviousContactsPanelState(true);
+		} else if ($('#partial_view').html().trim() !== '') {
+			setPreviousContactsPanelState(true);
+		}
+	});
+}
+
+// If a radio is selected, prefer current CAT values over stale form defaults.
+function syncFromSelectedRadioAfterReset() {
+	var selectedRadioID = String($('select.radios option:selected').val() || '0');
+	if (selectedRadioID === '0') {
+		return false;
+	}
+
+	if (typeof updateFromCAT === 'function') {
+		var now = Date.now();
+		if (now - lastResetCatSyncNoticeAt > 1000) {
+			showQsoNotice('Form reset. Syncing live data from selected radio.', 'info');
+			lastResetCatSyncNoticeAt = now;
+		}
+		updateFromCAT(selectedRadioID);
+		return true;
+	}
+
+	return false;
 }
 
 // Reset to Previous Contacts tab when form is reset
 $('#qso_input').on('reset', function() {
+	resetCallsignLookupState();
+
+	if (suppressNextResetHandler) {
+		suppressNextResetHandler = false;
+		return;
+	}
+
 	setTimeout(function() {
+		reset_fields();
 		resetToPreviousContactsTab();
+		syncFromSelectedRadioAfterReset();
 	}, 100);
 });
 
@@ -1058,11 +1337,36 @@ function resetQsoEntryOnEscape() {
 		return;
 	}
 
+	// Capture the operating context the user currently has selected BEFORE native
+	// form reset clobbers it with server-session defaults (last logged QSO values).
+	var preBand     = $('#band').val();
+	var preMode     = $('#mode').val();
+	var preSatName  = $('#sat_name').val();
+	var preSatMode  = $('#sat_mode').val();
+	var prePropMode = $('#selectPropagation').val();
+
 	qsoForm.reset();
-	lastCallsignUpdated = '';
+	resetCallsignLookupState();
 	resetDefaultQSOFields();
 	resetToPreviousContactsTab();
 	$('#callsign').trigger('focus');
+
+	// The on('reset') handler runs reset_fields() + clearSatelliteFields() in 100ms.
+	// Re-apply the captured context afterwards so the user stays on the band/mode/
+	// satellite they had selected, not the one from the previous QSO session.
+	setTimeout(function() {
+		$('#band').val(preBand);
+		$('#mode').val(preMode);
+		if (preSatName) {
+			$('#sat_name').val(preSatName);
+			$('#sat_mode').val(preSatMode);
+			$('#selectPropagation').val(prePropMode || 'SAT');
+		}
+		if (typeof setRst === 'function') {
+			setRst($('#mode').val());
+		}
+		syncFromSelectedRadioAfterReset();
+	}, 150);
 }
 
 // Global ESC handling on the QSO page: reset form, return to Previous Contacts, and focus callsign.
@@ -1087,7 +1391,7 @@ $(document).off('keydown.qsoEscapeReset').on('keydown.qsoEscapeReset', function(
 // Also handle when callsign is cleared (empty value entered)
 $('#callsign').on('input keyup', function() {
 	if ($(this).val() === '' && lastCallsignUpdated !== '') {
-		lastCallsignUpdated = '';
+		resetCallsignLookupState();
 		resetDefaultQSOFields();
 		resetToPreviousContactsTab();
 	}
@@ -1392,8 +1696,48 @@ $("#callsign").on("keypress", function(e) {
 	}
 });
 
+function quickLookupDxcc(callsign) {
+	if (!callsign || callsign.length < 3) {
+		return;
+	}
+
+	var requestId = ++callsignDxccQuickRequestId;
+	var find_callsign = callsign.toUpperCase().replace(/\//g, "-").replace('Ø', '0');
+
+	$.getJSON(base_url + 'index.php/logbook/jsondxcc/' + find_callsign, function(result) {
+		if (requestId !== callsignDxccQuickRequestId) {
+			return;
+		}
+
+		var currentCallsign = $('#callsign').val().toUpperCase().replace(/\//g, "-").replace('Ø', '0');
+		if (currentCallsign !== find_callsign) {
+			return;
+		}
+
+		if (result.dxcc && result.dxcc.entity !== undefined) {
+			$('#country').val(convert_case(result.dxcc.entity));
+			$('#callsign_info').text(convert_case(result.dxcc.entity));
+			changebadge(result.dxcc.entity);
+			$('#dxcc_id').val(result.dxcc.adif);
+			$('#cqz').val(result.dxcc.cqz);
+			$('#ituz').val(result.dxcc.ituz);
+		}
+	});
+}
+
 // On Key up check and suggest callsigns
 $("#callsign").keyup(function() {
+	if (callsignDxccQuickTimer) {
+		clearTimeout(callsignDxccQuickTimer);
+	}
+
+	var currentCall = $(this).val();
+	if (currentCall.length >= 3) {
+		callsignDxccQuickTimer = setTimeout(function() {
+			quickLookupDxcc(currentCall);
+		}, 200);
+	}
+
 	if ($(this).val().length >= 3) {
 	  $('.callsign-suggest').show();
 	  $callsign = $(this).val().replace('Ø', '0');
@@ -1414,7 +1758,26 @@ $("#callsign").keyup(function() {
   });
 
 //Reset QSO form Fields function
-function resetDefaultQSOFields() {
+function resetDefaultQSOFields(preserveDxccState) {
+	var keepDxcc = preserveDxccState === true;
+	var preservedCountry = '';
+	var preservedCallsignInfoText = '';
+	var preservedCallsignInfoTitle = '';
+	var preservedCallsignInfoClass = '';
+	var preservedDxccId = '';
+	var preservedCqz = '';
+	var preservedItuz = '';
+
+	if (keepDxcc) {
+		preservedCountry = $('#country').val();
+		preservedCallsignInfoText = $('#callsign_info').text();
+		preservedCallsignInfoTitle = $('#callsign_info').attr('title') || '';
+		preservedCallsignInfoClass = $('#callsign_info').attr('class') || '';
+		preservedDxccId = $('#dxcc_id').val();
+		preservedCqz = $('#cqz').val();
+		preservedItuz = $('#ituz').val();
+	}
+
 	$('#callsign_info').text("");
 	$('#locator_info').text("");
 	$('#country').val("");
@@ -1427,6 +1790,7 @@ function resetDefaultQSOFields() {
 	$('#hamqth_info').text("");
 	$('#dxcc_id').val("").trigger('change');
 	$('#cqz').val("");
+	$('#ituz').val("");
 	$("#locator").removeClass("workedGrid");
 	$("#locator").removeClass("confirmedGrid");
 	$("#locator").removeClass("newGrid");
@@ -1440,6 +1804,16 @@ function resetDefaultQSOFields() {
 	$('#callsign-image-content').text("");
 	$('.dxccsummary').remove();
 	$('#timesWorked').html(lang_qso_title_previous_contacts);
+
+	if (keepDxcc) {
+		$('#country').val(preservedCountry);
+		$('#callsign_info').text(preservedCallsignInfoText);
+		$('#callsign_info').attr('title', preservedCallsignInfoTitle);
+		$('#callsign_info').attr('class', preservedCallsignInfoClass);
+		$('#dxcc_id').val(preservedDxccId);
+		$('#cqz').val(preservedCqz);
+		$('#ituz').val(preservedItuz);
+	}
 }
 
 function closeModal() {