diff --git a/application/controllers/Bandmap.php b/application/controllers/Bandmap.php
index d50bf1c66..15788d870 100644
--- a/application/controllers/Bandmap.php
+++ b/application/controllers/Bandmap.php
@@ -1,129 +1,82 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Bandmap extends CI_Controller {
-
-	function __construct() {
-		parent::__construct();
-
-		$this->load->model('user_model');
-		if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('error', __("You're not allowed to do that!")); redirect('dashboard'); }
-		$this->load->model('bands');
-	}
-
-	function index() {
-		$this->load->model('cat');
-		$this->load->model('bands');
-		$data['radios'] = $this->cat->radios(true);
-		$data['bands'] = $this->bands->get_user_bands_for_qso_entry();
-
-        $footerData = [];
-		$footerData['scripts'] = [
-			'assets/js/highcharts/highcharts.js',
-			'assets/js/highcharts/timeline.js',
-			'assets/js/highcharts/exporting.js',
-			'assets/js/highcharts/accessibility.js',
-			'assets/js/sections/bandmap.js',
-		];
-
-		$data['page_title'] = __("DXCluster");
-		$this->load->view('interface_assets/header', $data);
-		$this->load->view('bandmap/index');
-		$this->load->view('interface_assets/footer', $footerData);
-	}
-
-	function list() {
-		$this->load->model('cat');
-		$this->load->model('bands');
-		$data['radios'] = $this->cat->radios();
-		$data['radio_last_updated'] = $this->cat->last_updated()->row();
-		$data['bands'] = $this->bands->get_user_bands_for_qso_entry();
-
-		$footerData = [];
-		$footerData['scripts'] = [
-			'assets/js/moment.min.js',
-			'assets/js/datetime-moment.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/datetime-moment.js")),
-			'assets/js/cat.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/cat.js")),
-			'assets/js/leaflet/leaflet.geodesic.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/leaflet/leaflet.geodesic.js")),
-			'assets/js/leaflet.polylineDecorator.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/leaflet.polylineDecorator.js")),
-			'assets/js/leaflet/L.Terminator.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/leaflet/L.Terminator.js")),
-			'assets/js/sections/callstats.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/callstats.js")),
-			'assets/js/sections/bandmap_list.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/bandmap_list.js")),
-		];
-
-		// Get Date format
-		if($this->session->userdata('user_date_format')) {
-			// If Logged in and session exists
-			$pageData['custom_date_format'] = $this->session->userdata('user_date_format');
-		} else {
-			// Get Default date format from /config/wavelog.php
-			$pageData['custom_date_format'] = $this->config->item('qso_date_format');
-		}
-
-		switch ($pageData['custom_date_format']) {
-		case "d/m/y": $pageData['custom_date_format'] = 'DD/MM/YY'; break;
-		case "d/m/Y": $pageData['custom_date_format'] = 'DD/MM/YYYY'; break;
-		case "m/d/y": $pageData['custom_date_format'] = 'MM/DD/YY'; break;
-		case "m/d/Y": $pageData['custom_date_format'] = 'MM/DD/YYYY'; break;
-		case "d.m.Y": $pageData['custom_date_format'] = 'DD.MM.YYYY'; break;
-		case "y/m/d": $pageData['custom_date_format'] = 'YY/MM/DD'; break;
-		case "Y-m-d": $pageData['custom_date_format'] = 'YYYY-MM-DD'; break;
-		case "M d, Y": $pageData['custom_date_format'] = 'MMM DD, YYYY'; break;
-		case "M d, y": $pageData['custom_date_format'] = 'MMM DD, YY'; break;
-		default: $pageData['custom_date_format'] = 'DD/MM/YYYY';
-		}
-
-		$data['page_title'] = __("DXCluster");
-		$this->load->view('interface_assets/header', $data);
-		$this->load->view('bandmap/list',$pageData);
-		$this->load->view('interface_assets/footer', $footerData);
-	}
-
-	// Get user's favorite bands and modes (active ones)
-	function get_user_favorites() {
-		session_write_close();
-
-		$this->load->model('bands');
-		$this->load->model('usermodes');
-
-		// Get active bands
-		$activeBands = $this->bands->get_user_bands_for_qso_entry(false); // false = only active
-		$bandList = [];
-
-		if (is_array($activeBands)) {
-			foreach ($activeBands as $group => $bands) {
-				if (is_array($bands)) {
-					foreach ($bands as $band) {
-						$bandList[] = $band;
-					}
-				}
-			}
-		}
-
-		// Get active modes (user-specific) and categorize them
-		$activeModes = $this->usermodes->active();
-		$modeCategories = [
-			'cw' => false,
-			'phone' => false,
-			'digi' => false
-		];
-
-		if ($activeModes) {
-			foreach ($activeModes as $mode) {
-				$qrgmode = strtoupper($mode->qrgmode ?? '');
-				if ($qrgmode === 'CW') {
-					$modeCategories['cw'] = true;
-				} elseif ($qrgmode === 'SSB') {
-					$modeCategories['phone'] = true;
-				} elseif ($qrgmode === 'DATA') {
-					$modeCategories['digi'] = true;
-				}
-			}
-		}
-
-		header('Content-Type: application/json');
-		echo json_encode([
-			'bands' => $bandList,
-			'modes' => $modeCategories
-		]);
-	}
-}
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Bandmap extends CI_Controller {
+
+	function __construct() {
+		parent::__construct();
+
+		$this->load->model('user_model');
+		if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('error', __("You're not allowed to do that!")); redirect('dashboard'); }
+		$this->load->model('bands');
+	}
+
+	function index() {
+		$this->load->model('cat');
+		$this->load->model('bands');
+		$data['radios'] = $this->cat->radios(true);
+		$data['bands'] = $this->bands->get_user_bands_for_qso_entry();
+
+        $footerData = [];
+		$footerData['scripts'] = [
+			'assets/js/highcharts/highcharts.js',
+			'assets/js/highcharts/timeline.js',
+			'assets/js/highcharts/exporting.js',
+			'assets/js/highcharts/accessibility.js',
+			'assets/js/sections/bandmap.js',
+		];
+
+		$data['page_title'] = __("DXCluster");
+		$this->load->view('interface_assets/header', $data);
+		$this->load->view('bandmap/index');
+		$this->load->view('interface_assets/footer', $footerData);
+	}
+
+	function list() {
+		$this->load->model('cat');
+		$this->load->model('bands');
+		$data['radios'] = $this->cat->radios();
+		$data['radio_last_updated'] = $this->cat->last_updated()->row();
+		$data['bands'] = $this->bands->get_user_bands_for_qso_entry();
+
+		$footerData = [];
+		$footerData['scripts'] = [
+			'assets/js/moment.min.js',
+			'assets/js/datetime-moment.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/datetime-moment.js")),
+			'assets/js/cat.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/cat.js")),
+			'assets/js/leaflet/leaflet.geodesic.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/leaflet/leaflet.geodesic.js")),
+			'assets/js/leaflet.polylineDecorator.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/leaflet.polylineDecorator.js")),
+			'assets/js/leaflet/L.Terminator.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/leaflet/L.Terminator.js")),
+			'assets/js/sections/callstats.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/callstats.js")),
+			'assets/js/sections/bandmap_list.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/bandmap_list.js")),
+		];
+
+		// Get Date format
+		if($this->session->userdata('user_date_format')) {
+			// If Logged in and session exists
+			$pageData['custom_date_format'] = $this->session->userdata('user_date_format');
+		} else {
+			// Get Default date format from /config/wavelog.php
+			$pageData['custom_date_format'] = $this->config->item('qso_date_format');
+		}
+
+		switch ($pageData['custom_date_format']) {
+		case "d/m/y": $pageData['custom_date_format'] = 'DD/MM/YY'; break;
+		case "d/m/Y": $pageData['custom_date_format'] = 'DD/MM/YYYY'; break;
+		case "m/d/y": $pageData['custom_date_format'] = 'MM/DD/YY'; break;
+		case "m/d/Y": $pageData['custom_date_format'] = 'MM/DD/YYYY'; break;
+		case "d.m.Y": $pageData['custom_date_format'] = 'DD.MM.YYYY'; break;
+		case "y/m/d": $pageData['custom_date_format'] = 'YY/MM/DD'; break;
+		case "Y-m-d": $pageData['custom_date_format'] = 'YYYY-MM-DD'; break;
+		case "M d, Y": $pageData['custom_date_format'] = 'MMM DD, YYYY'; break;
+		case "M d, y": $pageData['custom_date_format'] = 'MMM DD, YY'; break;
+		default: $pageData['custom_date_format'] = 'DD/MM/YYYY';
+		}
+
+		$data['page_title'] = __("DXCluster");
+		$this->load->view('interface_assets/header', $data);
+		$this->load->view('bandmap/list',$pageData);
+		$this->load->view('interface_assets/footer', $footerData);
+	}
+
+	// Get user's active bands and modes/submodes
+}
diff --git a/application/controllers/User_options.php b/application/controllers/User_options.php
index 6e89a13c9..e44fabceb 100644
--- a/application/controllers/User_options.php
+++ b/application/controllers/User_options.php
@@ -1,71 +1,186 @@
-<?php
-
-class User_Options extends CI_Controller {
-
-	function __construct() {
-		parent::__construct();
-		$this->load->model('user_model');
-		$this->load->model('user_options_model');
-		if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('error', __("You're not allowed to do that!")); redirect('dashboard'); }
-	}
-
-	public function add_edit_fav() {
-		$obj = json_decode(file_get_contents("php://input"), true);
-		foreach($obj as $option_key => $option_value) {
-			$obj[$option_key]=$this->security->xss_clean($option_value);
-		}
-		if ($obj['sat_name'] ?? '' != '') {
-			$option_name=$obj['sat_name'].'/'.$obj['mode'];
-		} else {
-			$option_name=$obj['band'].'/'.$obj['mode'];
-		}
-		$this->user_options_model->set_option('Favourite',$option_name, $obj);
-		$jsonout['success']=1;
-		header('Content-Type: application/json');
-		echo json_encode($jsonout);
-	}
-
-	public function get_fav() {
-		$result=$this->user_options_model->get_options('Favourite');
-		$jsonout=[];
-		foreach($result->result() as $options) {
-			$jsonout[$options->option_name][$options->option_key]=$options->option_value;
-		}
-		header('Content-Type: application/json');
-		echo json_encode($jsonout);
-	}
-
-	public function del_fav() {
-		$result=$this->user_options_model->get_options('Favourite');
-		$obj = json_decode(file_get_contents("php://input"), true);
-		if ($obj['option_name'] ?? '' != '') {
-			$option_name=$this->security->xss_clean($obj['option_name']);
-			$this->user_options_model->del_option('Favourite',$option_name);	
-		}
-		$jsonout['success']=1;
-		header('Content-Type: application/json');
-		echo json_encode($jsonout);
-	}
-
-	public function dismissVersionDialog() {
-		$this->user_options_model->set_option('version_dialog', 'confirmed', array('boolean' => 'true'));
-	}
-
-	public function get_qrg_units() {
-
-		$qrg_units = [];
-
-		foreach($this->session->get_userdata() as $key => $value) {
-			if (strpos($key, 'qrgunit_') === 0) {
-				$band = str_replace('qrgunit_', '', $key);
-				$qrg_units[$band] = $value;
-			}
-		}
-
-		header('Content-Type: application/json');
-		echo json_encode($qrg_units);
-	}
-}
-
-
-?>
+<?php
+
+class User_Options extends CI_Controller {
+
+	function __construct() {
+		parent::__construct();
+		$this->load->model('user_model');
+		$this->load->model('user_options_model');
+		if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('error', __("You're not allowed to do that!")); redirect('dashboard'); }
+	}
+
+	public function add_edit_fav() {
+		$obj = json_decode(file_get_contents("php://input"), true);
+		foreach($obj as $option_key => $option_value) {
+			$obj[$option_key]=$this->security->xss_clean($option_value);
+		}
+		if ($obj['sat_name'] ?? '' != '') {
+			$option_name=$obj['sat_name'].'/'.$obj['mode'];
+		} else {
+			$option_name=$obj['band'].'/'.$obj['mode'];
+		}
+		$this->user_options_model->set_option('Favourite',$option_name, $obj);
+		$jsonout['success']=1;
+		header('Content-Type: application/json');
+		echo json_encode($jsonout);
+	}
+
+	public function get_fav() {
+		$result=$this->user_options_model->get_options('Favourite');
+		$jsonout=[];
+		foreach($result->result() as $options) {
+			$jsonout[$options->option_name][$options->option_key]=$options->option_value;
+		}
+		header('Content-Type: application/json');
+		echo json_encode($jsonout);
+	}
+
+	public function del_fav() {
+		$result=$this->user_options_model->get_options('Favourite');
+		$obj = json_decode(file_get_contents("php://input"), true);
+		if ($obj['option_name'] ?? '' != '') {
+			$option_name=$this->security->xss_clean($obj['option_name']);
+			$this->user_options_model->del_option('Favourite',$option_name);
+		}
+		$jsonout['success']=1;
+		header('Content-Type: application/json');
+		echo json_encode($jsonout);
+	}
+
+	public function dismissVersionDialog() {
+		$this->user_options_model->set_option('version_dialog', 'confirmed', array('boolean' => 'true'));
+	}
+
+	/**
+	 * DX Cluster Filter Favorites
+	 */
+	public function add_edit_dxcluster_fav() {
+		$obj = json_decode(file_get_contents("php://input"), true);
+		if (!$obj || !isset($obj['fav_name']) || trim($obj['fav_name']) === '') {
+			header('Content-Type: application/json');
+			echo json_encode(['success' => 0, 'error' => 'Invalid data']);
+			return;
+		}
+
+		// Sanitize all input
+		foreach($obj as $option_key => $option_value) {
+			if (is_array($option_value)) {
+				$obj[$option_key] = array_map([$this->security, 'xss_clean'], $option_value);
+			} else {
+				$obj[$option_key] = $this->security->xss_clean($option_value);
+			}
+		}
+
+		$option_name = $obj['fav_name'];
+		unset($obj['fav_name']); // Don't store the name as a value
+
+		// Convert arrays to JSON for storage
+		foreach($obj as $key => $value) {
+			if (is_array($value)) {
+				$obj[$key] = json_encode($value);
+			}
+		}
+
+		$this->user_options_model->set_option('DXClusterFavourite', $option_name, $obj);
+		$jsonout['success'] = 1;
+		header('Content-Type: application/json');
+		echo json_encode($jsonout);
+	}
+
+	public function del_dxcluster_fav() {
+		$obj = json_decode(file_get_contents("php://input"), true);
+		if ($obj['option_name'] ?? '' != '') {
+			$option_name = $this->security->xss_clean($obj['option_name']);
+			$this->user_options_model->del_option('DXClusterFavourite', $option_name);
+		}
+		$jsonout['success'] = 1;
+		header('Content-Type: application/json');
+		echo json_encode($jsonout);
+	}
+
+	public function get_qrg_units() {
+
+		$qrg_units = [];
+
+		foreach($this->session->get_userdata() as $key => $value) {
+			if (strpos($key, 'qrgunit_') === 0) {
+				$band = str_replace('qrgunit_', '', $key);
+				$qrg_units[$band] = $value;
+			}
+		}
+
+		header('Content-Type: application/json');
+		echo json_encode($qrg_units);
+	}
+
+        /**
+         * Combined endpoint: DX Cluster favorites + user bands/modes settings
+         * Returns both favorites and user configuration in a single request
+         */
+        public function get_dxcluster_user_favs_and_settings() {
+                session_write_close();
+                
+                // Get DX Cluster favorites
+                $result = $this->user_options_model->get_options('DXClusterFavourite');
+                $favorites = [];
+                foreach($result->result() as $options) {
+                        $value = $options->option_value;
+                        if (is_string($value) && (strpos($value, '[') === 0 || strpos($value, '{') === 0)) {
+                                $decoded = json_decode($value, true);
+                                if (json_last_error() === JSON_ERROR_NONE) {
+                                        $value = $decoded;
+                                }
+                        }
+                        $favorites[$options->option_name][$options->option_key] = $value;
+                }
+
+                // Get user bands and modes
+                $this->load->model('bands');
+                $this->load->model('usermodes');
+
+                $activeBands = $this->bands->get_user_bands_for_qso_entry(false);
+                $bandList = [];
+                if (is_array($activeBands)) {
+                        foreach ($activeBands as $group => $bands) {
+                                if (is_array($bands)) {
+                                        foreach ($bands as $band) {
+                                                $bandList[] = $band;
+                                        }
+                                }
+                        }
+                }
+
+                $activeModes = $this->usermodes->active();
+                $modeCategories = ['cw' => false, 'phone' => false, 'digi' => false];
+                $submodes = [];
+
+                if ($activeModes) {
+                        foreach ($activeModes as $mode) {
+                                $qrgmode = strtoupper($mode->qrgmode ?? '');
+                                if ($qrgmode === 'CW') {
+                                        $modeCategories['cw'] = true;
+                                } elseif ($qrgmode === 'SSB') {
+                                        $modeCategories['phone'] = true;
+                                } elseif ($qrgmode === 'DATA') {
+                                        $modeCategories['digi'] = true;
+                                }
+                                $submode = !empty($mode->submode) ? $mode->submode : $mode->mode;
+                                if (!empty($submode) && !in_array($submode, $submodes)) {
+                                        $submodes[] = $submode;
+                                }
+                        }
+                }
+
+                header('Content-Type: application/json');
+                echo json_encode([
+                        'favorites' => $favorites,
+                        'userConfig' => [
+                                'bands' => $bandList,
+                                'modes' => $modeCategories,
+                                'submodes' => $submodes
+                        ]
+                ]);
+        }
+}
+
+?>
diff --git a/application/views/bandmap/list.php b/application/views/bandmap/list.php
index bb88466ab..5f33310c4 100644
--- a/application/views/bandmap/list.php
+++ b/application/views/bandmap/list.php
@@ -16,7 +16,7 @@
 	var lang_bandmap_cat_required = "<?= __("CAT Connection Required"); ?>";
 	var lang_bandmap_enable_cat = "<?= __("Enable CAT connection to tune the radio"); ?>";
 	var lang_bandmap_clear_filters = "<?= __("Clear Filters"); ?>";
-	var lang_bandmap_band_preserved = "<?= __("Band filter preserved (CAT connection is active)"); ?>";
+	var lang_bandmap_band_preserved = "<?= __("Band filter preserved (band lock is active)"); ?>";
 	var lang_bandmap_radio = "<?= __("Radio"); ?>";
 	var lang_bandmap_radio_none = "<?= __("Radio set to None - CAT connection disabled"); ?>";
 	var lang_bandmap_radio_tuned = "<?= __("Radio Tuned"); ?>";
@@ -28,9 +28,12 @@
 	var lang_bandmap_sent_to_form = "<?= __("sent to logging form"); ?>";
 	var lang_bandmap_cat_control = "<?= __("CAT Connection"); ?>";
 	var lang_bandmap_cat_off = "<?= __("Click to enable CAT connection"); ?>";
-	var lang_bandmap_cat_on = "<?= __("CAT following radio | Click for frequency marker | Double-click to disable"); ?>";
-	var lang_bandmap_cat_marker = "<?= __("Frequency marker active | Click to disable marker | Double-click to disable CAT"); ?>";
-	var lang_bandmap_freq_changed = "<?= __("Frequency filter changed to"); ?>";
+	var lang_bandmap_cat_on = "<?= __("CAT following radio - Click to disable"); ?>";
+	var lang_bandmap_cat_lock_off = "<?= __("Click to enable band lock (requires CAT connection)"); ?>";
+	var lang_bandmap_cat_lock_on = "<?= __("Band lock active - Click to disable"); ?>";
+	var lang_bandmap_band_lock = "<?= __("Band Lock"); ?>";
+	var lang_bandmap_band_lock_enabled = "<?= __("Band lock enabled - band filter will track radio band"); ?>";
+	var lang_bandmap_freq_changed = "<?= __("Band filter changed to"); ?>";
 	var lang_bandmap_by_transceiver = "<?= __("by transceiver"); ?>";
 	var lang_bandmap_freq_filter_set = "<?= __("Frequency filter set to"); ?>";
 	var lang_bandmap_freq_outside = "<?= __("Frequency outside known bands - showing all bands"); ?>";
@@ -40,6 +43,30 @@
 	var lang_bandmap_modes_applied = "<?= __("Modes applied. Band filter preserved (CAT connection is active)"); ?>";
 	var lang_bandmap_favorites_applied = "<?= __("Applied your favorite bands and modes"); ?>";
 
+	// My Submodes filter translations
+	var lang_bandmap_my_submodes = "<?= __("My Submodes"); ?>";
+	var lang_bandmap_submodes_filter_enabled = "<?= __("Submode filter enabled"); ?>";
+	var lang_bandmap_submodes_filter_disabled = "<?= __("Submode filter disabled - showing all"); ?>";
+	var lang_bandmap_required_submodes = "<?= __("Required submodes"); ?>";
+	var lang_bandmap_submodes_settings_hint = "<?= __("Configure in User Settings - Modes"); ?>";
+	var lang_bandmap_no_submodes_configured = "<?= __("No submodes configured - configure in User Settings - Modes"); ?>";
+	var lang_bandmap_no_submodes_warning = "<?= __("No submodes enabled in settings - showing all spots"); ?>";
+	var lang_bandmap_mode_disabled_no_submode = "<?= __("Disabled - no submodes enabled for this mode in User Settings"); ?>";
+	var lang_bandmap_toggle_cw = "<?= __("Toggle CW mode filter"); ?>";
+	var lang_bandmap_toggle_digi = "<?= __("Toggle Digital mode filter"); ?>";
+	var lang_bandmap_toggle_phone = "<?= __("Toggle Phone mode filter"); ?>";
+
+	// DX Cluster Filter Favorites translations
+	var lang_bandmap_filter_favorites = "<?= __("Favorites"); ?>";
+	var lang_bandmap_save_filters = "<?= __("Save Current Filters..."); ?>";
+	var lang_bandmap_filter_preset_name = "<?= __("Enter a name for this filter preset:"); ?>";
+	var lang_bandmap_filter_preset_saved = "<?= __("Filter preset saved"); ?>";
+	var lang_bandmap_filter_preset_loaded = "<?= __("Filter preset loaded"); ?>";
+	var lang_bandmap_filter_preset_deleted = "<?= __("Filter preset deleted"); ?>";
+	var lang_bandmap_delete_filter_confirm = "<?= __("Are you sure to delete this filter preset?"); ?>";
+	var lang_bandmap_no_filter_presets = "<?= __("No saved filter presets"); ?>";
+	var lang_bandmap_preset_limit_reached = "<?= __("Maximum of 20 filter presets reached. Please delete some before adding new ones."); ?>";
+
 	// Bandmap filter status messages
 	var lang_bandmap_loading_data = "<?= __("Loading data from DX Cluster"); ?>";
 	var lang_bandmap_last_fetched = "<?= __("Last fetched for"); ?>";
@@ -140,8 +167,8 @@
 	var lang_bandmap_mode = "<?= __("Mode"); ?>";
 	var lang_bandmap_band = "<?= __("Band"); ?>";
 
-	// Enable ultra-compact radio status display for bandmap page (tooltip only)
-	window.CAT_COMPACT_MODE = 'ultra-compact';
+	// Enable icon-only radio status display for bandmap page (just icon with tooltip)
+	window.CAT_COMPACT_MODE = 'icon-only';
 
 	// Map configuration (matches QSO map settings)
 	var map_tile_server = '<?php echo $this->optionslib->get_option('option_map_tile_server');?>';
@@ -180,6 +207,9 @@
 			<a href="https://github.com/wavelog/wavelog/wiki/DXCluster" target="_blank" title="<?= __("DX Cluster Help"); ?>" style="cursor: pointer; padding: 0.5rem; margin: -0.5rem; color: var(--bs-body-color); text-decoration: none; display: inline-flex; align-items: center;">
 				<i class="fas fa-question-circle" style="font-size: 1.2rem;"></i>
 			</a>
+			<button type="button" class="btn btn-sm" id="compactModeToggle" title="<?= __("Compact Mode - Hide/Show Menu"); ?>" style="background: none; border: none; padding: 0.5rem; margin: -0.5rem; color: var(--bs-body-color);">
+				<i class="fas fa-compress-alt" id="compactModeIcon" style="font-size: 1.2rem;"></i>
+			</button>
 			<div id="fullscreenToggleWrapper" style="cursor: pointer; padding: 0.5rem; margin: -0.5rem;">
 				<button type="button" class="btn btn-sm" id="fullscreenToggle" title="<?= __("Toggle Fullscreen"); ?>" style="background: none; border: none; padding: 0.5rem;">
 					<i class="fas fa-expand" id="fullscreenIcon" style="font-size: 1.2rem;"></i>
@@ -192,15 +222,20 @@
 		<!-- Filters Section with darker background and rounded corners -->
 		<div class="menu-bar">
 	<!-- Row 1: CAT Connection, Radio Selector, Radio Status (left) | de Continents (right) -->
-	<div class="d-flex flex-wrap align-items-center gap-2 mb-2">
-		<!-- Left: CAT Connection Button -->
-		<button class="btn btn-sm btn-secondary flex-shrink-0" type="button" id="toggleCatTracking" data-bs-toggle="tooltip" data-bs-placement="bottom">
-			<i class="fas fa-radio"></i> <span class="d-none d-sm-inline"><?= __("CAT Connection"); ?></span> <i class="fas fa-info-circle text-muted" style="font-size: 0.75rem;"></i>
-		</button>
+	<div class="d-flex flex-wrap align-items-center gap-2 mb-2 compactable-row">
+		<!-- Left: CAT Connection + Lock Buttons -->
+		<div class="btn-group flex-shrink-0" role="group">
+			<button class="btn btn-sm btn-secondary" type="button" id="toggleCatTracking" data-bs-toggle="tooltip" data-bs-placement="bottom" title="<?= __("Click to enable CAT connection"); ?>">
+				<i class="fas fa-radio"></i> <span class="d-none d-sm-inline"><?= __("CAT Connection"); ?></span>
+			</button>
+			<button class="btn btn-sm btn-secondary" type="button" id="toggleCatLock" data-bs-toggle="tooltip" data-bs-placement="bottom" title="<?= __("Click to enable band lock (requires CAT connection)"); ?>" disabled>
+				<i class="fas fa-lock-open"></i>
+			</button>
+		</div>
 
 		<!-- Radio Selector Dropdown -->
 		<small class="text-muted me-1 flex-shrink-0 d-none d-md-inline"><?= __("TRX:"); ?></small>
-		<select class="form-select form-select-sm radios flex-shrink-0" id="radio" name="radio" style="width: auto; min-width: 150px;">
+		<select class="form-select form-select-sm radios flex-shrink-0" id="radio" name="radio" style="width: auto;">
 			<option value="0" selected="selected"><?= __("None"); ?></option>
 			<option value="ws"<?php if ($this->session->userdata('radio') == 'ws') { echo ' selected="selected"'; } ?>><?= __("Live - ") . __("WebSocket (Requires WLGate>=1.1.10)"); ?></option>
 			<?php foreach ($radios->result() as $row) { ?>
@@ -215,7 +250,7 @@
 		<div class="d-flex flex-wrap gap-2 align-items-center">
 			<small class="text-muted me-1 flex-shrink-0"><?= __("de:"); ?></small>
 			<div class="btn-group flex-shrink-0" role="group">
-				<button class="btn btn-sm btn-secondary" type="button" id="toggleAllContinentsFilter" title="<?= __("Select all continents"); ?>"><?= __("World"); ?></button>
+				<button class="btn btn-sm btn-secondary" type="button" id="toggleAllContinentsFilter" title="<?= __("Select all continents"); ?>"><i class="fas fa-globe"></i> <span class="d-none d-sm-inline"><?= __("World"); ?></span></button>
 				<button class="btn btn-sm btn-secondary" type="button" id="toggleAfricaFilter" title="<?= __("Toggle Africa continent filter"); ?>">AF</button>
 				<button class="btn btn-sm btn-secondary" type="button" id="toggleAntarcticaFilter" title="<?= __("Toggle Antarctica continent filter"); ?>">AN</button>
 				<button class="btn btn-sm btn-secondary" type="button" id="toggleAsiaFilter" title="<?= __("Toggle Asia continent filter"); ?>">AS</button>
@@ -228,7 +263,7 @@
 	</div>
 
 	<!-- Row 2: Advanced Filters, Favorites, Clear Filters | Band Filters (left) and Mode Filters (right) -->
-	<div class="d-flex flex-wrap align-items-center gap-2 mb-2">
+	<div class="d-flex flex-wrap align-items-center gap-2 mb-2 compactable-row">
 		<!-- Left: Advanced Filters, Favorites, Clear Filters, and Band Filter Buttons -->
 		<div class="d-flex flex-wrap gap-2 align-items-center">
 			<!-- Button Group: Advanced Filters + Favorites + Clear Filters -->
@@ -276,6 +311,7 @@
 						<label class="form-label d-block filter-label-small" for="requiredFlags"><?= __("Required Flags"); ?></label>
 						<select id="requiredFlags" class="form-select form-select-sm filter-short" name="required_flags" multiple="multiple">
 							<option value="None" selected><?= __("None"); ?></option>
+							<option value="mysubmodes"><?= __("My Submodes"); ?></option>
 							<option value="lotw"><?= __("LoTW User"); ?></option>
 							<option value="newcontinent"><?= __("New Continent"); ?></option>
 							<option value="newcountry"><?= __("New Country"); ?></option>
@@ -378,15 +414,22 @@
 				</div>
 			</div>
 		</div>
-				<!-- Favorites Button (part of button group) -->
-				<button class="btn btn-sm btn-secondary" type="button" id="toggleFavoritesFilter" title="<?= __("Apply your favorite bands and modes (configured in Band and Mode settings)"); ?>" style="display: none;">
-					<i class="fas fa-star text-warning"></i>
-				</button>
-				<!-- Clear Filters Button (part of button group) -->
-				<button class="btn btn-sm btn-secondary" type="button" id="clearFiltersButtonQuick" title="<?= __("Clear all filters except De Continent"); ?>">
-					<i class="fas fa-filter-circle-xmark text-danger"></i>
-				</button>
 			</div>
+			<!-- DX Cluster Filter Favorites Dropdown -->
+			<div class="dropdown flex-shrink-0">
+				<button class="btn btn-sm btn-secondary dropdown-toggle" type="button" id="dxclusterFavDropdown" data-bs-toggle="dropdown" aria-expanded="false" title="<?= __("Filter Favorites"); ?>">
+					<i class="fas fa-star text-warning"></i> <span class="d-none d-md-inline"><?= __("Favorites"); ?></span>
+				</button>
+				<div class="dropdown-menu" aria-labelledby="dxclusterFavDropdown" style="min-width: 200px;">
+					<a class="dropdown-item" href="#" id="dxcluster_fav_add"><i class="fas fa-plus-circle text-success me-2"></i><?= __("Save Current Filters..."); ?></a>
+					<div class="dropdown-divider"></div>
+					<div id="dxcluster_fav_menu"></div>
+				</div>
+			</div>
+			<!-- Clear Filters Button -->
+			<button class="btn btn-sm btn-secondary flex-shrink-0" type="button" id="clearFiltersButtonQuick" title="<?= __("Clear all filters except De Continent"); ?>">
+				<i class="fas fa-filter-circle-xmark text-danger"></i>
+			</button>
 
 			<!-- MF Band -->
 			<div class="btn-group flex-shrink-0" role="group">
@@ -404,6 +447,10 @@
 				<button class="btn btn-sm btn-secondary" type="button" id="toggle12mFilter" title="<?= __("Toggle 12m band filter"); ?>">12m</button>
 				<button class="btn btn-sm btn-secondary" type="button" id="toggle10mFilter" title="<?= __("Toggle 10m band filter"); ?>">10m</button>
 			</div>
+			<!-- 6m Band -->
+			<div class="btn-group flex-shrink-0" role="group">
+				<button class="btn btn-sm btn-secondary" type="button" id="toggle6mFilter" title="<?= __("Toggle 6m band filter"); ?>">6m</button>
+			</div>
 			<!-- VHF/UHF/SHF Bands -->
 			<div class="btn-group flex-shrink-0" role="group">
 				<button class="btn btn-sm btn-secondary" type="button" id="toggleVHFFilter" title="<?= __("Toggle VHF bands filter"); ?>">VHF</button>
@@ -418,15 +465,19 @@
 		<!-- Right: Mode Filter Buttons -->
 		<div class="d-flex flex-wrap gap-2 align-items-center">
 			<div class="btn-group flex-shrink-0" role="group">
-				<button class="btn btn-sm btn-secondary" type="button" id="toggleCwFilter" title="<?= __("Toggle CW mode filter"); ?>">CW</button>
-				<button class="btn btn-sm btn-secondary" type="button" id="toggleDigiFilter" title="<?= __("Toggle Digital mode filter"); ?>">Digi</button>
-				<button class="btn btn-sm btn-secondary" type="button" id="togglePhoneFilter" title="<?= __("Toggle Phone mode filter"); ?>">Phone</button>
+				<button class="btn btn-sm btn-secondary" type="button" id="toggleCwFilter" title="<?= __("Toggle CW mode filter"); ?>"><i class="fas fa-wave-square"></i> <span class="d-none d-sm-inline">CW</span></button>
+				<button class="btn btn-sm btn-secondary" type="button" id="toggleDigiFilter" title="<?= __("Toggle Digital mode filter"); ?>"><i class="fas fa-keyboard"></i> <span class="d-none d-sm-inline">Digi</span></button>
+				<button class="btn btn-sm btn-secondary" type="button" id="togglePhoneFilter" title="<?= __("Toggle Phone mode filter"); ?>"><i class="fas fa-microphone"></i> <span class="d-none d-sm-inline">Phone</span></button>
 			</div>
 		</div>
 	</div>
 
 	<!-- Row 3: Quick Filters -->
-	<div class="d-flex flex-wrap align-items-center gap-2 mb-2">
+	<div class="d-flex flex-wrap align-items-center gap-2 mb-2 compactable-row">
+		<!-- My Submodes Filter Toggle -->
+		<button class="btn btn-sm btn-secondary flex-shrink-0" type="button" id="toggleMySubmodesFilter" title="<?= __("Loading submodes..."); ?>">
+			<i class="fas fa-bookmark"></i> <span class="d-none d-lg-inline"><?= __("My Submodes"); ?></span>
+		</button>
 		<!-- LoTW Users Button (separate) -->
 		<div class="btn-group flex-shrink-0" role="group">
 			<button class="btn btn-sm btn-secondary" type="button" id="toggleLotwFilter" title="<?= __("Toggle LoTW User filter"); ?>">
@@ -471,8 +522,8 @@
 		</div>
 	</div>
 
-	<!-- Row 5: Status Bar (70%) and Search (30%) -->
-	<div class="d-flex flex-wrap align-items-center gap-2 mb-2">
+	<!-- Row 5: Status Bar and Search - always stay together -->
+	<div class="d-flex flex-wrap align-items-center gap-2 mb-2 status-search-row">
 		<!-- Status Bar - 70% -->
 		<div style="flex: 1 1 0; min-width: 300px;">
 			<div class="status-bar">
diff --git a/assets/css/bandmap_list.css b/assets/css/bandmap_list.css
index 8beb90fd4..f849df667 100644
--- a/assets/css/bandmap_list.css
+++ b/assets/css/bandmap_list.css
@@ -1,79 +1,59 @@
-/* Always show vertical scrollbar to prevent layout shifts */
-html {
-	overflow-y: scroll;
+/**
+ * DX Cluster Bandmap Stylesheet
+ * Breakpoints: 768px (tablet), 576px (mobile)
+ */
+
+/* ===========================================
+   1. CSS VARIABLES & GLOBAL
+   =========================================== */
+
+:root {
+	--cat-purple: #8b5cf6;
+	--spot-fresh-blue: #3981b2;
+	--spot-expiring-red: rgba(220, 53, 69, 0.25);
+	--spot-new-green: rgba(25, 135, 84, 0.2);
+	--spot-hover-blue: rgba(13, 110, 253, 0.15);
 }
 
-/* Blink animation for radio icon updates */
+html { overflow-y: scroll; }
+
+/* ===========================================
+   2. ANIMATIONS
+   =========================================== */
+
 @keyframes blink-once {
 	0%, 100% { opacity: 1; }
 	50% { opacity: 0.3; }
 }
 
-.blink-once {
-	animation: blink-once 0.6s ease-in-out;
-}
+.blink-once { animation: blink-once 0.6s ease-in-out; }
+
+/* ===========================================
+   3. BADGE STYLES
+   =========================================== */
 
-/* Reserve space for badge counts to prevent layout shifts */
 .band-count-badge,
 .mode-count-badge,
 .quick-filter-count-badge {
 	display: inline-block;
-	min-width: 2em;
+	min-width: 1.8em;
 	text-align: center;
-	padding-left: 0.4em;
-	padding-right: 0.4em;
+	padding: 0.15em 0.25em;
+	line-height: 1.2;
 }
 
-/* Medal badge colors */
-.text-bg-gold {
-	background-color: #FFD700 !important;
-	color: #fff !important;
-	border: 1px solid #FFA500 !important;
-	text-shadow: 0 0 2px rgba(0,0,0,0.3);
-}
+.text-bg-gold { background-color: #FFD700 !important; color: #fff !important; border: 1px solid #FFA500 !important; text-shadow: 0 0 2px rgba(0,0,0,0.3); }
+.text-bg-silver { background-color: #A8A8A8 !important; color: #fff !important; border: 1px solid #E0E0E0 !important; }
+.text-bg-bronze { background-color: #CD7F32 !important; color: #fff !important; border: 1px solid #8B4513 !important; }
 
-.text-bg-silver {
-	background-color: #A8A8A8 !important;
-	color: #fff !important;
-	border: 1px solid #E0E0E0 !important;
-}
+.badge.text-bg-success { border: 1px solid #198754 !important; }
+.badge.text-bg-primary { border: 1px solid #0a58ca !important; }
+.badge.text-bg-info { border: 1px solid #087990 !important; }
+.badge.text-bg-warning { border: 1px solid #cc9a06 !important; }
+.badge.text-bg-danger { border: 1px solid #b02a37 !important; }
+.badge.text-bg-dark { border: 1px solid #000 !important; }
+.badge.text-bg-secondary { border: 1px solid #41464b !important; }
 
-.text-bg-bronze {
-	background-color: #CD7F32 !important;
-	color: #fff !important;
-	border: 1px solid #8B4513 !important;
-}
-
-/* Badge borders for all badge types */
-.badge.text-bg-success {
-	border: 1px solid #198754 !important;
-}
-
-.badge.text-bg-primary {
-	border: 1px solid #0a58ca !important;
-}
-
-.badge.text-bg-info {
-	border: 1px solid #087990 !important;
-}
-
-.badge.text-bg-warning {
-	border: 1px solid #cc9a06 !important;
-}
-
-.badge.text-bg-danger {
-	border: 1px solid #b02a37 !important;
-}
-
-.badge.text-bg-dark {
-	border: 1px solid #000 !important;
-}
-
-.badge.text-bg-secondary {
-	border: 1px solid #41464b !important;
-}
-
-/* Fix icon alignment in badges */
 .spottable .badge i {
 	vertical-align: middle;
 	line-height: 1;
@@ -82,230 +62,24 @@ html {
 	width: 100%;
 }
 
-/* Center medal icons specifically */
-.spottable .badge i.fa-medal {
-	margin-left: 1px;
+.spottable .badge i.fa-medal { margin-left: 1px; }
+
+/* ===========================================
+   4. SPOT TABLE - BASE
+   =========================================== */
+
+#bandmapContainer {
+	max-width: 1910px !important;
+	margin: 0 auto;
 }
 
-.fresh {
-	transition: all 500ms ease;
-	--bs-table-bg: #3981b2;
-	--bs-table-accent-bg: #3981b2;
-}
-
-/* TTL-based spot styling - Expiring spots (TTL=0) */
-.spot-expiring {
-	transition: all 300ms ease;
-	--bs-table-bg: rgba(220, 53, 69, 0.25) !important;  /* Bootstrap danger color, subtle */
-	--bs-table-accent-bg: rgba(220, 53, 69, 0.25) !important;
-	background-color: rgba(220, 53, 69, 0.25) !important;
-}
-
-/* Very new spots (< 1 minute old) */
-.spot-very-new {
-	transition: all 300ms ease;
-	--bs-table-bg: rgba(25, 135, 84, 0.2) !important;  /* Bootstrap success color, light */
-	--bs-table-accent-bg: rgba(25, 135, 84, 0.2) !important;
-	background-color: rgba(25, 135, 84, 0.2) !important;
-}
-
-/* Hover effect for all spot rows */
-.spottable tbody tr:hover {
-	--bs-table-bg: rgba(13, 110, 253, 0.15) !important;  /* Bootstrap primary blue */
-	--bs-table-accent-bg: rgba(13, 110, 253, 0.15) !important;
-	background-color: rgba(13, 110, 253, 0.15) !important;
-	transition: all 150ms ease;
-}
-
-/* Don't apply hover to empty/loading rows */
-.spottable tbody tr.dataTables_empty:hover,
-.spottable tbody tr.dataTables_empty:hover td {
-	--bs-table-bg: transparent !important;
-	--bs-table-accent-bg: transparent !important;
-	background-color: transparent !important;
-}
-
-tbody a {
-	color: inherit;
-	text-decoration: none;
-}
-
-/* Make table rows clickable for prepare logging - use native alias cursor */
-.spottable tbody tr {
-	cursor: alias !important;
-}
-
-.spottable tbody tr td {
-	cursor: alias !important;
-}
-
-/* Don't show alias cursor on loading/processing/empty rows */
-.spottable tbody tr.dataTables_empty,
-.spottable tbody tr.dataTables_empty td,
-.spottable tbody td.dt-empty {
-	cursor: default !important;
-}
-
-/* Show standard pointer for clickable links (QRZ, POTA, SOTA, etc.) */
-.spottable tbody tr a,
-.spottable tbody tr td a {
-	cursor: pointer !important;
-}
-
-.spottable tbody tr td:nth-child(8) i:hover {
-	opacity: 0.7;
-	transform: scale(1.1);
-	transition: all 0.2s ease;
-}
-
-/* CAT Control - Locked Sorting */
-.spottable.cat-sorting-locked thead th {
-	cursor: not-allowed !important;
-	pointer-events: none;
-	opacity: 0.6;
-}
-
-.spottable.cat-sorting-locked thead th:hover {
-	background-color: transparent !important;
-}
-
-.spottable.cat-sorting-locked thead th.sorting_asc::after,
-.spottable.cat-sorting-locked thead th.sorting_desc::after {
-	opacity: 1 !important;
-}
-
-/* CAT Control - Frequency Gradient */
-.cat-frequency-gradient {
-	transition: background-color 0.3s ease, var(--bs-table-bg) 0.3s ease !important;
-}
-
-/* Force gradient background to override Bootstrap striping AND spot lifecycle colors - MAXIMUM SPECIFICITY */
-/* Override normal rows */
-table.table.table-sm.table-bordered.table-hover.table-striped.spottable tbody tr.cat-frequency-gradient,
-table.dataTable.table-striped tbody tr.cat-frequency-gradient,
-table.table-striped tbody tr.cat-frequency-gradient,
-.table-striped > tbody > tr.cat-frequency-gradient,
-table tbody tr.cat-frequency-gradient {
-	background-color: var(--bs-table-bg) !important;
-}
-
-/* Override expiring spots (red) */
-table.table.table-sm.table-bordered.table-hover.table-striped.spottable tbody tr.cat-frequency-gradient.spot-expiring,
-table.dataTable.table-striped tbody tr.cat-frequency-gradient.spot-expiring,
-table tbody tr.cat-frequency-gradient.spot-expiring {
-	background-color: var(--bs-table-bg) !important;
-}
-
-/* Override very new spots (green) */
-table.table.table-sm.table-bordered.table-hover.table-striped.spottable tbody tr.cat-frequency-gradient.spot-very-new,
-table.dataTable.table-striped tbody tr.cat-frequency-gradient.spot-very-new,
-table tbody tr.cat-frequency-gradient.spot-very-new {
-	background-color: var(--bs-table-bg) !important;
-}
-
-/* Override fresh spots - force gradient color over fresh blue */
-table.table.table-sm.table-bordered.table-hover.table-striped.spottable tbody tr.cat-frequency-gradient.fresh,
-table.dataTable.table-striped tbody tr.cat-frequency-gradient.fresh,
-table tbody tr.cat-frequency-gradient.fresh {
-	/* Override both the variable and background directly */
-	background-color: var(--bs-table-bg) !important;
-	/* Prevent .fresh class from setting its own --bs-table-bg */
-	transition: background-color 0.3s ease !important;
-}
-
-/* Override even and odd striping */
-table.table.table-sm.table-bordered.table-hover.table-striped.spottable tbody tr.cat-frequency-gradient:nth-of-type(odd),
-table.table.table-sm.table-bordered.table-hover.table-striped.spottable tbody tr.cat-frequency-gradient:nth-of-type(even),
-table.dataTable.table-striped tbody tr.cat-frequency-gradient:nth-of-type(odd),
-table.dataTable.table-striped tbody tr.cat-frequency-gradient:nth-of-type(even),
-table.table-striped tbody tr.cat-frequency-gradient:nth-of-type(odd),
-table.table-striped tbody tr.cat-frequency-gradient:nth-of-type(even),
-.table-striped > tbody > tr.cat-frequency-gradient:nth-of-type(odd),
-.table-striped > tbody > tr.cat-frequency-gradient:nth-of-type(even) {
-	--bs-table-accent-bg: transparent !important;
-	--bs-table-striped-bg: transparent !important;
-}
-
-.cat-frequency-gradient:hover {
-	filter: brightness(0.95);
-}
-
-/* CAT Control - Nearest spot indicators when not in gradient range */
-/* Table is sorted DESC (high freq at top, low freq at bottom) */
-/* Borders point TOWARD current frequency to create visual bracket */
-
-/* Spot BELOW current frequency (lower number) appears at BOTTOM of table → TOP border points UP toward you */
-table.spottable tbody tr.cat-nearest-below,
-table.dataTable tbody tr.cat-nearest-below,
-table tbody tr.cat-nearest-below {
-	border-top: 2px solid #8b5cf6 !important;
-	box-shadow: 0 -2px 0 0 #8b5cf6 !important;
-}
-
-/* Apply to td cells as well for border-collapse tables */
-table.spottable tbody tr.cat-nearest-below td,
-table.dataTable tbody tr.cat-nearest-below td,
-table tbody tr.cat-nearest-below td {
-	border-top: 2px solid #8b5cf6 !important;
-}
-
-/* Spot ABOVE current frequency (higher number) appears at TOP of table → BOTTOM border points DOWN toward you */
-table.spottable tbody tr.cat-nearest-above,
-table.dataTable tbody tr.cat-nearest-above,
-table tbody tr.cat-nearest-above {
-	border-bottom: 2px solid #8b5cf6 !important;
-	box-shadow: 0 2px 0 0 #8b5cf6 !important;
-}
-
-/* Apply to td cells as well for border-collapse tables */
-table.spottable tbody tr.cat-nearest-above td,
-table.dataTable tbody tr.cat-nearest-above td,
-table tbody tr.cat-nearest-above td {
-	border-bottom: 2px solid #8b5cf6 !important;
-}
-
-/* Status bar styling */
-.status-bar {
-	font-size: 0.875rem;
-	color: var(--bs-body-color);
-	font-family: 'Courier New', Courier, 'Lucida Console', Monaco, monospace;
-	background-color: var(--bs-body-bg);
+#bandmapContainer .table-responsive {
+	overflow: auto;
+	margin: 0;
+	padding: 0;
+	background-color: var(--bs-card-cap-bg, var(--bs-secondary-bg));
+	border: var(--bs-card-border-width, 1px) solid var(--bs-card-border-color, rgba(0,0,0,0.125));
 	border-radius: 8px;
-	margin: 0.25rem 0;
-	padding: 6px 12px;
-}
-
-.status-bar-inner {
-	display: flex;
-	align-items: center;
-	gap: 15px;
-	flex-wrap: nowrap;
-}
-
-.status-bar-left {
-	flex: 1 1 auto;
-	min-width: 0;
-	font-weight: 500;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-
-#statusMessage {
-	cursor: help;
-}
-
-.status-bar-right {
-	flex: 0 0 auto;
-	min-width: 100px;
-	margin-left: 10px;
-	font-weight: 500;
-	color: var(--bs-secondary);
-	text-align: right;
-	display: flex;
-	align-items: center;
-	justify-content: flex-end;
-	white-space: nowrap;
 }
 
 .dataTables_wrapper {
@@ -320,79 +94,68 @@ table tbody tr.cat-nearest-above td {
 	font-family: 'Consolas', 'SF Mono', 'Monaco', 'Inconsolata', 'Fira Code', 'Droid Sans Mono', 'Source Code Pro', monospace;
 	font-variant-numeric: slashed-zero;
 	font-size: calc(1rem - 2px);
+	border-bottom: none;
+	margin-bottom: 0;
+	border-radius: 8px;
+	overflow: hidden;
 }
 
-.spottable thead th {
-	font-weight: normal;
-	text-align: center;
-}
-
-/* Limit container max-width for optimal viewing on 1920px monitors */
-#bandmapContainer {
-	max-width: 1910px !important;
-	margin: 0 auto;
-}
-
-/* Reduce horizontal padding in table cells to fit more content */
 .spottable th,
 .spottable td {
 	padding-left: 4px !important;
 	padding-right: 4px !important;
 }
 
-/* Column widths - consolidated selectors */
-.spottable th:nth-child(1), .spottable td:nth-child(1) { width: 50px; }   /* Age (minutes) */
-.spottable th:nth-child(2), .spottable td:nth-child(2) { width: 75px; }   /* Band */
-.spottable th:nth-child(3), .spottable td:nth-child(3) { width: 90px; }   /* Frequency */
-.spottable th:nth-child(4), .spottable td:nth-child(4) { width: 70px; }   /* Mode */
-.spottable th:nth-child(5), .spottable td:nth-child(5) { width: 60px; }   /* Submode */
-.spottable th:nth-child(6), .spottable td:nth-child(6) { width: 115px; }  /* Callsign  */
-.spottable th:nth-child(7), .spottable td:nth-child(7) { width: 40px; }   /* Continent */
-.spottable th:nth-child(8), .spottable td:nth-child(8) { width: 50px; }   /* CQ Zone */
-.spottable th:nth-child(9), .spottable td:nth-child(9) { width: 50px; }   /* Flag */
-.spottable th:nth-child(10), .spottable td:nth-child(10) { width: 150px; }  /* Entity (DXCC name) */
-.spottable th:nth-child(11), .spottable td:nth-child(11) { width: 115px; } /* de Callsign (Spotter)  */
-.spottable th:nth-child(12), .spottable td:nth-child(12) { width: 50px; } /* de Cont */
-.spottable th:nth-child(13), .spottable td:nth-child(13) { width: 50px; } /* de CQZ */
-.spottable th:nth-child(14), .spottable td:nth-child(14) { width: 100px; } /* Last QSO */
-.spottable th:nth-child(15), .spottable td:nth-child(15) { width: 135px; } /* Special (LoTW, POTA, etc)  */
-.spottable th:nth-child(16), .spottable td:nth-child(16) { min-width: 70px; width: 100%; }  /* Message - fills remaining space */
-
-/* Hidden class for responsive columns (controlled by JavaScript) */
-.spottable .column-hidden {
-	display: none !important;
-}
-
 .spottable td {
 	overflow: hidden;
 	text-overflow: ellipsis;
 	white-space: nowrap;
 }
 
-.spottable td:nth-child(17) {
-	white-space: normal;
-	word-wrap: break-word;
-	overflow-wrap: break-word;
-	font-size: calc(1rem - 4px);
+.spottable thead th {
+	font-weight: normal;
+	font-size: calc(1rem - 1px);
+	text-align: center;
+	vertical-align: middle;
 }
 
-/* Callsign columns (DX and Spotter) - larger font */
-.spottable td:nth-child(6), .spottable td:nth-child(12) {
-	font-size: calc(1rem - 2px);
+/* Ensure sort markers are consistent across all sortable columns */
+.spottable thead th.dt-orderable-asc,
+.spottable thead th.dt-orderable-desc {
+	padding-right: 22px !important;
 }
 
-/* Continent columns (emoji font) */
-.spottable td:nth-child(7), .spottable td:nth-child(13) {
-	font-family: 'Segoe UI Emoji', 'Noto Color Emoji', 'Apple Color Emoji', Arial, sans-serif;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
+.spottable thead th span.dt-column-order {
+	right: 6px !important;
+}
+
+.spottable thead tr {
+	border-top: 1px solid var(--bs-border-color);
+	border-bottom: 1px solid var(--bs-border-color);
+}
+
+.spottable tbody tr,
+.spottable tbody tr td {
+	border: none;
+	cursor: alias !important;
+}
+
+.spottable tbody tr:last-child { border-bottom: 1px solid var(--bs-border-color); }
+.spottable tbody a, tbody a { color: inherit; text-decoration: none; }
+.spottable tbody tr a, .spottable tbody tr td a { cursor: pointer !important; }
+
+.spottable tbody tr.dataTables_empty,
+.spottable tbody tr.dataTables_empty td,
+.spottable tbody td.dt-empty { cursor: default !important; }
+
+.spottable tbody tr td:nth-child(8) i:hover {
+	opacity: 0.7;
+	transform: scale(1.1);
+	transition: all 0.2s ease;
 }
 
 .spottable .flag-emoji {
 	font-family: "Twemoji Country Flags", "Helvetica", "Comic Sans", sans-serif;
-	font-style: normal;
-	font-variant: normal;
 	font-size: 20px;
 	line-height: 1;
 }
@@ -400,121 +163,295 @@ table tbody tr.cat-nearest-above td {
 .spottable img.emoji {
 	height: 20px;
 	width: 20px;
-	margin: 0 .05em 0 .1em;
+	margin: 0 0.05em 0 0.1em;
 	vertical-align: -0.25em;
-	display: inline-block;
 }
 
-.spottable td:nth-child(16) {
-	overflow: visible;
+.spottable .column-hidden { display: none !important; }
+.spottable .column-fill { width: 100% !important; min-width: 150px !important; }
+
+/* ===========================================
+   5. SPOT TABLE - COLUMNS
+   =========================================== */
+
+.spottable th:nth-child(1),  .spottable td:nth-child(1)  { width: 50px; }
+.spottable th:nth-child(2),  .spottable td:nth-child(2)  { width: 75px; }
+.spottable th:nth-child(3),  .spottable td:nth-child(3)  { width: 90px; }
+.spottable th:nth-child(4),  .spottable td:nth-child(4)  { width: 70px; }
+.spottable th:nth-child(5),  .spottable td:nth-child(5)  { width: 60px; }
+.spottable th:nth-child(6),  .spottable td:nth-child(6)  { width: 115px; }
+.spottable th:nth-child(7),  .spottable td:nth-child(7)  { width: 40px; }
+.spottable th:nth-child(8),  .spottable td:nth-child(8)  { width: 50px; }
+.spottable th:nth-child(9),  .spottable td:nth-child(9)  { width: 50px; }
+.spottable th:nth-child(10), .spottable td:nth-child(10) { width: 150px; }
+.spottable th:nth-child(11), .spottable td:nth-child(11) { width: 115px; }
+.spottable th:nth-child(12), .spottable td:nth-child(12) { width: 50px; }
+.spottable th:nth-child(13), .spottable td:nth-child(13) { width: 50px; }
+.spottable th:nth-child(14), .spottable td:nth-child(14) { width: 100px; }
+.spottable th:nth-child(15), .spottable td:nth-child(15) { width: 135px; }
+.spottable th:nth-child(16), .spottable td:nth-child(16) { min-width: 70px; width: 100%; }
+
+.spottable th:nth-child(7), .spottable td:nth-child(7),
+.spottable th:nth-child(8), .spottable td:nth-child(8),
+.spottable th:nth-child(9), .spottable td:nth-child(9),
+.spottable th:nth-child(11), .spottable td:nth-child(11),
+.spottable th:nth-child(13), .spottable td:nth-child(13),
+.spottable th:nth-child(14), .spottable td:nth-child(14) { text-align: center; }
+
+.spottable td:nth-child(6), .spottable td:nth-child(12) { font-size: calc(1rem - 2px); }
+.spottable td:nth-child(7), .spottable td:nth-child(13) { font-family: 'Segoe UI Emoji', 'Noto Color Emoji', 'Apple Color Emoji', Arial, sans-serif; }
+.spottable td:nth-child(16) { overflow: visible; white-space: nowrap; }
+.spottable td:nth-child(17) { white-space: normal; word-wrap: break-word; overflow-wrap: break-word; font-size: calc(1rem - 4px); }
+
+/* ===========================================
+   6. SPOT TABLE - ROW STATES
+   =========================================== */
+
+.spottable tbody tr.fresh {
+	transition: all 500ms ease;
+	--bs-table-bg: var(--spot-fresh-blue);
+	--bs-table-accent-bg: var(--spot-fresh-blue);
+}
+
+.spottable tbody tr.spot-expiring {
+	transition: all 300ms ease;
+	--bs-table-bg: var(--spot-expiring-red) !important;
+	--bs-table-accent-bg: var(--spot-expiring-red) !important;
+	background-color: var(--spot-expiring-red) !important;
+}
+
+.spottable tbody tr.spot-very-new {
+	transition: all 300ms ease;
+	--bs-table-bg: var(--spot-new-green) !important;
+	--bs-table-accent-bg: var(--spot-new-green) !important;
+	background-color: var(--spot-new-green) !important;
+}
+
+.spottable tbody tr:hover {
+	--bs-table-bg: var(--spot-hover-blue) !important;
+	--bs-table-accent-bg: var(--spot-hover-blue) !important;
+	background-color: var(--spot-hover-blue) !important;
+	transition: all 150ms ease;
+}
+
+.spottable tbody tr.dataTables_empty:hover,
+.spottable tbody tr.dataTables_empty:hover td {
+	--bs-table-bg: transparent !important;
+	--bs-table-accent-bg: transparent !important;
+	background-color: transparent !important;
+}
+
+/* ===========================================
+   7. SPOT TABLE - CAT CONTROL
+   =========================================== */
+
+.spottable.cat-sorting-locked thead th {
+	cursor: not-allowed !important;
+	pointer-events: none;
+	opacity: 0.6;
+}
+
+.spottable.cat-sorting-locked thead th.sorting_asc::after,
+.spottable.cat-sorting-locked thead th.sorting_desc::after { opacity: 1 !important; }
+
+.cat-frequency-gradient { transition: background-color 0.3s ease !important; }
+.cat-frequency-gradient:hover { filter: brightness(0.95); }
+
+.spottable tbody tr.cat-frequency-gradient,
+.spottable tbody tr.cat-frequency-gradient.fresh,
+.spottable tbody tr.cat-frequency-gradient.spot-expiring,
+.spottable tbody tr.cat-frequency-gradient.spot-very-new,
+.spottable tbody tr.cat-frequency-gradient:nth-of-type(odd),
+.spottable tbody tr.cat-frequency-gradient:nth-of-type(even) {
+	background-color: var(--bs-table-bg) !important;
+	--bs-table-accent-bg: transparent !important;
+	--bs-table-striped-bg: transparent !important;
+}
+
+.spottable tbody tr.cat-nearest-below,
+.spottable tbody tr.cat-nearest-below td { border-top: 2px solid var(--cat-purple) !important; }
+.spottable tbody tr.cat-nearest-below { box-shadow: 0 -2px 0 0 var(--cat-purple) !important; }
+
+.spottable tbody tr.cat-nearest-above,
+.spottable tbody tr.cat-nearest-above td { border-bottom: 2px solid var(--cat-purple) !important; }
+.spottable tbody tr.cat-nearest-above { box-shadow: 0 2px 0 0 var(--cat-purple) !important; }
+
+/* ===========================================
+   8. STATUS BAR
+   =========================================== */
+
+.status-bar {
+	font-size: calc(1rem - 1px);
+	font-family: 'Consolas', 'SF Mono', 'Monaco', 'Inconsolata', 'Fira Code', 'Droid Sans Mono', 'Source Code Pro', monospace;
+	font-weight: 500;
+	color: var(--bs-body-color);
+	background-color: var(--bs-body-bg);
+	border-radius: 8px;
+	margin: 0.25rem 0;
+	padding: 6px 12px;
+}
+
+.status-bar-inner {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: 15px;
+}
+
+.status-bar-left {
+	flex: 1 1 auto;
+	min-width: 0;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+#statusMessage { cursor: help; }
+
+.status-bar-right {
+	flex: 0 0 auto;
+	min-width: 100px;
+	margin-left: 10px;
+	text-align: right;
+	display: flex;
+	align-items: center;
+	justify-content: flex-end;
 	white-space: nowrap;
 }
 
-/* Center alignment for specific columns */
-.spottable th:nth-child(7), .spottable td:nth-child(7),   /* Continent (spotted) */
-.spottable th:nth-child(8), .spottable td:nth-child(8),   /* CQ Zone (spotted) */
-.spottable th:nth-child(9), .spottable td:nth-child(9),   /* Flag */
-.spottable th:nth-child(11), .spottable td:nth-child(11), /* DXCC Number */
-.spottable th:nth-child(13), .spottable td:nth-child(13), /* de Cont (spotter) */
-.spottable th:nth-child(14), .spottable td:nth-child(14)  /* de CQZ (spotter) */
-{
-	text-align: center;
+/* ===========================================
+   9. MENU BAR & CONTROLS
+   =========================================== */
+
+.menu-bar {
+	margin: 3px 0;
+	overflow: visible;
 }
 
-/* Responsive: At medium screens where Message is hidden, Entity fills remaining space */
-@media (max-width: 1094px) and (min-width: 501px) {
-	.spottable {
-		table-layout: auto !important;
-	}
-	.spottable th:nth-child(10), .spottable td:nth-child(10) {
-		width: 100% !important;
-		min-width: 150px !important;
-	}
-}
+/* Compact mode - hide rows */
+.menu-bar .compact-hidden { display: none !important; }
 
-/* Responsive: On smallest screens, Entity column fills remaining space */
-@media (max-width: 500px) {
-	.spottable {
-		table-layout: auto !important;
-	}
-	.spottable th:nth-child(10), .spottable td:nth-child(10) {
-		width: 100% !important;
-		min-width: 150px !important;
-	}
-	.spottable th:nth-child(1), .spottable td:nth-child(1) { width: 50px !important; }   /* Age */
-	.spottable th:nth-child(3), .spottable td:nth-child(3) { width: 90px !important; }   /* Frequency */
-	.spottable th:nth-child(6), .spottable td:nth-child(6) { width: 100px !important; }  /* Callsign */
-}
+.menu-bar .d-flex { overflow: visible; min-height: fit-content; gap: 0.4rem !important; }
+.menu-bar .btn-sm { padding: 0.25rem 0.5rem; font-size: 0.875rem; }
+.menu-bar .radios.form-select-sm { height: calc(1.5em + 0.5rem + 2px); padding: 0.25rem; font-size: 0.875rem; min-width: 330px; }
+.menu-bar > div:last-child { justify-content: flex-end; }
+.menu-bar > div.mb-2 { margin-bottom: 0.4rem !important; }
 
-.spottable thead th {
+/* Search input always matches table font */
+.menu-bar .input-group input.form-control {
+	font-family: 'Consolas', 'SF Mono', 'Monaco', 'Inconsolata', 'Fira Code', 'Droid Sans Mono', 'Source Code Pro', monospace;
 	font-size: calc(1rem - 1px);
-	vertical-align: middle;
 }
 
-/* Fullscreen toggle button wrapper - large clickable area */
-#fullscreenToggleWrapper {
+.menu-bar #radio_status {
+	margin: 0;
+	padding: 0;
+	line-height: 1;
+	min-height: 0 !important;
+	align-self: center;
+}
+
+.menu-bar #radio_status #radio_cat_state {
+	line-height: 1.4;
+	padding: 0.2rem;
+	margin: 0;
+	display: inline-flex !important;
+	align-items: center;
+	vertical-align: middle;
+	font-size: 0.875rem;
+}
+
+#radio_status { min-height: 1.8rem; }
+
+#radio_status #radio_cat_state:not(.card) {
+	border: var(--bs-card-border-width, 1px) solid var(--bs-card-border-color, rgba(0,0,0,0.125));
+	border-radius: 6px;
+	padding: 0.3rem;
+	margin: 0;
+	background-color: var(--bs-card-cap-bg, var(--bs-secondary-bg));
+}
+
+#radio_status #radio_cat_state:not(.card) > div { margin: 0 !important; padding: 0 !important; }
+
+/* Compact card header in normal mode */
+.card-header { padding: 0.1rem 0.5rem !important; min-height: 0 !important; }
+.card-header h5 { font-size: 1rem !important; margin: 0 !important; line-height: 1.2 !important; }
+.card-header .headerLogo { height: 22px !important; }
+.card-header .d-flex { gap: 0.5rem !important; }
+.card-header .fa-question-circle, .card-header #fullscreenIcon, .card-header #compactModeIcon { font-size: 0.9rem !important; }
+.card-header a[style*="padding: 0.5rem"] { padding: 0.2rem !important; margin: -0.2rem !important; }
+#fullscreenToggleWrapper { padding: 0.2rem !important; margin: -0.2rem !important; }
+#fullscreenToggle { padding: 0.2rem !important; min-width: 28px !important; min-height: 28px !important; }
+#compactModeToggle { padding: 0.2rem !important; min-width: 28px !important; min-height: 28px !important; display: inline-flex; align-items: center; justify-content: center; }
+#compactModeToggle:hover { background-color: rgba(0,0,0,0.08) !important; border-radius: 0.25rem; }
+.card-body.pt-1 { padding: 0.4rem 8px !important; }
+
+#fullscreenToggle, #fullscreenToggleWrapper {
 	display: inline-flex;
 	align-items: center;
 	justify-content: center;
+	cursor: pointer !important;
+}
+
+#fullscreenToggleWrapper {
 	position: relative;
 	z-index: 10;
 	border-radius: 0.25rem;
 	transition: background-color 150ms ease;
 }
 
-#fullscreenToggleWrapper:hover {
-	background-color: rgba(0, 0, 0, 0.08) !important;
+#fullscreenToggleWrapper:hover { background-color: rgba(0,0,0,0.08) !important; }
+#fullscreenToggle { min-width: 48px; min-height: 48px; font-size: 1.2rem; flex-shrink: 0; }
+#fullscreenToggle:hover { background-color: transparent !important; }
+#fullscreenIcon { pointer-events: none; font-size: 1.4rem !important; }
+
+.fullscreen-wavelog-text { pointer-events: auto; flex-shrink: 1; white-space: nowrap; cursor: pointer; }
+.fullscreen-wavelog-text:hover { text-decoration: underline !important; opacity: 0.8; }
+.bandmap-logo-fullscreen { display: none; }
+
+.search-icon-clickable { cursor: pointer; }
+.search-icon-clickable:hover { background-color: var(--bs-secondary-bg); }
+
+/* ===========================================
+   10. FILTER DROPDOWNS
+   =========================================== */
+
+select[multiple] { height: auto; min-height: 350px; max-height: 700px; }
+select[multiple].filter-short { min-height: 150px; max-height: 220px; }
+select[multiple] option:checked { background-color: var(--bs-primary); color: white; }
+
+.dropdown-menu .mb-3 {
+	display: flex;
+	flex-direction: column;
+	justify-content: flex-end;
+	min-height: 100px;
 }
 
-/* Fullscreen toggle button - ensure proper clickable area */
-#fullscreenToggle {
-	min-width: 48px;
-	min-height: 48px;
-	display: inline-flex;
+.dropdown-menu .filter-label-bottom { margin-top: auto; margin-bottom: 0.25rem; text-align: left; }
+.dropdown-menu select.form-select, .dropdown-menu select { margin-bottom: 0; flex-shrink: 0; }
+
+.filter-tip {
+	background-color: var(--bs-card-cap-bg, var(--bs-secondary-bg));
+	color: var(--bs-body-color);
+	border: 2px solid var(--bs-dark, #212529);
+	padding: 8px 12px;
+	border-radius: 6px;
+	margin-bottom: 15px;
+	font-size: 1rem;
+	display: flex;
 	align-items: center;
-	justify-content: center;
-	cursor: pointer !important;
-	position: relative;
-	flex-shrink: 0;
+	gap: 8px;
 }
 
-#fullscreenToggle:hover {
-	background-color: transparent !important;
-}
+.filter-label-small { font-size: 1rem; margin-bottom: 0.25rem; font-weight: 500; }
 
-#fullscreenIcon {
-	pointer-events: none; /* Icon shouldn't intercept clicks */
-	font-size: 1.4rem !important; /* Make icon slightly bigger too */
-}
-
-/* Ensure wavelog text doesn't overlap button */
-.fullscreen-wavelog-text {
-	pointer-events: auto;
-	flex-shrink: 1;
-	white-space: nowrap;
-	cursor: pointer;
-}
-
-.fullscreen-wavelog-text:hover {
-	text-decoration: underline !important;
-	opacity: 0.8;
-}
-
-/* Fullscreen mode - CLEAN REBUILD */
-.bandmap-logo-fullscreen {
-	display: none;
-}
-
-.bandmap-fullscreen .bandmap-logo-fullscreen {
-	display: inline-block;
-}
+/* ===========================================
+   11. FULLSCREEN MODE
+   =========================================== */
 
 .bandmap-fullscreen {
 	position: fixed;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
+	inset: 0;
 	width: 100vw;
 	height: 100vh;
 	z-index: 9999;
@@ -524,6 +461,8 @@ table tbody tr.cat-nearest-above td {
 	padding: 0 !important;
 }
 
+.bandmap-fullscreen .bandmap-logo-fullscreen { display: inline-block; }
+
 .bandmap-fullscreen .card {
 	height: 100vh;
 	margin: 0;
@@ -533,14 +472,7 @@ table tbody tr.cat-nearest-above td {
 	flex-direction: column;
 }
 
-/* Reduce card header padding for more compact appearance */
-.card-header {
-	padding: 0.25rem 1rem !important;
-}
-
-.bandmap-fullscreen .card-header {
-	flex: 0 0 auto;
-}
+.bandmap-fullscreen .card-header { flex: 0 0 auto; }
 
 .bandmap-fullscreen .card-body {
 	flex: 1;
@@ -552,30 +484,30 @@ table tbody tr.cat-nearest-above td {
 	overflow: auto;
 }
 
-/* Direct children of card-body in fullscreen */
-.bandmap-fullscreen #radio_status {
-	flex: 0 0 auto;
-	margin: 0 !important;
-	padding: 0 !important;
-	min-height: 2.5rem; /* Reserve space for radio status to prevent UI shift */
-}
+.bandmap-fullscreen #radio_status { flex: 0 0 auto; margin: 0 !important; padding: 0 !important; min-height: 2.5rem; }
+.bandmap-fullscreen #radio_status:not(:empty) { margin: 0 0 0.5rem 0 !important; }
+.bandmap-fullscreen #radio_status #radio_cat_state:not(.card) { margin: 0 !important; }
 
-/* Only show margin when radio_status has content */
-.bandmap-fullscreen #radio_status:not(:empty) {
-	margin: 0 0 0.5rem 0 !important;
-}
+.bandmap-fullscreen .menu-bar { flex: 0 0 auto; margin: 0 0 0.5rem 0 !important; }
+.bandmap-fullscreen .menu-bar #radio_status { min-height: 0 !important; margin: 0 !important; }
 
-/* Reserve space for radio status even when empty */
-#radio_status {
-	min-height: 2.5rem; /* Reserve vertical space to prevent layout shift */
-}
+/* Restore larger sizing in fullscreen mode */
+.bandmap-fullscreen .menu-bar .d-flex { gap: 0.5rem !important; }
+.bandmap-fullscreen .menu-bar .btn-sm { padding: 0.25rem 0.5rem; font-size: 0.875rem; }
+.bandmap-fullscreen .menu-bar .radios.form-select-sm { height: calc(1.5em + 0.5rem + 2px); padding: 0.25rem; font-size: 0.875rem; min-width: 330px; }
+.bandmap-fullscreen .menu-bar > div.mb-2 { margin-bottom: 0.5rem !important; }
+.bandmap-fullscreen .menu-bar #radio_status #radio_cat_state { font-size: 0.875rem; padding: 0.25rem; }
+.bandmap-fullscreen .card-header { padding: 0.35rem 1rem !important; }
+.bandmap-fullscreen .card-header h5 { font-size: 1.15rem !important; line-height: 1.4 !important; }
+.bandmap-fullscreen .card-header .headerLogo { height: 32px !important; }
+.bandmap-fullscreen .card-header .d-flex { gap: 1rem !important; }
+.bandmap-fullscreen .card-header .fa-question-circle, .bandmap-fullscreen .card-header #fullscreenIcon, .bandmap-fullscreen .card-header #compactModeIcon { font-size: 1.2rem !important; }
+.bandmap-fullscreen .card-header a[style*="padding: 0.5rem"] { padding: 0.5rem !important; margin: -0.5rem !important; }
+.bandmap-fullscreen #fullscreenToggleWrapper { padding: 0.5rem !important; margin: -0.5rem !important; }
+.bandmap-fullscreen #fullscreenToggle { padding: 0.5rem !important; min-width: 48px !important; min-height: 48px !important; }
+.bandmap-fullscreen #compactModeToggle { padding: 0.5rem !important; min-width: 48px !important; min-height: 48px !important; }
+.bandmap-fullscreen .card-body.pt-1 { padding: 0.75rem 15px !important; }
 
-.bandmap-fullscreen .menu-bar {
-	flex: 0 0 auto;
-	margin: 0 0 0.5rem 0 !important;
-}
-
-/* Override status bar wrapper constraints in fullscreen - keep it sharing row with search */
 .bandmap-fullscreen .menu-bar > div > div[style*="max-width: 70%"] {
 	max-width: none !important;
 	flex: 1 1 auto !important;
@@ -589,414 +521,150 @@ table tbody tr.cat-nearest-above td {
 	margin: 0 !important;
 	width: 100% !important;
 	padding: 0.25rem 0.5rem !important;
-	display: flex;
-	align-items: center;
 	min-height: calc(1.5em + 0.5rem + 2px);
 	line-height: 1.5;
 }
 
-/* Override parent container max-width in fullscreen */
-.bandmap-fullscreen .status-bar {
-	max-width: 100% !important;
-}
+.bandmap-fullscreen .status-bar-left { white-space: normal !important; overflow: visible !important; }
+.bandmap-fullscreen .status-bar-right { min-width: 150px; }
+.bandmap-fullscreen .table-responsive { flex: 1 1 auto; min-height: 0; overflow: auto; margin: 0 !important; }
 
-.bandmap-fullscreen .status-bar-inner {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	gap: 15px;
-	flex-wrap: nowrap;
-}
+.bandmap-fullscreen .dataTables_processing { position: fixed; top: 50%; left: 50%; transform: translate(-50%, -50%); z-index: 10001; }
+.bandmap-fullscreen .dropdown-menu { z-index: 10002; position: fixed; }
+.bandmap-fullscreen .tooltip, body.fullscreen-active .tooltip { z-index: 10003 !important; }
+body.fullscreen-active .modal, body.fullscreen-active .modal-backdrop { z-index: 10050 !important; }
+body.fullscreen-active .modal-backdrop + .modal { z-index: 10051 !important; }
 
-.bandmap-fullscreen .status-bar-left {
-	flex: 1 1 auto;
-	min-width: 0;
-	white-space: normal !important;
-	overflow: visible !important;
-	text-overflow: clip !important;
-}
+body.fullscreen-active { overflow: hidden; }
 
-.bandmap-fullscreen .status-bar-right {
-	flex: 0 0 auto;
-	min-width: 150px;
-	white-space: nowrap;
-}
-
-.bandmap-fullscreen .table-responsive {
-	flex: 1 1 auto;
-	min-height: 0;
-	overflow: auto;
-	margin: 0 !important;
-}
-
-/* Radio status compact mode styling (no card wrapper) */
-#radio_status #radio_cat_state:not(.card) {
-	border: var(--bs-card-border-width, 1px) solid var(--bs-card-border-color, rgba(0,0,0,.125));
-	border-radius: 8px;
-	padding: 0.5rem;
-	margin: 0;
-	background-color: var(--bs-card-cap-bg, var(--bs-secondary-bg));
-}
-
-#radio_status #radio_cat_state:not(.card) > div {
-	margin: 0 !important;
-	padding: 0 !important;
-}
-
-/* In fullscreen, ensure proper spacing */
-.bandmap-fullscreen #radio_status #radio_cat_state:not(.card) {
-	margin: 0 !important;
-}
-
-/* Z-index management */
-.bandmap-fullscreen .dataTables_processing {
-	position: fixed;
-	top: 50%;
-	left: 50%;
-	transform: translate(-50%, -50%);
-	z-index: 10001;
-}
-
-.bandmap-fullscreen .dropdown-menu {
-	z-index: 10002;
-	position: fixed;
-}
-
-body.fullscreen-active .tooltip,
-.bandmap-fullscreen .tooltip {
-	z-index: 10003 !important;
-}
-
-body.fullscreen-active .modal,
-body.fullscreen-active .modal-backdrop {
-	z-index: 10050 !important;
-}
-
-body.fullscreen-active .modal-backdrop + .modal {
-	z-index: 10051 !important;
-}
-
-/* Hide page elements in fullscreen */
 body.fullscreen-active #page-wrapper,
 body.fullscreen-active nav,
 body.fullscreen-active .navbar,
 body.fullscreen-active header,
 body.fullscreen-active #bandmapContainer > .d-flex.align-items-center.mb-3,
-body.fullscreen-active #bandmapContainer > .messages {
-	display: none !important;
+body.fullscreen-active #bandmapContainer > .messages { display: none !important; }
+
+body.fullscreen-active .fullscreen-wavelog-text { display: inline !important; }
+
+/* ===========================================
+   12. RESPONSIVE - LARGE DESKTOP (≤1400px) - Hide button labels
+   =========================================== */
+
+@media (max-width: 1400px) {
+	/* Hide button text labels - show only icons */
+	.menu-bar .btn span.d-none.d-sm-inline,
+	.menu-bar .btn span.d-none.d-md-inline,
+	.menu-bar .btn span.d-none.d-lg-inline { display: none !important; }
+	
+	/* Hide "de:" label */
+	.menu-bar small.text-muted { display: none !important; }
 }
 
-body.fullscreen-active .fullscreen-wavelog-text {
-	display: inline !important;
-}
+/* ===========================================
+   13. RESPONSIVE - DESKTOP/LAPTOP (≤1200px)
+   =========================================== */
 
-body.fullscreen-active {
-	overflow: hidden;
-}
-
-#fullscreenToggle {
-	cursor: pointer;
-	font-size: 1.2rem;
-	display: inline-flex;
-	align-items: center;
-	justify-content: center;
-	min-width: 36px;
-	height: 36px;
-}
-
-/* Menu bar and table styling */
-.menu-bar {
-	margin-top: 5px;
-	margin-bottom: 5px;
-	overflow: visible;
-}
-
-/* Compact button padding in menu bar to save horizontal space */
-.menu-bar .btn-sm {
-	padding-left: 0.4rem;
-	padding-right: 0.4rem;
-}
-
-/* Ensure radio selector dropdown matches button height */
-.menu-bar .radios.form-select-sm {
-	height: calc(1.5em + 0.5rem + 2px); /* Match Bootstrap btn-sm height */
-	padding-top: 0.25rem;
-	padding-bottom: 0.25rem;
-}
-
-/* Ensure radio status container has no extra spacing */
-.menu-bar #radio_status {
-	margin: 0;
-	padding: 0;
-	line-height: 1;
-	min-height: 0 !important; /* Override the general min-height rule */
-	align-self: center; /* Force vertical centering */
-}
-
-/* Override fullscreen min-height and margin when in menu-bar */
-.bandmap-fullscreen .menu-bar #radio_status {
-	min-height: 0 !important;
-	margin: 0 !important;
-}
-
-/* Match radio status to button vertical rhythm */
-.menu-bar #radio_status #radio_cat_state {
-	line-height: 1.5;
-	padding-top: 0.25rem;
-	padding-bottom: 0.25rem;
-	margin: 0;
-	display: inline-flex !important;
-	align-items: center;
-	vertical-align: middle; /* Ensure inline alignment */
-}
-
-/* Ensure CAT Control and search box stay right-aligned when wrapping */
-.menu-bar > div:last-child {
-	justify-content: flex-end;
-}
-
-/* Ensure all menu rows wrap properly and show all content */
-.menu-bar .d-flex {
-	overflow: visible;
-	min-height: fit-content;
-}
-
-.card-body.pt-1 {
-	padding-left: 15px;
-	padding-right: 15px;
-}
-
-/* Only apply custom table-responsive styling to bandmap container */
-#bandmapContainer .table-responsive {
-	overflow: auto;
-	margin: 0;
-	padding: 0;
-	background-color: var(--bs-card-cap-bg, var(--bs-secondary-bg));
-	border: var(--bs-card-border-width, 1px) solid var(--bs-card-border-color, rgba(0,0,0,.125));
-	border-radius: 8px;
-}
-
-.spottable {
-	border-bottom: none;
-	margin-bottom: 0;
-	border-radius: 8px;
-	overflow: hidden;
-}
-
-.spottable thead tr {
-	border-top: 1px solid var(--bs-border-color);
-	border-bottom: 1px solid var(--bs-border-color);
-}
-
-.spottable tbody tr:last-child {
-	border-bottom: 1px solid var(--bs-border-color);
-}
-
-.spottable tbody tr,
-.spottable tbody tr td {
-	border-top: none;
-	border-bottom: none;
-}
-
-/* Filter dropdowns */
-select[multiple] {
-	height: auto;
-	min-height: 350px;
-	max-height: 700px;
-}
-
-select[multiple].filter-short {
-	min-height: 150px;
-	max-height: 220px;
-}
-
-select[multiple] option:checked {
-	background-color: var(--bs-primary);
-	color: white;
-	font-weight: normal;
-}
-
-.dropdown-menu .mb-3 {
-	display: flex;
-	flex-direction: column;
-	justify-content: flex-end;
-	min-height: 100px;
-}
-
-.dropdown-menu .filter-label-bottom {
-	margin-top: auto;
-	margin-bottom: 0.25rem;
-	padding-bottom: 0;
-	text-align: left;
-}
-
-.dropdown-menu select.form-select {
-	margin-bottom: 0;
-}
-
-.dropdown-menu select {
-	flex-shrink: 0;
-}
-
-.filter-tip {
-	background-color: var(--bs-card-cap-bg, var(--bs-secondary-bg));
-	color: var(--bs-body-color);
-	border: 2px solid var(--bs-dark, #212529);
-	padding: 8px 12px;
-	border-radius: 6px;
-	margin-bottom: 15px;
-	font-size: 1rem; /* Match page default font size */
-	display: flex;
-	align-items: center;
-	gap: 8px;
-}
-
-.filter-label-small {
-	font-size: 1rem; /* Match page default font size */
-	margin-bottom: 0.25rem;
-	font-weight: 500;
-}
-
-.search-icon-clickable {
-	cursor: pointer;
-}
-
-.search-icon-clickable:hover {
-	background-color: var(--bs-secondary-bg);
-}
-
-/* Responsive adjustments */
-@media (max-width: 768px) {
-	.dropdown-menu {
-		min-width: 95vw;
-		max-width: 95vw;
+@media (max-width: 1200px) {
+	/* Make menu-bar a single flex container with all items flowing together */
+	.menu-bar {
+		display: flex !important;
+		flex-wrap: wrap !important;
+		gap: 0.35rem !important;
+		align-items: center !important;
 	}
-
-	select[multiple] {
-		min-height: 180px;
-		max-height: 375px;
+	
+	/* Compact buttons at this breakpoint */
+	.menu-bar .btn-sm { padding: 0.15rem 0.35rem; font-size: 0.8rem; }
+	.menu-bar .radios.form-select-sm { height: calc(1.4em + 0.4rem + 2px); padding: 0.15rem 0.25rem; font-size: 0.8rem; }
+	
+	/* Remove row structure - make each row's items flow directly (except status-search-row and hidden rows) */
+	.menu-bar > div.d-flex:not(.compact-hidden):not(.status-search-row) {
+		display: contents !important;
 	}
-
-	select[multiple].filter-short {
-		min-height: 100px;
-		max-height: 150px;
+	
+	/* Status bar and search always stay together as their own row */
+	.menu-bar .status-search-row {
+		display: flex !important;
+		flex-basis: 100% !important;
+		width: 100% !important;
+		order: 999; /* Always at the bottom */
 	}
-
-	/* Status bar and search on smaller screens */
-	.status-bar {
-		font-size: 0.8rem;
-		padding: 5px 10px;
+	
+	/* Remove spacers and auto-margins */
+	.menu-bar .flex-grow-1 { display: none !important; }
+	.menu-bar .ms-auto { margin-left: 0 !important; }
+	
+	/* Remove bottom margins from former rows */
+	.menu-bar > div.mb-2 { margin-bottom: 0 !important; }
+	
+	/* Nested flex containers should also flow (except when parent is hidden or status-search-row) */
+	.menu-bar > div:not(.compact-hidden):not(.status-search-row) .d-flex.flex-wrap { display: contents !important; }
+	
+	/* Compact status bar and search at this breakpoint */
+	.status-bar { 
+		padding: 3px 8px; 
+		margin: 0.15rem 0;
+		border-radius: 6px;
 	}
-
-	.status-bar-inner {
-		gap: 10px;
-	}
-
-	.status-bar-right {
-		min-width: 80px;
-		font-size: 0.75rem;
-	}
-
-	/* Ensure menu rows wrap properly */
-	.menu-bar .d-flex {
-		overflow: visible !important;
-	}
-
-	/* Reduce card-body padding on tablets */
-	.card-body.pt-1 {
-		padding-left: 10px;
-		padding-right: 10px;
-	}
-
-	/* Make buttons smaller on tablets */
-	.btn-sm {
-		font-size: 0.75rem;
+	.menu-bar .input-group input.form-control { 
 		padding: 0.15rem 0.35rem;
 	}
+	.menu-bar .input-group .btn { 
+		padding: 0.15rem 0.35rem;
+		font-size: 0.8rem;
+	}
+}
+
+/* ===========================================
+   13. RESPONSIVE - TABLET (≤768px)
+   =========================================== */
+
+@media (max-width: 768px) {
+	.dropdown-menu { min-width: 95vw; max-width: 95vw; }
+	select[multiple] { min-height: 180px; max-height: 375px; }
+	select[multiple].filter-short { min-height: 100px; max-height: 150px; }
+
+	.status-bar { font-size: 0.8rem; padding: 5px 10px; }
+	.status-bar-inner { gap: 10px; }
+	.status-bar-right { min-width: 80px; font-size: 0.75rem; }
+
+	.menu-bar .d-flex { gap: 0.3rem !important; }
+	.card-body.pt-1 { padding-left: 10px; padding-right: 10px; }
 
-	/* Hide text labels in quick filter buttons on tablets - icons only */
 	#toggleLotwFilter .d-none.d-sm-inline,
 	#toggleNewContinentFilter .d-none.d-sm-inline,
 	#toggleDxccNeededFilter .d-none.d-sm-inline,
 	#toggleNewCallsignFilter .d-none.d-sm-inline,
 	#toggleContestFilter .d-none.d-sm-inline,
 	#toggleGeoHunterFilter .d-none.d-sm-inline,
-	#toggleFreshFilter .d-none.d-sm-inline {
-		display: none !important;
-	}
+	#toggleFreshFilter .d-none.d-sm-inline { display: none !important; }
 
-	/* Reduce gap between button groups */
-	.menu-bar .d-flex {
-		gap: 0.3rem !important;
-	}
+	/* Table columns - tablet */
+	.spottable { table-layout: auto !important; }
+	.spottable th:nth-child(10), .spottable td:nth-child(10) { width: 100% !important; min-width: 150px !important; }
 }
 
+/* ===========================================
+   14. RESPONSIVE - MOBILE (≤576px)
+   =========================================== */
+
 @media (max-width: 576px) {
-	select[multiple] {
-		min-height: 150px;
-		max-height: 300px;
-	}
+	select[multiple] { min-height: 150px; max-height: 300px; }
+	.card-body.pt-1 { padding-left: 5px; padding-right: 5px; }
 
-	/* Reduce card-body padding on mobile */
-	.card-body.pt-1 {
-		padding-left: 5px;
-		padding-right: 5px;
-	}
+	.menu-bar > div:last-child > div:first-child { flex: 1 1 100% !important; max-width: 100% !important; margin-bottom: 0.5rem; }
+	.menu-bar > div:last-child .input-group { flex: 1 1 100% !important; max-width: 100% !important; }
+	.menu-bar .d-flex, .menu-bar .d-flex.gap-2 { gap: 0.2rem !important; }
+	.menu-bar > div { overflow: visible !important; min-height: auto !important; }
 
-	/* Stack status bar and search vertically on mobile */
-	.menu-bar > div:last-child > div:first-child {
-		flex: 1 1 100% !important;
-		max-width: 100% !important;
-		margin-bottom: 0.5rem;
-	}
+	.d-none.d-sm-inline { display: none !important; }
 
-	.menu-bar > div:last-child .input-group {
-		flex: 1 1 100% !important;
-		max-width: 100% !important;
-	}
+	.status-bar { font-size: 0.7rem; padding: 3px 6px; }
+	.status-bar-right { margin-left: 5px; }
 
-	/* Make buttons even smaller on mobile */
-	.btn-sm {
-		font-size: 0.7rem;
-		padding: 0.1rem 0.25rem;
-	}
-
-	/* Hide text labels on quick filter buttons - show icons only */
-	.d-none.d-sm-inline {
-		display: none !important;
-	}
-
-	/* Reduce gap between elements */
-	.menu-bar .d-flex {
-		gap: 0.2rem !important;
-	}
-
-	.menu-bar .d-flex.gap-2 {
-		gap: 0.2rem !important;
-	}
-
-	/* Reduce button group spacing */
-	.btn-group {
-		gap: 0px;
-	}
-
-	.btn-group .btn {
-		margin: 0;
-	}
-
-	/* Ensure all rows in menu wrap properly */
-	.menu-bar > div {
-		overflow: visible !important;
-		min-height: auto !important;
-	}
-
-	/* Reduce status bar font size further */
-	.status-bar {
-		font-size: 0.7rem;
-		padding: 3px 6px;
-	}
-
-	.status-bar-right {
-		margin-left: 5px;
-	}
+	/* Table columns - mobile */
+	.spottable th:nth-child(1), .spottable td:nth-child(1) { width: 50px !important; }
+	.spottable th:nth-child(3), .spottable td:nth-child(3) { width: 90px !important; }
+	.spottable th:nth-child(6), .spottable td:nth-child(6) { width: 100px !important; }
+	.spottable th:nth-child(10), .spottable td:nth-child(10) { width: 100% !important; min-width: 150px !important; }
 }
diff --git a/assets/js/cat.js b/assets/js/cat.js
index a78d0938a..c2dd15ad8 100644
--- a/assets/js/cat.js
+++ b/assets/js/cat.js
@@ -81,9 +81,37 @@ $(document).ready(function() {
     };
 
     // Global setting for radio status display mode (can be set by pages like bandmap)
-    // Options: false (card wrapper), 'compact' (no card), 'ultra-compact' (tooltip only)
+    // Options: false (card wrapper), 'compact' (no card), 'ultra-compact' (icon+name+tooltip), 'icon-only' (icon+tooltip)
     window.CAT_COMPACT_MODE = window.CAT_COMPACT_MODE || false;
 
+    /**
+     * Safely dispose of a Bootstrap tooltip without triggering _isWithActiveTrigger errors
+     * This works around a known Bootstrap bug where disposing during hide animation causes errors
+     * @param {Element} element - The DOM element with the tooltip
+     */
+    function safeDisposeTooltip(element) {
+        try {
+            var tooltipInstance = bootstrap.Tooltip.getInstance(element);
+            if (tooltipInstance) {
+                // Set _activeTrigger to empty object to prevent _isWithActiveTrigger error
+                if (tooltipInstance._activeTrigger) {
+                    tooltipInstance._activeTrigger = {};
+                }
+                // Clear any pending timeouts
+                if (tooltipInstance._timeout) {
+                    clearTimeout(tooltipInstance._timeout);
+                    tooltipInstance._timeout = null;
+                }
+                // Dispose without calling hide first
+                tooltipInstance.dispose();
+            }
+        } catch(e) {
+            // Silently ignore any remaining errors
+        }
+    }
+    // Expose globally for other modules
+    window.safeDisposeTooltip = safeDisposeTooltip;
+
     function initializeWebSocketConnection() {
         try {
             // Note: Browser will log WebSocket connection errors to console if server is unreachable
@@ -153,14 +181,19 @@ $(document).ready(function() {
             if (typeof window.isCatTrackingEnabled !== 'undefined') {
                 if (!window.isCatTrackingEnabled) {
                     // CAT Control is OFF - show offline status and skip processing
-                    if (window.CAT_COMPACT_MODE === 'ultra-compact') {
+                    if (window.CAT_COMPACT_MODE === 'ultra-compact' || window.CAT_COMPACT_MODE === 'icon-only') {
                         displayOfflineStatus('cat_disabled');
                     }
                     return;
                 }
             }
 
-            data.updated_minutes_ago = Math.floor((Date.now() - data.timestamp) / 60000);
+            // Calculate age from timestamp, defaulting to 0 (fresh) if timestamp is missing
+            if (data.timestamp) {
+                data.updated_minutes_ago = Math.floor((Date.now() - data.timestamp) / 60000);
+            } else {
+                data.updated_minutes_ago = 0; // Assume fresh if no timestamp
+            }
             // Cache the radio data
             updateCATui(data);
         }
@@ -379,8 +412,8 @@ $(document).ready(function() {
      * @param {string} reason - Optional reason: 'no_radio' (default) or 'cat_disabled'
      */
     function displayOfflineStatus(reason) {
-        // Display "Working offline" message with tooltip in ultra-compact mode
-        if (window.CAT_COMPACT_MODE !== 'ultra-compact') {
+        // Display "Working offline" message with tooltip in ultra-compact/icon-only modes
+        if (window.CAT_COMPACT_MODE !== 'ultra-compact' && window.CAT_COMPACT_MODE !== 'icon-only') {
             return;
         }
 
@@ -390,11 +423,20 @@ $(document).ready(function() {
         // Use translation variable if available, fallback to English
         var offlineText = typeof lang_cat_working_offline !== 'undefined' ? lang_cat_working_offline : 'Working without CAT connection';
 
-        const offlineHtml = '<span id="radio_cat_state" class="text-body" style="display: inline-flex; align-items: center; font-size: 0.875rem;">' +
-                           '<i class="fas fa-unlink text-warning" style="margin-right: 5px;"></i>' +
-                           '<span style="margin-right: 5px;">' + offlineText + '</span>' +
-                           '<i id="radio-status-icon" class="fas fa-info-circle text-muted" style="cursor: help;" data-bs-toggle="tooltip" data-bs-html="true" data-bs-placement="bottom"></i>' +
-                           '</span>';
+        var offlineHtml;
+        if (window.CAT_COMPACT_MODE === 'icon-only') {
+            // Icon-only mode: just the icon with tooltip, styled as button for consistent height
+            offlineHtml = '<span id="radio_cat_state" class="btn btn-sm btn-secondary" style="display: inline-flex; align-items: center; justify-content: center; cursor: help;">' +
+                         '<i id="radio-status-icon" class="fas fa-unlink text-warning" data-bs-toggle="tooltip" data-bs-html="true" data-bs-placement="bottom"></i>' +
+                         '</span>';
+        } else {
+            // Ultra-compact mode: icon + text + info icon
+            offlineHtml = '<span id="radio_cat_state" class="text-body" style="display: inline-flex; align-items: center; font-size: 0.875rem;">' +
+                         '<i class="fas fa-unlink text-warning" style="margin-right: 5px;"></i>' +
+                         '<span style="margin-right: 5px;">' + offlineText + '</span>' +
+                         '<i id="radio-status-icon" class="fas fa-info-circle text-muted" style="cursor: help;" data-bs-toggle="tooltip" data-bs-html="true" data-bs-placement="bottom"></i>' +
+                         '</span>';
+        }
 
         let tooltipContent;
         if (reason === 'cat_disabled') {
@@ -418,11 +460,15 @@ $(document).ready(function() {
         // Initialize tooltip
         var tooltipElement = document.querySelector('#radio_status [data-bs-toggle="tooltip"]');
         if (tooltipElement) {
-            new bootstrap.Tooltip(tooltipElement, {
-                title: tooltipContent,
-                html: true,
-                placement: 'bottom'
-            });
+            try {
+                new bootstrap.Tooltip(tooltipElement, {
+                    title: tooltipContent,
+                    html: true,
+                    placement: 'bottom'
+                });
+            } catch(e) {
+                // Ignore tooltip initialization errors
+            }
         }
     }
 
@@ -433,15 +479,16 @@ $(document).ready(function() {
      * CAT_COMPACT_MODE options:
      *   false - Standard mode with card wrapper
      *   'compact' - Compact mode without card wrapper
-     *   'ultra-compact' - Ultra-compact mode showing only tooltip with info
+     *   'ultra-compact' - Ultra-compact mode showing icon, radio name, and tooltip
+     *   'icon-only' - Icon-only mode showing just icon with tooltip (for bandmap)
      */
     function displayRadioStatus(state, data) {
         // On bandmap page, only show radio status when CAT Control is enabled
         if (typeof window.isCatTrackingEnabled !== 'undefined') {
             if (!window.isCatTrackingEnabled) {
                 // CAT Control is OFF on bandmap
-                // In ultra-compact mode, show "Working offline" with CAT disabled message
-                if (window.CAT_COMPACT_MODE === 'ultra-compact') {
+                // In ultra-compact/icon-only mode, show "Working offline" with CAT disabled message
+                if (window.CAT_COMPACT_MODE === 'ultra-compact' || window.CAT_COMPACT_MODE === 'icon-only') {
                     // Check if a radio is selected
                     var selectedRadio = $('.radios option:selected').val();
                     if (selectedRadio && selectedRadio !== '0') {
@@ -548,7 +595,90 @@ $(document).ready(function() {
         var html = baseStyle + icon + content + '</div>';
 
 		// Update DOM based on global CAT_COMPACT_MODE setting
-		if (window.CAT_COMPACT_MODE === 'ultra-compact') {
+		if (window.CAT_COMPACT_MODE === 'icon-only') {
+			// Icon-only mode: show just radio icon with tooltip containing all info
+			var tooltipContent = '';
+
+			if (state === 'success') {
+				var radioName = $('select.radios option:selected').text();
+				var connectionType = $(".radios option:selected").val() == 'ws' ? lang_cat_live : lang_cat_polling;
+				tooltipContent = '<b>' + radioName + '</b> (' + connectionType + ')';
+
+				// Ensure frequency_formatted exists
+				var freqFormatted = data.frequency_formatted;
+				if (!freqFormatted || freqFormatted === 'undefined' || freqFormatted === 'nullkHz') {
+					freqFormatted = format_frequency(data.frequency);
+				}
+
+				// Add frequency info
+				if(data.frequency_rx && data.frequency_rx != 0 && data.frequency_rx !== 'undefined') {
+					// Split operation: show TX and RX separately
+					if (freqFormatted && freqFormatted !== 'undefined') {
+						tooltipContent += '<br><b>' + lang_cat_tx + ':</b> ' + freqFormatted;
+					}
+					var rxFormatted = format_frequency(data.frequency_rx);
+					if (rxFormatted && rxFormatted !== 'undefined') {
+						tooltipContent += '<br><b>' + lang_cat_rx + ':</b> ' + rxFormatted;
+					}
+				} else {
+					// Simplex operation: show TX/RX combined
+					if (freqFormatted && freqFormatted !== 'undefined') {
+						tooltipContent += '<br><b>' + lang_cat_tx_rx + ':</b> ' + freqFormatted;
+					}
+				}
+
+				if(data.mode != null) {
+					tooltipContent += '<br><b>' + lang_cat_mode + ':</b> ' + data.mode;
+				}
+				if(data.power != null && data.power != 0) {
+					tooltipContent += '<br><b>' + lang_cat_power + ':</b> ' + data.power + 'W';
+				}
+				if ($(".radios option:selected").val() != 'ws') {
+					tooltipContent += '<br><br><i>' + lang_cat_polling_tooltip + '</i>';
+				}
+			} else if (state === 'error') {
+				var radioName = typeof data === 'string' ? data : $('select.radios option:selected').text();
+				tooltipContent = lang_cat_connection_error + ': <b>' + radioName + '</b><br>' + lang_cat_connection_lost;
+			} else if (state === 'timeout') {
+				var radioName = typeof data === 'string' ? data : $('select.radios option:selected').text();
+				tooltipContent = lang_cat_connection_timeout + ': <b>' + radioName + '</b><br>' + lang_cat_data_stale;
+			} else if (state === 'not_logged_in') {
+				tooltipContent = lang_cat_not_logged_in;
+			}
+
+			var iconOnlyHtml = '<span id="radio_cat_state" class="btn btn-sm btn-secondary" style="display: inline-flex; align-items: center; justify-content: center; cursor: help;">' +
+							  '<i id="radio-status-icon" class="fas fa-radio ' + iconClass + '" data-bs-toggle="tooltip" data-bs-html="true" data-bs-placement="bottom"></i>' +
+							  '</span>';
+
+			if (!$('#radio_cat_state').length) {
+				$('#radio_status').append(iconOnlyHtml);
+			} else {
+				$('#radio_cat_state [data-bs-toggle="tooltip"]').each(function() {
+					safeDisposeTooltip(this);
+				});
+				$('#radio_cat_state').replaceWith(iconOnlyHtml);
+			}
+
+			var tooltipElement = document.querySelector('#radio_status [data-bs-toggle="tooltip"]');
+			if (tooltipElement) {
+				try {
+					new bootstrap.Tooltip(tooltipElement, {
+						title: tooltipContent,
+						html: true,
+						placement: 'bottom'
+					});
+				} catch(e) {
+					// Ignore tooltip initialization errors
+				}
+			}
+
+			// Add blink animation on update
+			$('#radio_status .fa-radio').addClass('blink-once');
+			setTimeout(function() {
+				$('#radio_status .fa-radio').removeClass('blink-once');
+			}, 600);
+
+		} else if (window.CAT_COMPACT_MODE === 'ultra-compact') {
 			// Ultra-compact mode: show radio icon, radio name, and question mark with tooltip
 			var tooltipContent = '';
 			var radioName = '';
@@ -562,17 +692,30 @@ $(document).ready(function() {
 				connectionType = lang_cat_live;
 			} else {
 				connectionType = lang_cat_polling;
-			}				tooltipContent = '<b>' + radioName + '</b> (' + connectionType + ')';
+			}
+			tooltipContent = '<b>' + radioName + '</b> (' + connectionType + ')';
+
+				// Ensure frequency_formatted exists
+				var freqFormatted = data.frequency_formatted;
+				if (!freqFormatted || freqFormatted === 'undefined' || freqFormatted === 'nullkHz') {
+					freqFormatted = format_frequency(data.frequency);
+				}
 
 				// Add frequency info
-				if(data.frequency_rx != null && data.frequency_rx != 0) {
-					tooltipContent += '<br><b>' + lang_cat_tx + ':</b> ' + data.frequency_formatted;
-					data.frequency_rx_formatted = format_frequency(data.frequency_rx);
-					if (data.frequency_rx_formatted) {
-						tooltipContent += '<br><b>' + lang_cat_rx + ':</b> ' + data.frequency_rx_formatted;
+				if(data.frequency_rx && data.frequency_rx != 0 && data.frequency_rx !== 'undefined') {
+					// Split operation: show TX and RX separately
+					if (freqFormatted && freqFormatted !== 'undefined') {
+						tooltipContent += '<br><b>' + lang_cat_tx + ':</b> ' + freqFormatted;
+					}
+					var rxFormatted = format_frequency(data.frequency_rx);
+					if (rxFormatted && rxFormatted !== 'undefined') {
+						tooltipContent += '<br><b>' + lang_cat_rx + ':</b> ' + rxFormatted;
 					}
 				} else {
-					tooltipContent += '<br><b>' + lang_cat_tx_rx + ':</b> ' + data.frequency_formatted;
+					// Simplex operation: show TX/RX combined
+					if (freqFormatted && freqFormatted !== 'undefined') {
+						tooltipContent += '<br><b>' + lang_cat_tx_rx + ':</b> ' + freqFormatted;
+					}
 				}
 
 				// Add mode
@@ -611,10 +754,7 @@ $(document).ready(function() {
 			} else {
 				// Dispose of existing tooltips before updating content
 				$('#radio_cat_state [data-bs-toggle="tooltip"]').each(function() {
-					var tooltipInstance = bootstrap.Tooltip.getInstance(this);
-					if (tooltipInstance) {
-						tooltipInstance.dispose();
-					}
+					safeDisposeTooltip(this);
 				});
 				$('#radio_cat_state').replaceWith(ultraCompactHtml);
 			}
@@ -622,11 +762,15 @@ $(document).ready(function() {
 			// Initialize tooltip with dynamic content
 			var tooltipElement = document.querySelector('#radio_status [data-bs-toggle="tooltip"]');
 			if (tooltipElement) {
-				new bootstrap.Tooltip(tooltipElement, {
-					title: tooltipContent,
-					html: true,
-					placement: 'bottom'
-				});
+				try {
+					new bootstrap.Tooltip(tooltipElement, {
+						title: tooltipContent,
+						html: true,
+						placement: 'bottom'
+					});
+				} catch(e) {
+					// Ignore tooltip initialization errors
+				}
 			}
 
 			// Add blink animation to radio icon on update
@@ -643,10 +787,7 @@ $(document).ready(function() {
 			} else {
 				// Dispose of existing tooltips before updating content
 				$('#radio_cat_state [data-bs-toggle="tooltip"]').each(function() {
-					var tooltipInstance = bootstrap.Tooltip.getInstance(this);
-					if (tooltipInstance) {
-						tooltipInstance.dispose();
-					}
+					safeDisposeTooltip(this);
 				});
 				$('#radio_cat_state').html(html);
 			}
@@ -658,18 +799,15 @@ $(document).ready(function() {
 			} else {
 				// Dispose of existing tooltips before updating content
 				$('#radio_cat_state [data-bs-toggle="tooltip"]').each(function() {
-					var tooltipInstance = bootstrap.Tooltip.getInstance(this);
-					if (tooltipInstance) {
-						tooltipInstance.dispose();
-					}
+					safeDisposeTooltip(this);
 				});
 				// Update existing panel content
 				$('#radio_cat_state .card-body').html(html);
 			}
 		}
 
-		// Initialize Bootstrap tooltips for any new tooltip elements in the radio panel (except ultra-compact which handles its own)
-		if (window.CAT_COMPACT_MODE !== 'ultra-compact') {
+		// Initialize Bootstrap tooltips for any new tooltip elements in the radio panel (except ultra-compact/icon-only which handle their own)
+		if (window.CAT_COMPACT_MODE !== 'ultra-compact' && window.CAT_COMPACT_MODE !== 'icon-only') {
 			$('#radio_cat_state [data-bs-toggle="tooltip"]').each(function() {
 				new bootstrap.Tooltip(this);
 			});
@@ -1007,8 +1145,8 @@ $(document).ready(function() {
             $('#toggleCatTracking').prop('disabled', false).removeClass('disabled');
             // Always initialize WebSocket connection
             initializeWebSocketConnection();
-            // In ultra-compact mode, show offline status if CAT Control is disabled
-            if (window.CAT_COMPACT_MODE === 'ultra-compact' && typeof window.isCatTrackingEnabled !== 'undefined' && !window.isCatTrackingEnabled) {
+            // In ultra-compact/icon-only mode, show offline status if CAT Control is disabled
+            if ((window.CAT_COMPACT_MODE === 'ultra-compact' || window.CAT_COMPACT_MODE === 'icon-only') && typeof window.isCatTrackingEnabled !== 'undefined' && !window.isCatTrackingEnabled) {
                 displayOfflineStatus('cat_disabled');
             }
         } else {
@@ -1020,8 +1158,8 @@ $(document).ready(function() {
             $('#toggleCatTracking').prop('disabled', false).removeClass('disabled');
             // Always start polling
             CATInterval=setInterval(updateFromCAT, CAT_CONFIG.POLL_INTERVAL);
-            // In ultra-compact mode, show offline status if CAT Control is disabled
-            if (window.CAT_COMPACT_MODE === 'ultra-compact' && typeof window.isCatTrackingEnabled !== 'undefined' && !window.isCatTrackingEnabled) {
+            // In ultra-compact/icon-only mode, show offline status if CAT Control is disabled
+            if ((window.CAT_COMPACT_MODE === 'ultra-compact' || window.CAT_COMPACT_MODE === 'icon-only') && typeof window.isCatTrackingEnabled !== 'undefined' && !window.isCatTrackingEnabled) {
                 displayOfflineStatus('cat_disabled');
             }
         }
diff --git a/assets/js/radiohelpers.js b/assets/js/radiohelpers.js
index 8b035fa3b..3bb45895a 100644
--- a/assets/js/radiohelpers.js
+++ b/assets/js/radiohelpers.js
@@ -163,7 +163,7 @@ const SIGNAL_BANDWIDTHS = {
 const BAND_GROUPS = {
 	'MF': ['160m'],
 	'HF': ['80m', '60m', '40m', '30m', '20m', '17m', '15m', '12m', '10m'],
-	'VHF': ['6m', '4m', '2m', '1.25m'],
+	'VHF': ['4m', '2m', '1.25m'],  // Note: 6m has its own separate button in DX Cluster
 	'UHF': ['70cm', '33cm', '23cm'],
 	'SHF': ['13cm', '9cm', '6cm', '3cm', '1.25cm', '6mm', '4mm', '2.5mm', '2mm', '1mm']
 };
diff --git a/assets/js/sections/bandmap_list.js b/assets/js/sections/bandmap_list.js
index 24f2bdebf..73c369757 100644
--- a/assets/js/sections/bandmap_list.js
+++ b/assets/js/sections/bandmap_list.js
@@ -32,7 +32,8 @@ const BAND_BUTTONS = [
 	{ id: '#toggle17mFilter', band: '17m' },
 	{ id: '#toggle15mFilter', band: '15m' },
 	{ id: '#toggle12mFilter', band: '12m' },
-	{ id: '#toggle10mFilter', band: '10m' }
+	{ id: '#toggle10mFilter', band: '10m' },
+	{ id: '#toggle6mFilter', band: '6m' }
 ];
 
 const BAND_GROUP_BUTTONS = [
@@ -60,8 +61,9 @@ const CONTINENT_BUTTONS = [
 const GEO_FLAGS = ['POTA', 'SOTA', 'IOTA', 'WWFF'];
 
 // Performance optimization: Pre-computed band to group lookup map
+// Note: 6m is NOT in VHF group - it has its own separate button
 const BAND_TO_GROUP_MAP = {
-	'6m': 'VHF', '4m': 'VHF', '2m': 'VHF', '1.25m': 'VHF',
+	'4m': 'VHF', '2m': 'VHF', '1.25m': 'VHF',
 	'70cm': 'UHF', '33cm': 'UHF', '23cm': 'UHF',
 	'13cm': 'SHF', '9cm': 'SHF', '6cm': 'SHF', '3cm': 'SHF'
 };
@@ -116,6 +118,18 @@ $(function() {
 	let hoverSpotterMarkers = [];
 	let hoverConnectionLines = [];
 
+	// ========================================
+	// GLOBAL ERROR HANDLING FOR BOOTSTRAP TOOLTIPS
+	// ========================================
+
+	// Suppress Bootstrap tooltip _isWithActiveTrigger errors (known bug with dynamic content)
+	window.addEventListener('error', function(e) {
+		if (e.message && e.message.includes('_isWithActiveTrigger')) {
+			e.preventDefault();
+			return true;
+		}
+	});
+
 	// ========================================
 	// DATATABLES ERROR HANDLING
 	// ========================================
@@ -149,9 +163,20 @@ $(function() {
 		try {
 			$('.spottable [data-bs-toggle="tooltip"]').each(function() {
 				try {
-					const tooltipInstance = bootstrap.Tooltip.getInstance(this);
-					if (tooltipInstance) {
-						tooltipInstance.dispose();
+					if (typeof bootstrap !== 'undefined' && bootstrap.Tooltip) {
+						// Use safeDisposeTooltip if available (from cat.js), otherwise dispose directly
+						if (typeof window.safeDisposeTooltip === 'function') {
+							window.safeDisposeTooltip(this);
+						} else {
+							const tooltipInstance = bootstrap.Tooltip.getInstance(this);
+							if (tooltipInstance) {
+								// Set _activeTrigger to empty object to prevent _isWithActiveTrigger error
+								if (tooltipInstance._activeTrigger) {
+									tooltipInstance._activeTrigger = {};
+								}
+								try { tooltipInstance.dispose(); } catch(e) {}
+							}
+						}
 					}
 				} catch (err) {
 					// Skip individual tooltip errors
@@ -295,6 +320,7 @@ $(function() {
 
 		// Required flags buttons
 		const requiredFlagButtons = [
+			{ id: '#toggleMySubmodesFilter', flag: 'mysubmodes' },
 			{ id: '#toggleLotwFilter', flag: 'lotw' },
 			{ id: '#toggleDxSpotFilter', flag: 'dxspot' },
 			{ id: '#toggleNewContinentFilter', flag: 'newcontinent' },
@@ -382,9 +408,69 @@ $(function() {
 			});
 		}
 
+		// List of all filter select IDs
+		const FILTER_SELECT_IDS = ['cwnSelect', 'decontSelect', 'continentSelect', 'band', 'mode', 'additionalFlags', 'requiredFlags'];
+
+		// Map of storage keys to select IDs
+		const FILTER_KEY_TO_SELECT = {
+			cwn: 'cwnSelect',
+			deCont: 'decontSelect',
+			continent: 'continentSelect',
+			band: 'band',
+			mode: 'mode',
+			additionalFlags: 'additionalFlags',
+			requiredFlags: 'requiredFlags'
+		};
+
+		// Map currentFilters keys to storage keys
+		const CURRENT_TO_STORAGE_KEY = {
+			cwn: 'cwn',
+			deContinent: 'deCont',
+			spottedContinent: 'continent',
+			band: 'band',
+			mode: 'mode',
+			additionalFlags: 'additionalFlags',
+			requiredFlags: 'requiredFlags'
+		};
+
+		/**
+		 * Build filter data object from currentFilters for storage
+		 * @param {string} [favName] - Optional favorite name to include
+		 * @returns {Object} Filter data with storage keys
+		 */
+		function buildFilterDataFromCurrent(favName) {
+			let filterData = {};
+			if (favName) filterData.fav_name = favName;
+			Object.entries(CURRENT_TO_STORAGE_KEY).forEach(([currentKey, storageKey]) => {
+				filterData[storageKey] = currentFilters[currentKey];
+			});
+			// Include My Submodes filter state
+			filterData.mySubmodesActive = isMySubmodesFilterActive;
+			return filterData;
+		}
+
+		/**
+		 * Set all filter values from an object
+		 * @param {Object} filterData - Object with filter keys (cwn, deCont, continent, band, mode, additionalFlags, requiredFlags)
+		 */
+		function setAllFilterValues(filterData) {
+			Object.entries(FILTER_KEY_TO_SELECT).forEach(([key, selectId]) => {
+				if (filterData[key] !== undefined) {
+					$('#' + selectId).val(filterData[key]);
+				}
+			});
+		}
+
+		/**
+		 * Update checkbox indicators for all filter selects
+		 */
+		function updateAllSelectCheckboxes() {
+			FILTER_SELECT_IDS.forEach(selectId => updateSelectCheckboxes(selectId));
+		}
+
 		// Initialize checkbox indicators for all filter selects
 		function initFilterCheckboxes() {
-			['cwnSelect', 'decontSelect', 'continentSelect', 'band', 'mode', 'additionalFlags', 'requiredFlags'].forEach(selectId => {
+			FILTER_SELECT_IDS.forEach(selectId => {
 				updateSelectCheckboxes(selectId);
 				$(`#${selectId}`).on('change', () => updateSelectCheckboxes(selectId));
 			});
@@ -440,6 +526,9 @@ $(function() {
 		$(this).val(currentValues);
 		updateFilterIcon();
 
+		// Sync My Submodes button state from requiredFlags
+		syncMySubmodesFromRequiredFlags();
+
 		// Apply filters with debouncing
 		debouncedApplyFilters(150);
 	});
@@ -489,7 +578,7 @@ $(function() {
 					}
 				},
 				{
-					'targets': [4, 6, 8, 15],  // Submode, Cont, Flag, Message - disable sorting
+					'targets': [6, 8, 15],  // Cont, Flag, Message - disable sorting
 					'orderable': false
 				}
 			],
@@ -620,6 +709,13 @@ $(function() {
 	var refreshCountdown = SPOT_REFRESH_INTERVAL;
 	var refreshTimerInterval = null;
 
+	// Helper function to update refresh timer display (respects compact width)
+	function updateRefreshTimerDisplay() {
+		let isCompactWidth = window.matchMedia('(max-width: 1200px)').matches;
+		$('#refreshIcon').removeClass('fa-spinner fa-spin').addClass('fa-hourglass-half');
+		$('#refreshTimer').html(isCompactWidth ? `${refreshCountdown}s` : (lang_bandmap_next_update + ' ' + refreshCountdown + 's'));
+	}
+
 	// ========================================
 	// STATUS BAR & UI UPDATES
 	// ========================================
@@ -658,7 +754,18 @@ $(function() {
 
 	let now = new Date();
 	let timeStr = `${now.getUTCHours().toString().padStart(2, '0')}:${now.getUTCMinutes().toString().padStart(2, '0')}Z`;
-	let statusMessage = `${totalSpots} ${lang_bandmap_spots_fetched} @ ${timeStr}`;
+
+	// Check if we're at compact breakpoint (≤1200px)
+	let isCompactWidth = window.matchMedia('(max-width: 1200px)').matches;
+
+	let statusMessage;
+	if (isCompactWidth) {
+		// Compact format: (i) xxx/yyy @ HH:MMZ
+		statusMessage = `${displayedSpots}/${totalSpots} @ ${timeStr}`;
+	} else {
+		// Full format
+		statusMessage = `${totalSpots} ${lang_bandmap_spots_fetched} @ ${timeStr}`;
+	}
 	let allFilters = [];		if (serverFilters && serverFilters.length > 0) {
 			allFilters = allFilters.concat(serverFilters.map(f => `de "${f}"`));
 		}
@@ -673,13 +780,15 @@ $(function() {
 			allFilters.push(`search: "${searchValue}"`);
 		}
 
-	// Build status message
-	if (allFilters.length > 0) {
-		statusMessage += `, ${lang_bandmap_showing} ${displayedSpots}`;
-	} else if (displayedSpots < totalSpots) {
-		statusMessage += `, ${lang_bandmap_showing} ${displayedSpots}`;
-	} else if (totalSpots > 0) {
-		statusMessage += `, ${lang_bandmap_showing_all}`;
+	// Build status message - only add "showing" text in full mode (compact already has displayed/total)
+	if (!isCompactWidth) {
+		if (allFilters.length > 0) {
+			statusMessage += `, ${lang_bandmap_showing} ${displayedSpots}`;
+		} else if (displayedSpots < totalSpots) {
+			statusMessage += `, ${lang_bandmap_showing} ${displayedSpots}`;
+		} else if (totalSpots > 0) {
+			statusMessage += `, ${lang_bandmap_showing_all}`;
+		}
 	}		// Build tooltip for status message (fetch information)
 		let fetchTooltipLines = [`${lang_bandmap_last_fetched}:`];
 		fetchTooltipLines.push(`${lang_bandmap_band}: ${lastFetchParams.band || lang_bandmap_all}`);
@@ -700,15 +809,20 @@ $(function() {
 	$('#statusFilterInfo').remove();
 	if (allFilters.length > 0) {
 		let filterTooltip = lang_bandmap_active_filters + ':\n' + allFilters.join('\n');
-		$('#statusMessage').after(' <i class="fas fa-info-circle text-muted" id="statusFilterInfo" style="cursor: help;" title="' + filterTooltip.replace(/"/g, '&quot;') + '"></i>');
+		if (isCompactWidth) {
+			// In compact mode, prepend (i) icon before the status message
+			$('#statusMessage').prepend('<i class="fas fa-info-circle text-muted me-1" id="statusFilterInfo" style="cursor: help;" title="' + filterTooltip.replace(/"/g, '&quot;') + '"></i>');
+		} else {
+			$('#statusMessage').after(' <i class="fas fa-info-circle text-muted" id="statusFilterInfo" style="cursor: help;" title="' + filterTooltip.replace(/"/g, '&quot;') + '"></i>');
+		}
 	}
 
 	if (isFetching) {
 		$('#refreshIcon').removeClass('fa-hourglass-half').addClass('fa-spinner fa-spin');
-		$('#refreshTimer').html(lang_bandmap_fetching);
+		$('#refreshTimer').html(isCompactWidth ? '...' : lang_bandmap_fetching);
 	} else {
 		$('#refreshIcon').removeClass('fa-spinner fa-spin').addClass('fa-hourglass-half');
-		$('#refreshTimer').html(lang_bandmap_next_update + ' ' + refreshCountdown + 's');
+		$('#refreshTimer').html(isCompactWidth ? `${refreshCountdown}s` : (lang_bandmap_next_update + ' ' + refreshCountdown + 's'));
 	}
 }	function getDisplayedSpotCount() {
 		var table = get_dtable();
@@ -742,13 +856,44 @@ $(function() {
 				refreshCountdown = SPOT_REFRESH_INTERVAL;
 			} else {
 				if (!isFetchInProgress && lastFetchParams.timestamp !== null) {
-					$('#refreshIcon').removeClass('fa-spinner fa-spin').addClass('fa-hourglass-half');
-					$('#refreshTimer').html(lang_bandmap_next_update + ' ' + refreshCountdown + 's');
+					updateRefreshTimerDisplay();
 				}
 			}
 		}, 1000);
 	}
 
+	// Handle page visibility changes (tab switching, minimize, etc.)
+	// Remove expiring spots when hidden, fetch fresh data when returning (if away > 1 minute)
+	document.addEventListener('visibilitychange', function() {
+		if (document.hidden) {
+			// Dispose tooltips to prevent Bootstrap errors
+			disposeTooltips();
+			// Remove TTL<=0 (red/expiring) spots - they'll be stale when we return
+			let keysToDelete = [];
+			spotTTLMap.forEach(function(ttl, key) {
+				if (ttl <= 0) keysToDelete.push(key);
+			});
+			keysToDelete.forEach(function(key) {
+				spotTTLMap.delete(key);
+			});
+			// Also remove from cachedSpotData and redraw table
+			if (cachedSpotData && keysToDelete.length > 0) {
+				let keySet = new Set(keysToDelete);
+				cachedSpotData = cachedSpotData.filter(function(spot) {
+					return !keySet.has(getSpotKey(spot));
+				});
+				renderFilteredSpots();
+			}
+		} else if (lastFetchParams.timestamp) {
+			// Only refresh if last fetch was more than 60 seconds ago
+			const timeSinceLastFetch = Date.now() - lastFetchParams.timestamp.getTime();
+			if (timeSinceLastFetch > 60000) {
+				fill_list(lastFetchParams.continent, lastFetchParams.maxAge, lastFetchParams.band || 'All');
+				refreshCountdown = SPOT_REFRESH_INTERVAL;
+			}
+		}
+	});
+
 	// Build array of server-side filter labels for display
 	function getServerFilterText() {
 		let filters = [];
@@ -840,10 +985,14 @@ $(function() {
 		var table = get_dtable();
 
 		if (!cachedSpotData || cachedSpotData.length === 0) {
-			disposeTooltips();
-			table.clear();
-			table.settings()[0].oLanguage.sEmptyTable = lang_bandmap_no_data;
-			table.draw();
+			// Only show "no data" if not currently fetching
+			// During fetch, keep showing current table contents
+			if (!isFetchInProgress) {
+				disposeTooltips();
+				table.clear();
+				table.settings()[0].oLanguage.sEmptyTable = lang_bandmap_no_data;
+				table.draw();
+			}
 			return;
 		}
 
@@ -886,6 +1035,10 @@ $(function() {
 			for (let i = 0; i < requiredFlags.length; i++) {
 				const reqFlag = requiredFlags[i];
 				switch (reqFlag) {
+					case 'mysubmodes':
+						// My Submodes: spot's submode must match user's enabled submodes
+						if (!matchesUserSubmodes(single.submode)) return;
+						break;
 					case 'lotw':
 						if (!dxccSpotted || !dxccSpotted.lotw_user) return;
 						break;
@@ -931,7 +1084,9 @@ $(function() {
 		if (deContinentSet && (!dxccSpotter || !dxccSpotter.cont || !deContinentSet.has(dxccSpotter.cont))) return;
 
 		// Apply spotted continent filter (which continent the DX station is in)
-		if (spottedContinentSet && (!dxccSpotted || !dxccSpotted.cont || !spottedContinentSet.has(dxccSpotted.cont))) return;		// Apply mode filter (API already returns mode categories)
+		if (spottedContinentSet && (!dxccSpotted || !dxccSpotted.cont || !spottedContinentSet.has(dxccSpotted.cont))) return;
+
+		// Apply mode filter (API already returns mode categories)
 		if (modeSet && (!single.mode || !modeSet.has(single.mode))) return;
 
 		// Apply additional flags filter (POTA, SOTA, WWFF, IOTA, Contest, Fresh)
@@ -1257,29 +1412,38 @@ $(function() {
 
 	// Initialize tooltips with error handling
 	try {
-		$('[data-bs-toggle="tooltip"]').each(function() {
-			if (!this || !$(this).attr('title')) return;
+		if (typeof bootstrap !== 'undefined' && bootstrap.Tooltip) {
+			$('[data-bs-toggle="tooltip"]').each(function() {
+				if (!this || !$(this).attr('title')) return;
 
-			try {
-				// Dispose existing tooltip instance if it exists
-				const existingTooltip = bootstrap.Tooltip.getInstance(this);
-				if (existingTooltip) {
-					existingTooltip.dispose();
+				try {
+					// Dispose existing tooltip instance if it exists
+					if (typeof window.safeDisposeTooltip === 'function') {
+						window.safeDisposeTooltip(this);
+					} else {
+						const existingTooltip = bootstrap.Tooltip.getInstance(this);
+						if (existingTooltip) {
+							if (existingTooltip._activeTrigger) {
+								existingTooltip._activeTrigger = {};
+							}
+							try { existingTooltip.dispose(); } catch(e) {}
+						}
+					}
+
+					// Create new tooltip instance with proper configuration
+					new bootstrap.Tooltip(this, {
+						boundary: 'window',
+						trigger: 'hover',
+						sanitize: false,
+						html: false,
+						animation: true,
+						delay: { show: 100, hide: 100 }
+					});
+				} catch (err) {
+					// Skip if tooltip fails to initialize
 				}
-
-				// Create new tooltip instance with proper configuration
-				new bootstrap.Tooltip(this, {
-					boundary: 'window',
-					trigger: 'hover',
-					sanitize: false,
-					html: false,
-					animation: true,
-					delay: { show: 100, hide: 100 }
-				});
-			} catch (err) {
-				// Skip if tooltip fails to initialize
-			}
-		});
+			});
+		}
 	} catch (e) {
 		// Fallback if tooltip initialization fails
 	}		let displayedCount = spots2render || 0;
@@ -1298,8 +1462,7 @@ $(function() {
 			if (!isFetchInProgress) {
 				let actualDisplayedCount = table.rows({search: 'applied'}).count();
 				updateStatusBar(cachedSpotData.length, actualDisplayedCount, getServerFilterText(), getClientFilterText(), false, false);
-				$('#refreshIcon').removeClass('fa-spinner fa-spin').addClass('fa-hourglass-half');
-				$('#refreshTimer').html(lang_bandmap_next_update + ' ' + refreshCountdown + 's');
+				updateRefreshTimerDisplay();
 			}
 
 			// Update DX Map only if visible (don't waste resources)
@@ -1478,9 +1641,10 @@ $(function() {
 				}
 			});
 
-		// Update individual MF/HF band button badges
+		// Update individual MF/HF/6m band button badges
+		// Note: 6m has its own separate button (not part of VHF group)
 		const mfHfBands = [
-			'160m', '80m', '60m', '40m', '30m', '20m', '17m', '15m', '12m', '10m'
+			'160m', '80m', '60m', '40m', '30m', '20m', '17m', '15m', '12m', '10m', '6m'
 		];
 
 		mfHfBands.forEach(band => {
@@ -1522,6 +1686,7 @@ $(function() {
 
 		// Count spots for quick filter badges
 		let quickFilterCounts = {
+			mysubmodes: 0,
 			lotw: 0,
 			dxspot: 0,
 			newcontinent: 0,
@@ -1562,6 +1727,7 @@ $(function() {
 			if (selectedModeSet && (!spot.mode || !selectedModeSet.has(spot.mode))) return;
 
 			// Count quick filter matches (use cached references)
+			if (spot.submode && userEnabledSubmodes.length > 0 && userEnabledSubmodes.some(m => m.toUpperCase() === spot.submode.toUpperCase())) quickFilterCounts.mysubmodes++;
 			if (dxccSpotted && dxccSpotted.lotw_user) quickFilterCounts.lotw++;
 			if (dxccSpotted?.cont && dxccSpotter?.cont && dxccSpotted.cont !== dxccSpotter.cont) quickFilterCounts.dxspot++;
 			if (spot.worked_continent === false) quickFilterCounts.newcontinent++;
@@ -1574,6 +1740,7 @@ $(function() {
 
 		// Update quick filter badges
 		const quickFilters = [
+			{ id: 'toggleMySubmodesFilter', count: quickFilterCounts.mysubmodes },
 			{ id: 'toggleLotwFilter', count: quickFilterCounts.lotw },
 			{ id: 'toggleDxSpotFilter', count: quickFilterCounts.dxspot },
 			{ id: 'toggleNewContinentFilter', count: quickFilterCounts.newcontinent },
@@ -1898,25 +2065,21 @@ $(function() {
 	});
 
 	$("#clearFiltersButton").on("click", function() {
-		// Preserve current band selection if CAT Control is enabled
-		let currentBand = isCatTrackingEnabled ? $('#band').val() : null;
+		// Preserve current band selection only if band lock (purple mode) is active
+		let currentBand = window.isFrequencyMarkerEnabled === true ? $('#band').val() : null;
 
-		$('#cwnSelect').val(['All']);
-		$('#decontSelect').val(['Any']);
-		$('#continentSelect').val(['Any']);
-		$('#band').val(currentBand || ['All']); // Preserve band if CAT is enabled
-		$('#mode').val(['All']);
-		$('#additionalFlags').val(['All']);
-		$('#requiredFlags').val([]);
+		setAllFilterValues({
+			cwn: ['All'],
+			deCont: ['Any'],
+			continent: ['Any'],
+			band: currentBand || ['All'],
+			mode: ['All'],
+			additionalFlags: ['All'],
+			requiredFlags: []
+		});
 
 		// Update checkbox indicators for all selects
-		updateSelectCheckboxes('cwnSelect');
-		updateSelectCheckboxes('decontSelect');
-		updateSelectCheckboxes('continentSelect');
-		updateSelectCheckboxes('band');
-		updateSelectCheckboxes('mode');
-		updateSelectCheckboxes('additionalFlags');
-		updateSelectCheckboxes('requiredFlags');
+		updateAllSelectCheckboxes();
 
 		// Clear text search
 		$('#spotSearchInput').val('');
@@ -1928,8 +2091,8 @@ $(function() {
 		applyFilters(true);
 		$('#filterDropdown').dropdown('hide');
 
-		if (isCatTrackingEnabled && typeof showToast === 'function') {
-			showToast(lang_bandmap_clear_filters, lang_bandmap_band_preserved, 'bg-info text-white', 2000);
+		if (window.isFrequencyMarkerEnabled === true && typeof showToast === 'function') {
+			showToast(lang_bandmap_clear_filters, lang_bandmap_band_preserved, 'bg-info text-white', 5000);
 		}
 	});
 
@@ -1937,13 +2100,13 @@ $(function() {
 	$("#clearFiltersButtonQuick").on("click", function() {
 		// Preserve current De Continent selection
 		let currentDecont = $('#decontSelect').val();
-		// Preserve current band selection if CAT Control is enabled
-		let currentBand = isCatTrackingEnabled ? $('#band').val() : null;
+		// Preserve current band selection only if band lock (purple mode) is active
+		let currentBand = window.isFrequencyMarkerEnabled === true ? $('#band').val() : null;
 
 		// Reset all other filters
 		$('#cwnSelect').val(['All']).trigger('change');
 		$('#continentSelect').val(['Any']).trigger('change');
-		$('#band').val(currentBand || ['All']).trigger('change'); // Preserve band if CAT is enabled
+		$('#band').val(currentBand || ['All']).trigger('change'); // Preserve band if band lock is active
 		$('#mode').val(['All']).trigger('change');
 		$('#additionalFlags').val(['All']).trigger('change');
 		$('#requiredFlags').val([]).trigger('change');
@@ -1960,11 +2123,169 @@ $(function() {
 		updateFilterIcon();
 		applyFilters(false);  // Don't refetch from server since De Continent is preserved
 
-		if (isCatTrackingEnabled && typeof showToast === 'function') {
-			showToast(lang_bandmap_clear_filters, lang_bandmap_band_preserved, 'bg-info text-white', 2000);
+		if (window.isFrequencyMarkerEnabled === true && typeof showToast === 'function') {
+			showToast(lang_bandmap_clear_filters, lang_bandmap_band_preserved, 'bg-info text-white', 5000);
 		}
 	});
 
+	// ========================================
+	// DX CLUSTER FILTER FAVORITES
+	// ========================================
+
+	let dxclusterFavs = {};
+
+	/**
+	 * Apply saved filter values to UI and trigger filter application
+	 * When band lock is active, band filter is preserved (not restored from favorites)
+	 */
+	function applyDxClusterFilterValues(filterData) {
+		// If band lock is active, preserve current band filter
+		// window.isFrequencyMarkerEnabled is set to true when lock mode is enabled
+		if (window.isFrequencyMarkerEnabled === true) {
+			// Create a copy without the band filter
+			let filteredData = Object.assign({}, filterData);
+			delete filteredData.band;
+			setAllFilterValues(filteredData);
+			// Show toast that band filter was preserved
+			if (typeof showToast === 'function') {
+				showToast(lang_bandmap_filter_favorites, lang_bandmap_band_preserved, 'bg-info text-white', 5000);
+			}
+		} else {
+			setAllFilterValues(filterData);
+		}
+
+		// Restore My Submodes filter state if stored (and user has submodes enabled)
+		if (filterData.mySubmodesActive !== undefined && userEnabledSubmodes.length > 0) {
+			isMySubmodesFilterActive = filterData.mySubmodesActive;
+			updateMySubmodesButtonVisual();
+			updateModeButtonsForSubmodes();
+		}
+
+		updateAllSelectCheckboxes();
+		syncQuickFilterButtons();
+		updateFilterIcon();
+		applyFilters(true);
+	}
+
+	function saveDxClusterFav() {
+		// Check preset limit (max 20)
+		if (Object.keys(dxclusterFavs).length >= 20) {
+			showToast && showToast(lang_bandmap_filter_favorites, lang_bandmap_preset_limit_reached, 'bg-warning text-dark', 4000);
+			return;
+		}
+
+		let favName = prompt(lang_bandmap_filter_preset_name);
+		if (!favName || favName.trim() === '') return;
+
+		// Build filter data from currentFilters using helper
+		let filterData = buildFilterDataFromCurrent(favName.trim());
+
+		$.ajax({
+			url: base_url + 'index.php/user_options/add_edit_dxcluster_fav',
+			method: 'POST',
+			dataType: 'json',
+			contentType: 'application/json; charset=utf-8',
+			data: JSON.stringify(filterData),
+			success: function(result) {
+				if (result.success) {
+					getDxClusterFavs();
+					showToast && showToast(lang_bandmap_filter_favorites, lang_bandmap_filter_preset_saved, 'bg-success text-white', 2000);
+				}
+			},
+			error: function() {
+				showToast && showToast(lang_bandmap_filter_favorites, lang_bandmap_favorites_failed, 'bg-danger text-white', 3000);
+			}
+		});
+	}
+
+	function getDxClusterFavs() {
+		$.ajax({
+			url: base_url + 'index.php/user_options/get_dxcluster_user_favs_and_settings',
+			method: 'GET',
+			dataType: 'json',
+			success: function(result) {
+				// Handle combined response with favorites and userConfig
+				dxclusterFavs = result.favorites || {};
+				renderDxClusterFavMenu();
+
+				// Process user config (bands/modes/submodes)
+				if (result.userConfig) {
+					processUserConfig(result.userConfig);
+				}
+			}
+		});
+	}
+
+	function renderDxClusterFavMenu() {
+		let $menu = $('#dxcluster_fav_menu').empty();
+
+		let keys = Object.keys(dxclusterFavs);
+		if (keys.length === 0) {
+			$menu.append('<span class="dropdown-item-text text-muted"><em>' + lang_bandmap_no_filter_presets + '</em></span>');
+			return;
+		}
+
+		keys.forEach(function(key) {
+			// Build the menu item with data attribute on the parent div for easier click handling
+			let $item = $('<div class="dropdown-item d-flex justify-content-between align-items-center dxcluster_fav_item" style="cursor: pointer;"></div>').attr('data-fav-name', key);
+			let $nameSpan = $('<span></span>').text(key);
+			let $deleteBtn = $('<span class="badge bg-danger dxcluster_fav_del ms-2"></span>').attr('data-fav-name', key).attr('title', lang_general_word_delete).html('<i class="fas fa-trash-alt"></i>');
+			$menu.append($item.append($nameSpan).append($deleteBtn));
+		});
+	}
+
+	function delDxClusterFav(name) {
+		if (!confirm(lang_bandmap_delete_filter_confirm)) return;
+
+		$.ajax({
+			url: base_url + 'index.php/user_options/del_dxcluster_fav',
+			method: 'POST',
+			dataType: 'json',
+			contentType: 'application/json; charset=utf-8',
+			data: JSON.stringify({ option_name: name }),
+			success: function(result) {
+				if (result.success) {
+					getDxClusterFavs();
+					showToast && showToast(lang_bandmap_filter_favorites, lang_bandmap_filter_preset_deleted, 'bg-info text-white', 2000);
+				}
+			}
+		});
+	}
+
+	// Event handlers
+	$('#dxcluster_fav_add').on('click', function(e) {
+		e.preventDefault();
+		saveDxClusterFav();
+	});
+
+	$(document).on('click', '.dxcluster_fav_del', function(e) {
+		e.preventDefault();
+		e.stopPropagation();
+		delDxClusterFav($(this).data('fav-name'));
+	});
+
+	// Click on the entire favorite item row (but not the delete button)
+	$(document).on('click', '.dxcluster_fav_item', function(e) {
+		// Don't trigger if clicking the delete button
+		if ($(e.target).closest('.dxcluster_fav_del').length) return;
+
+		e.preventDefault();
+		let name = $(this).data('fav-name');
+		if (dxclusterFavs[name]) {
+			applyDxClusterFilterValues(dxclusterFavs[name]);
+			// Escape name for toast display (showToast uses innerHTML)
+			let safeName = $('<div>').text(name).html();
+			showToast && showToast(lang_bandmap_filter_favorites, lang_bandmap_filter_preset_loaded + ': ' + safeName, 'bg-success text-white', 2000);
+		}
+	});
+
+	// Load favorites on page load
+	getDxClusterFavs();
+
+	// ========================================
+	// END DX CLUSTER FILTER FAVORITES
+	// ========================================
+
 	// Sync button states when dropdown is shown
 	$('#filterDropdown').on('show.bs.dropdown', function() {
 		syncQuickFilterButtons();
@@ -2014,17 +2335,21 @@ $(function() {
 
 		// If "None" (value "0") is selected, automatically disable CAT Control
 		if (selectedRadio === "0") {
-
-
 			// If CAT Control is currently enabled, turn it off
 			if (isCatTrackingEnabled) {
-				let btn = $('#toggleCatTracking');
-				btn.removeClass('btn-success').addClass('btn-secondary');
 				isCatTrackingEnabled = false;
 				window.isCatTrackingEnabled = false;
-				window.isFrequencyMarkerEnabled = false;
 				catState = 'off';
 
+				// Also disable lock mode if enabled
+				if (window.isFrequencyMarkerEnabled) {
+					window.isFrequencyMarkerEnabled = false;
+					enableBandFilterControls();
+					unlockTableSorting();
+					clearFrequencyGradientColors();
+					updateLockButtonVisual(false);
+				}
+
 				// Show offline status instead of just hiding
 				if (typeof window.displayOfflineStatus === 'function') {
 					window.displayOfflineStatus('no_radio');
@@ -2032,28 +2357,18 @@ $(function() {
 					$('#radio_cat_state').remove();
 				}
 
-				// Re-enable band filter controls
-				enableBandFilterControls();
-
-				// Unlock table sorting
-				unlockTableSorting();
-
-				// Clear frequency gradient colors and purple mode indicators
-				clearFrequencyGradientColors();
-
-				// Reset button visual to OFF state
-				updateButtonVisual('off');
-
 				// Reset band filter to 'All' and fetch all bands
 				const currentBands = $("#band").val() || [];
 				if (currentBands.length !== 1 || currentBands[0] !== 'All') {
-
 					$("#band").val(['All']);
 					updateSelectCheckboxes('band');
 					syncQuickFilterButtons();
-					applyFilters(true); // Force reload to fetch all bands
+					applyFilters(true);
 				}
 
+				updateCatButtonVisual(false);
+				updateLockButtonState(false);
+
 				if (typeof showToast === 'function') {
 					showToast(lang_bandmap_radio, lang_bandmap_radio_none, 'bg-info text-white', 3000);
 				}
@@ -2302,13 +2617,9 @@ $(function() {
 	var lastGradientFrequency = null; // Track last frequency used for gradient update
 	var lastRadioBand = null; // Store last valid band from radio frequency updates
 
-	// Three-state CAT control: 'off', 'on', 'on+marker'
+	// Two-state CAT control: 'off', 'on', with separate 'on+marker' for lock mode
 	var catState = 'off';
-	window.isFrequencyMarkerEnabled = false; // Purple mode indicator
-
-	// Click detection for single/double-click
-	var catClickTimer = null;
-	var catClickPreventSingle = false;
+	window.isFrequencyMarkerEnabled = false; // Lock mode (purple mode) indicator
 
 	/**
 	 * Calculate frequency gradient color based on distance from radio frequency
@@ -2513,8 +2824,17 @@ $(function() {
 		}
 
 		// Display radio status when CAT is enabled (don't call full catJsUpdateCATui as it updates QSO form fields)
+		// But we need to check for stale data like cat.js does
 		if (isCatTrackingEnabled && typeof window.displayRadioStatus === 'function') {
-			window.displayRadioStatus('success', data);
+			// Check if data is too old (same logic as cat.js updateCATui)
+			var minutes = typeof cat_timeout_minutes !== 'undefined' ? cat_timeout_minutes : 5;
+			if (data.updated_minutes_ago > minutes) {
+				// Data is stale - show timeout
+				var radioName = $('select.radios option:selected').text();
+				window.displayRadioStatus('timeout', radioName);
+			} else {
+				window.displayRadioStatus('success', data);
+			}
 		}
 
 		// Update frequency gradient colors for all visible rows (works in both normal and purple CAT modes)
@@ -2558,6 +2878,9 @@ $(function() {
 			}
 
 			setTimeout(function() {
+				if (typeof handleResponsiveColumns === 'function') {
+					handleResponsiveColumns();
+				}
 				if ($.fn.DataTable.isDataTable('.spottable')) {
 					$('.spottable').DataTable().columns.adjust();
 				}
@@ -2582,6 +2905,9 @@ $(function() {
 			}
 
 			setTimeout(function() {
+				if (typeof handleResponsiveColumns === 'function') {
+					handleResponsiveColumns();
+				}
 				if ($.fn.DataTable.isDataTable('.spottable')) {
 					$('.spottable').DataTable().columns.adjust();
 				}
@@ -2595,12 +2921,63 @@ $(function() {
 		}
 	});
 
+	// ========================================
+	// COMPACT MODE TOGGLE
+	// ========================================
+
+	let isCompactMode = false;
+
+	$('#compactModeToggle').on('click', function() {
+		const compactableRows = $('.menu-bar .compactable-row');
+		const icon = $('#compactModeIcon');
+
+		if (!isCompactMode) {
+			compactableRows.addClass('compact-hidden').hide();
+			icon.removeClass('fa-compress-alt').addClass('fa-expand-alt');
+			isCompactMode = true;
+		} else {
+			compactableRows.removeClass('compact-hidden').show();
+			icon.removeClass('fa-expand-alt').addClass('fa-compress-alt');
+			isCompactMode = false;
+		}
+
+		// Adjust DataTable columns after toggle
+		setTimeout(function() {
+			if (typeof handleResponsiveColumns === 'function') {
+				handleResponsiveColumns();
+			}
+			if ($.fn.DataTable.isDataTable('.spottable')) {
+				$('.spottable').DataTable().columns.adjust();
+			}
+		}, 100);
+	});
+
+	// ========================================
+	// WINDOW RESIZE - UPDATE STATUS BAR FORMAT
+	// ========================================
+
+	let statusResizeTimeout;
+	$(window).on('resize', function() {
+		clearTimeout(statusResizeTimeout);
+		statusResizeTimeout = setTimeout(function() {
+			// Update status bar to reflect compact/full format based on new width
+			if (lastFetchParams.timestamp !== null) {
+				var table = get_dtable();
+				var displayedSpots = table.rows({search: 'applied'}).count();
+				var totalSpots = table.rows().count();
+				updateStatusBar(totalSpots, displayedSpots, getServerFilterText(), getClientFilterText(), false, false);
+			}
+		}, 150);
+	});
+
 	// ========================================
 	// QUICK FILTER TOGGLE BUTTONS
 	// ========================================
 
 	// Toggle CW mode filter
 	$('#toggleCwFilter').on('click', function() {
+		if ($(this).data('mode-disabled')) return; // Disabled by My Submodes filter
+
 		let currentValues = $('#mode').val() || [];
 
 		// Remove 'All' if present
@@ -2629,6 +3006,8 @@ $(function() {
 
 	// Toggle Digital mode filter
 	$('#toggleDigiFilter').on('click', function() {
+		if ($(this).data('mode-disabled')) return; // Disabled by My Submodes filter
+
 		let currentValues = $('#mode').val() || [];
 
 		// Remove 'All' if present
@@ -2657,6 +3036,8 @@ $(function() {
 
 	// Toggle Phone mode filter
 	$('#togglePhoneFilter').on('click', function() {
+		if ($(this).data('mode-disabled')) return; // Disabled by My Submodes filter
+
 		let currentValues = $('#mode').val() || [];
 
 		// Remove 'All' if present
@@ -2988,69 +3369,142 @@ $(function() {
 		applyFilters(false);
 	});
 
-	// Toggle Favorites filter - applies user's active bands and modes
-	$('#toggleFavoritesFilter').on('click', function() {
-		// Use cached favorites if available, otherwise fetch
-		if (cachedUserFavorites !== null) {
-			applyUserFavorites(cachedUserFavorites);
-		} else {
-			// Fallback: fetch if cache is not available
-			let base_url = dxcluster_provider.replace('/dxcluster', '');
-			$.ajax({
-				url: base_url + '/bandmap/get_user_favorites',
-				method: 'GET',
-				dataType: 'json',
-				success: function(favorites) {
-					cachedUserFavorites = favorites;
-					applyUserFavorites(favorites);
-				},
-				error: function() {
-					showToast(lang_bandmap_my_favorites, lang_bandmap_favorites_failed, 'bg-danger text-white', 3000);
-				}
-			});
-		}
+	// ========================================
+	// MY SUBMODES FILTER TOGGLE
+	// ========================================
+
+	// Track My Submodes filter state
+	let isMySubmodesFilterActive = false;
+	let userEnabledSubmodes = []; // List of user's enabled submodes from settings
+	let userModeCategories = { cw: true, phone: true, digi: true }; // Which mode categories user has enabled
+
+	/**
+	 * Update mode buttons based on My Submodes filter state
+	 * When My Submodes is active, disable mode buttons for categories user doesn't have
+	 */
+	function updateModeButtonsForSubmodes() {
+		// Map mode to original tooltip translation
+		const modeTooltips = {
+			'cw': lang_bandmap_toggle_cw,
+			'digi': lang_bandmap_toggle_digi,
+			'phone': lang_bandmap_toggle_phone
+		};
+
+		MODE_BUTTONS.forEach(btn => {
+			const $btn = $(btn.id);
+			const hasCategory = userModeCategories[btn.mode];
+
+			if (isMySubmodesFilterActive && !hasCategory) {
+				// My Submodes active and user doesn't have this category - visually disable button
+				// Use visual styling instead of disabled property to allow tooltip to show
+				$btn.addClass('disabled').css('opacity', '0.5').css('pointer-events', 'auto');
+				$btn.attr('aria-disabled', 'true');
+				$btn.data('mode-disabled', true);
+				$btn.attr('title', lang_bandmap_mode_disabled_no_submode);
+			} else {
+				// Re-enable button and restore original tooltip
+				$btn.removeClass('disabled').css('opacity', '').css('pointer-events', '');
+				$btn.attr('aria-disabled', 'false');
+				$btn.data('mode-disabled', false);
+				$btn.attr('title', modeTooltips[btn.mode]);
+			}
+		});
+	}
+
+	/**
+	 * Toggle My Submodes filter on/off via button click
+	 * Syncs with requiredFlags select
+	 */
+	$('#toggleMySubmodesFilter').on('click', function() {
+		if ($(this).prop('disabled')) return;
+
+		isMySubmodesFilterActive = !isMySubmodesFilterActive;
+
+		// Sync with requiredFlags select
+		syncMySubmodesToRequiredFlags();
+		updateMySubmodesButtonVisual();
+		updateModeButtonsForSubmodes();
+		applyFilters(false);
 	});
 
 	/**
-	 * Apply user favorites to band and mode filters
+	 * Sync isMySubmodesFilterActive state to requiredFlags select
 	 */
-	function applyUserFavorites(favorites) {
-		// Apply bands - but preserve current band if CAT Control is enabled
-		if (isCatTrackingEnabled) {
-			// CAT Control is active - don't change band filter
+	function syncMySubmodesToRequiredFlags() {
+		let currentFlags = $('#requiredFlags').val() || [];
+		currentFlags = currentFlags.filter(v => v !== 'None');
 
-			if (typeof showToast === 'function') {
-				showToast(lang_bandmap_my_favorites, lang_bandmap_modes_applied, 'bg-info text-white', 3000);
+		if (isMySubmodesFilterActive) {
+			if (!currentFlags.includes('mysubmodes')) {
+				currentFlags.push('mysubmodes');
 			}
 		} else {
-			// CAT Control is off - apply favorite bands
-			if (favorites.bands && favorites.bands.length > 0) {
-				$('#band').val(favorites.bands).trigger('change');
-			} else {
-				// No active bands, set to All
-				$('#band').val(['All']).trigger('change');
-			}
+			currentFlags = currentFlags.filter(v => v !== 'mysubmodes');
 		}
 
-		// Apply modes
-		let activeModes = [];
-		if (favorites.modes.cw) activeModes.push('cw');
-		if (favorites.modes.phone) activeModes.push('phone');
-		if (favorites.modes.digi) activeModes.push('digi');
+		if (currentFlags.length === 0) {
+			currentFlags = ['None'];
+		}
 
-		if (activeModes.length > 0) {
-			$('#mode').val(activeModes).trigger('change');
+		$('#requiredFlags').val(currentFlags).trigger('change');
+	}
+
+	/**
+	 * Sync button state from requiredFlags select (called when select changes)
+	 */
+	function syncMySubmodesFromRequiredFlags() {
+		let currentFlags = ($('#requiredFlags').val() || []).filter(v => v !== 'None');
+		let shouldBeActive = currentFlags.includes('mysubmodes');
+
+		// Only update if state changed and user has submodes configured
+		if (shouldBeActive !== isMySubmodesFilterActive && userEnabledSubmodes.length > 0) {
+			isMySubmodesFilterActive = shouldBeActive;
+			updateMySubmodesButtonVisual();
+			updateModeButtonsForSubmodes();
+		}
+	}
+
+	/**
+	 * Update My Submodes button visual state
+	 */
+	function updateMySubmodesButtonVisual() {
+		const $btn = $('#toggleMySubmodesFilter');
+		$btn.removeClass('btn-secondary btn-success');
+		if (isMySubmodesFilterActive) {
+			$btn.addClass('btn-success');
 		} else {
-			// No active modes, filter out everything (or set to All if you prefer)
-			$('#mode').val(['All']).trigger('change');
+			$btn.addClass('btn-secondary');
 		}
+	}
 
-		// Sync button states and apply filters
-		syncQuickFilterButtons();
-		updateBandCountBadges();
-		applyFilters(false);
+	/**
+	 * Update My Submodes button tooltip with list of enabled submodes
+	 */
+	function updateMySubmodesTooltip() {
+		const $btn = $('#toggleMySubmodesFilter');
+		if (userEnabledSubmodes.length > 0) {
+			const modesList = userEnabledSubmodes.join(', ');
+			$btn.attr('title', lang_bandmap_required_submodes + ': ' + modesList + ' (' + lang_bandmap_submodes_settings_hint + ')');
+		} else {
+			$btn.attr('title', lang_bandmap_no_submodes_configured);
+		}
+	}
 
-		showToast(lang_bandmap_my_favorites, lang_bandmap_favorites_applied, 'bg-success text-white', 3000);
+	/**
+	 * Check if a spot's submode matches user's enabled submodes
+	 * @param {string} spotSubmode - The submode from the spot
+	 * @returns {boolean} - True if matches or filter is off
+	 */
+	function matchesUserSubmodes(spotSubmode) {
+		if (!isMySubmodesFilterActive || userEnabledSubmodes.length === 0) {
+			return true; // Filter off or no submodes = show all
+		}
+		if (!spotSubmode || spotSubmode === '') {
+			return false; // No submode on spot = don't match
+		}
+		return userEnabledSubmodes.some(mode =>
+			mode.toUpperCase() === spotSubmode.toUpperCase()
+		);
 	}
 
 	// ========================================
@@ -3127,8 +3581,8 @@ $(function() {
 		$('.spottable').removeClass('cat-sorting-locked');
 
 		// Re-enable sorting on all columns that were originally sortable
-		// Based on columnDefs: columns 4, 6, 8, 15 are not sortable (Submode, Cont, Flag, Message)
-		const nonSortableColumns = [4, 6, 8, 15];
+		// Based on columnDefs: columns 6, 8, 15 are not sortable (Cont, Flag, Message)
+		const nonSortableColumns = [6, 8, 15];
 
 		table.settings()[0].aoColumns.forEach(function(col, index) {
 			if (!nonSortableColumns.includes(index)) {
@@ -3167,190 +3621,244 @@ $(function() {
 	}
 
 	/**
-	 * Update button visual appearance based on CAT state
+	 * Update CAT connection button visual appearance
 	 */
-	function updateButtonVisual(state) {
+	function updateCatButtonVisual(enabled) {
 		let btn = $('#toggleCatTracking');
-		let radioIcon = btn.find('i.fa-radio');
-
 		btn.removeClass('btn-secondary btn-success');
-		radioIcon.removeClass('fa-podcast fa-crosshairs').css('color', '');
-		btn.css('box-shadow', '');
 
-		if (state === 'off') {
-			btn.addClass('btn-secondary').attr('data-bs-original-title', decodeHtml(lang_bandmap_cat_off));
-			radioIcon.addClass('fa-radio');
-		} else if (state === 'on') {
+		if (enabled) {
 			btn.addClass('btn-success').attr('data-bs-original-title', decodeHtml(lang_bandmap_cat_on));
-			radioIcon.addClass('fa-radio');
-		} else if (state === 'on+marker') {
-			btn.addClass('btn-success').attr('data-bs-original-title', decodeHtml(lang_bandmap_cat_marker));
-			radioIcon.addClass('fa-radio').css('color', '#8a2be2');
-			btn.css('box-shadow', '0 0 8px rgba(138, 43, 226, 0.6)');
+		} else {
+			btn.addClass('btn-secondary').attr('data-bs-original-title', decodeHtml(lang_bandmap_cat_off));
 		}
 
 		// Update tooltip if it exists
 		if (typeof bootstrap !== 'undefined' && bootstrap.Tooltip) {
-			let tooltip = bootstrap.Tooltip.getInstance(btn[0]);
-			if (tooltip) {
-				tooltip.hide();
+			try {
+				let tooltip = bootstrap.Tooltip.getInstance(btn[0]);
+				if (tooltip) tooltip.hide();
+			} catch (e) {
+				// Ignore tooltip errors
 			}
 		}
 	}
 
-	// Toggle CAT Control with state machine
-	$('#toggleCatTracking').on('click', function() {
-		catClickTimer = setTimeout(function() {
-			if (!catClickPreventSingle) {
-				handleCatSingleClick();
+	/**
+	 * Update Lock button visual appearance and apply purple styling to button group when locked
+	 */
+	function updateLockButtonVisual(enabled) {
+		let btn = $('#toggleCatLock');
+		let lockIcon = btn.find('i');
+		let btnGroup = btn.closest('.btn-group');
+
+		btn.removeClass('btn-secondary btn-success');
+		lockIcon.removeClass('fa-lock fa-lock-open');
+
+		if (enabled) {
+			btn.addClass('btn-success').attr('data-bs-original-title', decodeHtml(lang_bandmap_cat_lock_on));
+			lockIcon.addClass('fa-lock').css('color', '#8a2be2');
+			// Purple border around the entire button group
+			btnGroup.css({
+				'box-shadow': '0 0 8px rgba(138, 43, 226, 0.6)',
+				'border': '2px solid #8a2be2',
+				'border-radius': '0.375rem'
+			});
+		} else {
+			btn.addClass('btn-secondary').attr('data-bs-original-title', decodeHtml(lang_bandmap_cat_lock_off));
+			lockIcon.addClass('fa-lock-open').css('color', '');
+			// Remove purple border from button group
+			btnGroup.css({
+				'box-shadow': '',
+				'border': '',
+				'border-radius': ''
+			});
+		}
+
+		// Update tooltip if it exists
+		if (typeof bootstrap !== 'undefined' && bootstrap.Tooltip) {
+			try {
+				let tooltip = bootstrap.Tooltip.getInstance(btn[0]);
+				if (tooltip) tooltip.hide();
+			} catch (e) {
+				// Ignore tooltip errors
 			}
-			catClickPreventSingle = false;
-		}, 300);
-	});
-
-	$('#toggleCatTracking').on('dblclick', function() {
-		clearTimeout(catClickTimer);
-		catClickPreventSingle = true;
-		handleCatDoubleClick();
-	});
-
-	// Initialize tooltip on page load - set initial title only
-	$('#toggleCatTracking').attr('data-bs-original-title', lang_bandmap_cat_off);
-
-	function handleCatSingleClick() {
-		const selectedRadio = $('.radios option:selected').val();
-
-		switch(catState) {
-			case 'off':
-				// OFF → ON
-				if (!selectedRadio || selectedRadio === '0') {
-					if (typeof showToast === 'function') {
-						showToast(lang_bandmap_cat_control, lang_bandmap_select_radio_first, 'bg-warning text-dark', 3000);
-					}
-					return;
-				}
-
-				isCatTrackingEnabled = true;
-				window.isCatTrackingEnabled = true;
-				catState = 'on';
-
-				// Display last known data if available
-				if (window.lastCATData && typeof window.displayRadioStatus === 'function') {
-					window.displayRadioStatus('success', window.lastCATData);
-				}
-
-				// Trigger immediate polling update if using polling radio
-				if (selectedRadio !== 'ws' && typeof updateFromCAT === 'function') {
-					updateFromCAT();
-				}
-
-				// In normal mode: only show gradient, don't change filters or disable controls
-				if (window.lastCATData && window.lastCATData.frequency) {
-					updateFrequencyGradientColors();
-				}
-
-				updateButtonVisual('on');
-				break;
-
-		case 'on':
-			// ON → ON+MARKER (Purple Mode)
-			window.isFrequencyMarkerEnabled = true;
-			catState = 'on+marker';
-			disableBandFilterControls();
-
-			// Always ensure single band filter in purple mode
-			const currentBands = $("#band").val() || [];
-			let targetBand = null;
-
-			// Priority 1: Use current radio band (already calculated and stored from radio updates)
-			if (lastRadioBand && lastRadioBand !== '') {
-				targetBand = lastRadioBand;
-			} else if (currentRadioFrequency) {
-				// Priority 2: Calculate from current radio frequency
-				targetBand = frequencyToBand(currentRadioFrequency * 1000); // Convert kHz back to Hz
-			} else if (currentBands.length === 1 && !currentBands.includes('All')) {
-				// Priority 3: Keep current selection if single
-				targetBand = currentBands[0];
-			} else {
-				// Priority 4: Default to 20m as last resort fallback
-				targetBand = '20m';
-			}
-
-			// Set to single band
-			$("#band").val([targetBand]);
-			updateSelectCheckboxes('band');
-			syncQuickFilterButtons();
-			// Force reload to fetch only the active band from backend
-			applyFilters(true);
-
-			if (window.lastCATData && window.lastCATData.frequency) {
-				updateFrequencyGradientColors();
-			}
-			lockTableSortingToFrequency();
-
-			updateButtonVisual('on+marker');
-			break;
-
-		case 'on+marker':
-			// ON+MARKER → ON (Exit Purple Mode)
-			window.isFrequencyMarkerEnabled = false;
-			catState = 'on';
-
-			// Re-enable band filter controls
-			enableBandFilterControls();
-
-			// Reset band filter to 'All' and force reload to fetch all bands
-			$("#band").val(['All']);
-			updateSelectCheckboxes('band');
-			syncQuickFilterButtons();
-			applyFilters(true); // Force reload to fetch all bands
-
-			unlockTableSorting();
-			clearFrequencyGradientColors();
-
-			updateButtonVisual('on');
-			break;
 		}
 	}
 
-	function handleCatDoubleClick() {
-		// Double-click: Force disable from any state
-		if (catState === 'off') return;
+	/**
+	 * Enable or disable the lock button based on CAT connection state
+	 */
+	function updateLockButtonState(catEnabled) {
+		let lockBtn = $('#toggleCatLock');
+		if (catEnabled) {
+			lockBtn.prop('disabled', false).removeClass('disabled');
+		} else {
+			lockBtn.prop('disabled', true).addClass('disabled');
+			// Also disable lock mode if CAT is disabled
+			if (window.isFrequencyMarkerEnabled) {
+				disableLockMode();
+			}
+		}
+	}
 
-		isCatTrackingEnabled = false;
-		window.isCatTrackingEnabled = false;
-		window.isFrequencyMarkerEnabled = false;
-		catState = 'off';
+	/**
+	 * Enable lock mode (purple mode)
+	 */
+	function enableLockMode() {
+		window.isFrequencyMarkerEnabled = true;
+		catState = 'on+marker';
+		disableBandFilterControls();
 
-		// Reset band filter to 'All' when disabling CAT
-		$("#band").val(['All']);
+		// Always ensure single band filter in lock mode
+		const currentBands = $("#band").val() || [];
+		let targetBand = null;
+
+		// Priority 1: Use current radio band
+		if (lastRadioBand && lastRadioBand !== '') {
+			targetBand = lastRadioBand;
+		} else if (currentRadioFrequency) {
+			// Priority 2: Calculate from current radio frequency
+			targetBand = frequencyToBand(currentRadioFrequency * 1000);
+		} else if (currentBands.length === 1 && !currentBands.includes('All')) {
+			// Priority 3: Keep current selection if single
+			targetBand = currentBands[0];
+		} else {
+			// Priority 4: Default to 20m
+			targetBand = '20m';
+		}
+
+		// Set to single band
+		$("#band").val([targetBand]);
 		updateSelectCheckboxes('band');
 		syncQuickFilterButtons();
-		applyFilters(true); // Force reload to fetch all bands
+		applyFilters(true);
 
-		const selectedRadio = $('.radios option:selected').val();
-		if (selectedRadio && selectedRadio !== '0' && typeof window.displayOfflineStatus === 'function') {
-			window.displayOfflineStatus('cat_disabled');
-		} else if (selectedRadio === '0' && typeof window.displayOfflineStatus === 'function') {
-			window.displayOfflineStatus('no_radio');
+		if (window.lastCATData && window.lastCATData.frequency) {
+			updateFrequencyGradientColors();
+		}
+		lockTableSortingToFrequency();
+		updateLockButtonVisual(true);
+
+		// Show toast notifications
+		if (typeof showToast === 'function') {
+			showToast(lang_bandmap_band_lock, lang_bandmap_band_lock_enabled, 'bg-info text-white', 3000);
+			setTimeout(function() {
+				showToast(lang_bandmap_band_lock, lang_bandmap_freq_changed + ' ' + targetBand + ' ' + lang_bandmap_by_transceiver, 'bg-info text-white', 3000);
+			}, 500);
+		}
+	}
+
+	/**
+	 * Disable lock mode (exit purple mode)
+	 */
+	function disableLockMode() {
+		window.isFrequencyMarkerEnabled = false;
+		if (isCatTrackingEnabled) {
+			catState = 'on';
 		} else {
-			$('#radio_cat_state').remove();
+			catState = 'off';
 		}
 
 		enableBandFilterControls();
+		$("#band").val(['All']);
+		updateSelectCheckboxes('band');
+		syncQuickFilterButtons();
+		applyFilters(true);
+
 		unlockTableSorting();
 		clearFrequencyGradientColors();
+		updateLockButtonVisual(false);
+	}
 
-		const currentBands = $("#band").val() || [];
-		if (currentBands.length !== 1 || currentBands[0] !== 'All') {
+	// CAT Connection button click handler
+	$('#toggleCatTracking').on('click', function() {
+		const selectedRadio = $('.radios option:selected').val();
+
+		if (!isCatTrackingEnabled) {
+			// Enable CAT
+			if (!selectedRadio || selectedRadio === '0') {
+				if (typeof showToast === 'function') {
+					showToast(lang_bandmap_cat_control, lang_bandmap_select_radio_first, 'bg-warning text-dark', 3000);
+				}
+				return;
+			}
+
+			isCatTrackingEnabled = true;
+			window.isCatTrackingEnabled = true;
+			catState = 'on';
+
+			// Display last known data if available and not stale
+			if (window.lastCATData && typeof window.displayRadioStatus === 'function') {
+				// Check if data is still fresh (use same timeout as cat.js)
+				var minutes = typeof cat_timeout_minutes !== 'undefined' ? cat_timeout_minutes : 5;
+				if (window.lastCATData.updated_minutes_ago <= minutes) {
+					window.displayRadioStatus('success', window.lastCATData);
+				} else {
+					// Data is stale - show timeout
+					var radioName = $('select.radios option:selected').text();
+					window.displayRadioStatus('timeout', radioName);
+				}
+			}
+
+			// Trigger immediate polling update if using polling radio
+			if (selectedRadio !== 'ws' && typeof updateFromCAT === 'function') {
+				updateFromCAT();
+			}
+
+			// Show gradient if we have frequency data
+			if (window.lastCATData && window.lastCATData.frequency) {
+				updateFrequencyGradientColors();
+			}
+
+			updateCatButtonVisual(true);
+			updateLockButtonState(true);
+		} else {
+			// Disable CAT
+			isCatTrackingEnabled = false;
+			window.isCatTrackingEnabled = false;
+			catState = 'off';
+
+			// Also disable lock mode if enabled
+			if (window.isFrequencyMarkerEnabled) {
+				disableLockMode();
+			}
+
+			// Reset band filter to 'All'
 			$("#band").val(['All']);
 			updateSelectCheckboxes('band');
 			syncQuickFilterButtons();
 			applyFilters(true);
-		}
 
-		updateButtonVisual('off');
-	}
+			if (selectedRadio && selectedRadio !== '0' && typeof window.displayOfflineStatus === 'function') {
+				window.displayOfflineStatus('cat_disabled');
+			} else if (typeof window.displayOfflineStatus === 'function') {
+				window.displayOfflineStatus('no_radio');
+			}
+
+			enableBandFilterControls();
+			unlockTableSorting();
+			clearFrequencyGradientColors();
+
+			updateCatButtonVisual(false);
+			updateLockButtonState(false);
+		}
+	});
+
+	// Lock button click handler
+	$('#toggleCatLock').on('click', function() {
+		if (!isCatTrackingEnabled) return; // Should not happen if button is properly disabled
+
+		if (!window.isFrequencyMarkerEnabled) {
+			enableLockMode();
+		} else {
+			disableLockMode();
+		}
+	});
+
+	// Initialize tooltips on page load
+	$('#toggleCatTracking').attr('data-bs-original-title', lang_bandmap_cat_off);
+	$('#toggleCatLock').attr('data-bs-original-title', lang_bandmap_cat_lock_off);
 
 	// ========================================
 	// RESPONSIVE COLUMN VISIBILITY
@@ -3366,10 +3874,12 @@ $(function() {
 	 * 14: Special, 15: Message
 	 *
 	 * Breakpoints:
-	 * - Full screen or > 1374px: Show all columns
-	 * - <= 1374px: Hide CQZ (7), de CQZ (12), Last QSO (13), Submode (4)
+	 * Responsive column visibility based on container width.
+	 * Works in both normal and fullscreen mode.
+	 * - > 1374px: Show all columns
+	 * - <= 1374px: Hide CQZ (7), de CQZ (12), Last QSO (13), Mode (3)
 	 * - <= 1294px: Additionally hide Band (1), Cont (6), de Cont (11)
-	 * - <= 1024px: Additionally hide Flag (8)
+	 * - <= 1024px: Additionally hide Flag (8), Message (15)
 	 * - <= 500px: Show only Age (0), Freq (2), Callsign (5), Entity (9)
 	 */
 	function handleResponsiveColumns() {
@@ -3378,19 +3888,8 @@ $(function() {
 
 		const containerWidth = tableContainer.width();
 
-		// Check if in fullscreen mode
-		const isFullscreen = $('#bandmapContainer').hasClass('bandmap-fullscreen');
-
 		// Reset all columns to visible first
-		$('.spottable th, .spottable td').removeClass('column-hidden');
-
-		// If fullscreen, show all columns and exit
-		if (isFullscreen) {
-			if ($.fn.DataTable && $.fn.DataTable.isDataTable('.spottable')) {
-				$('.spottable').DataTable().columns.adjust();
-			}
-			return;
-		}
+		$('.spottable th, .spottable td').removeClass('column-hidden column-fill');
 
 		// Apply visibility rules based on container width
 		if (containerWidth <= 500) {
@@ -3407,10 +3906,12 @@ $(function() {
 			$('.spottable th:nth-child(14), .spottable td:nth-child(14)').addClass('column-hidden'); // Last QSO
 			$('.spottable th:nth-child(15), .spottable td:nth-child(15)').addClass('column-hidden'); // Special
 			$('.spottable th:nth-child(16), .spottable td:nth-child(16)').addClass('column-hidden'); // Message
+			// Entity fills remaining space
+			$('.spottable th:nth-child(10), .spottable td:nth-child(10)').addClass('column-fill');
 		} else if (containerWidth <= 1024) {
-			// Hide: CQZ, de CQZ, Last QSO, Submode, Band, Cont, de Cont, Flag
+			// Hide: CQZ, de CQZ, Last QSO, Mode, Band, Cont, de Cont, Flag, Message
 			$('.spottable th:nth-child(2), .spottable td:nth-child(2)').addClass('column-hidden'); // Band
-			$('.spottable th:nth-child(5), .spottable td:nth-child(5)').addClass('column-hidden'); // Submode
+			$('.spottable th:nth-child(4), .spottable td:nth-child(4)').addClass('column-hidden'); // Mode
 			$('.spottable th:nth-child(7), .spottable td:nth-child(7)').addClass('column-hidden'); // Continent
 			$('.spottable th:nth-child(8), .spottable td:nth-child(8)').addClass('column-hidden'); // CQZ
 			$('.spottable th:nth-child(9), .spottable td:nth-child(9)').addClass('column-hidden'); // Flag
@@ -3418,18 +3919,20 @@ $(function() {
 			$('.spottable th:nth-child(13), .spottable td:nth-child(13)').addClass('column-hidden'); // de CQZ
 			$('.spottable th:nth-child(14), .spottable td:nth-child(14)').addClass('column-hidden'); // Last QSO
 			$('.spottable th:nth-child(16), .spottable td:nth-child(16)').addClass('column-hidden'); // Message
+			// Entity fills remaining space
+			$('.spottable th:nth-child(10), .spottable td:nth-child(10)').addClass('column-fill');
 		} else if (containerWidth <= 1294) {
-			// Hide: CQZ, de CQZ, Last QSO, Submode, Band, Cont, de Cont
+			// Hide: CQZ, de CQZ, Last QSO, Mode, Band, Cont, de Cont
 			$('.spottable th:nth-child(2), .spottable td:nth-child(2)').addClass('column-hidden'); // Band
-			$('.spottable th:nth-child(5), .spottable td:nth-child(5)').addClass('column-hidden'); // Submode
+			$('.spottable th:nth-child(4), .spottable td:nth-child(4)').addClass('column-hidden'); // Mode
 			$('.spottable th:nth-child(7), .spottable td:nth-child(7)').addClass('column-hidden'); // Continent
 			$('.spottable th:nth-child(8), .spottable td:nth-child(8)').addClass('column-hidden'); // CQZ
 			$('.spottable th:nth-child(12), .spottable td:nth-child(12)').addClass('column-hidden'); // de Cont
 			$('.spottable th:nth-child(13), .spottable td:nth-child(13)').addClass('column-hidden'); // de CQZ
 			$('.spottable th:nth-child(14), .spottable td:nth-child(14)').addClass('column-hidden'); // Last QSO
 		} else if (containerWidth <= 1374) {
-			// Hide: CQZ, de CQZ, Last QSO, Submode
-			$('.spottable th:nth-child(5), .spottable td:nth-child(5)').addClass('column-hidden'); // Submode
+			// Hide: CQZ, de CQZ, Last QSO, Mode
+			$('.spottable th:nth-child(4), .spottable td:nth-child(4)').addClass('column-hidden'); // Mode
 			$('.spottable th:nth-child(8), .spottable td:nth-child(8)').addClass('column-hidden'); // CQZ
 			$('.spottable th:nth-child(13), .spottable td:nth-child(13)').addClass('column-hidden'); // de CQZ
 			$('.spottable th:nth-child(14), .spottable td:nth-child(14)').addClass('column-hidden'); // Last QSO
@@ -3484,32 +3987,57 @@ $(function() {
 	enableBandFilterControls();
 
 	// ========================================
-	// CACHE USER FAVORITES ON PAGE LOAD
+	// PROCESS USER CONFIG (called from getDxClusterFavs)
 	// ========================================
 
 	/**
-	 * Fetch and cache user favorites on page load for instant access
-	 * This prevents the delay when clicking the favorites button
+	 * Process user bands/modes configuration
+	 * Called from getDxClusterFavs() when userConfig is included in response
+	 * @param {Object} data - User configuration object with bands, modes, submodes
 	 */
-	function fetchUserFavorites() {
-		let base_url = dxcluster_provider.replace('/dxcluster', '');
-		$.ajax({
-			url: base_url + '/bandmap/get_user_favorites',
-			method: 'GET',
-			dataType: 'json',
-			success: function(favorites) {
-				cachedUserFavorites = favorites;
+	function processUserConfig(data) {
+		if (!data) return;
 
-			},
-			error: function() {
-				console.warn('Failed to cache user favorites');
-				cachedUserFavorites = null;
-			}
-		});
+		cachedUserFavorites = data;
+
+		// Store mode categories for button enabling/disabling
+		if (data.modes) {
+			userModeCategories = {
+				cw: data.modes.cw || false,
+				phone: data.modes.phone || false,
+				digi: data.modes.digi || false
+			};
+		}
+
+		// Store submodes for filtering
+		if (data.submodes && data.submodes.length > 0) {
+			userEnabledSubmodes = data.submodes;
+			// Don't activate filter on initial load - let user enable it manually
+			isMySubmodesFilterActive = false;
+			updateMySubmodesButtonVisual();
+			updateMySubmodesTooltip();
+			updateModeButtonsForSubmodes();
+			// Update badge counts now that we have submodes loaded
+			updateBandCountBadges();
+		} else {
+			// No submodes configured - disable button and show warning
+			userEnabledSubmodes = [];
+			isMySubmodesFilterActive = false;
+			$('#toggleMySubmodesFilter').prop('disabled', true).addClass('disabled');
+			updateMySubmodesButtonVisual();
+			updateMySubmodesTooltip();
+			// Also disable the option in requiredFlags select
+			$('#requiredFlags option[value="mysubmodes"]').prop('disabled', true);
+			showToast(
+				lang_bandmap_my_submodes,
+				lang_bandmap_no_submodes_warning,
+				'bg-warning text-dark',
+				5000
+			);
+		}
 	}
 
-	// Fetch favorites on page load
-	fetchUserFavorites();
+	// Note: User config is now loaded via combined getDxClusterFavs() API response
 
 	// ========================================
 	// AGE AUTO-UPDATE
@@ -4475,20 +5003,23 @@ $(function() {
 	setTimeout(function() {
 		const selectedRadio = $('.radios option:selected').val();
 		if (selectedRadio === '0') {
-			// No radio selected - disable CAT Control button
+			// No radio selected - disable CAT Control and Lock buttons
 			$('#toggleCatTracking').prop('disabled', true).addClass('disabled');
+			$('#toggleCatLock').prop('disabled', true).addClass('disabled');
 			if (typeof window.displayOfflineStatus === 'function') {
 				window.displayOfflineStatus('no_radio');
 			}
 		} else if (selectedRadio && selectedRadio !== '0' && !isCatTrackingEnabled) {
 			// Radio is selected but CAT Control is disabled on page load
 			$('#toggleCatTracking').prop('disabled', false).removeClass('disabled');
+			$('#toggleCatLock').prop('disabled', true).addClass('disabled'); // Lock requires CAT
 			if (typeof window.displayOfflineStatus === 'function') {
 				window.displayOfflineStatus('cat_disabled');
 			}
 		} else if (selectedRadio && selectedRadio !== '0') {
 			// Radio is selected and CAT Control is enabled
 			$('#toggleCatTracking').prop('disabled', false).removeClass('disabled');
+			$('#toggleCatLock').prop('disabled', false).removeClass('disabled');
 		}
 	}, 100); // Small delay to ensure cat.js has loaded and exposed the function
 });