diff --git a/application/config/migration.php b/application/config/migration.php
index 7bdc9b407..fc454147d 100644
--- a/application/config/migration.php
+++ b/application/config/migration.php
@@ -22,7 +22,7 @@
 |
 */
 
-$config['migration_version'] = 173;
+$config['migration_version'] = 174;
 
 /*
 |--------------------------------------------------------------------------
diff --git a/application/controllers/Components.php b/application/controllers/Components.php
index 94fdd0f9b..63d807188 100644
--- a/application/controllers/Components.php
+++ b/application/controllers/Components.php
@@ -13,14 +13,39 @@ function __construct() {
 		if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); }
 	}
 
-    public function index() {
-        $this->load->model('stations');
-        $url = 'https://hams.at/api/alerts/upcoming';
-        $json = file_get_contents($url);
-        $data['rovedata'] = json_decode($json, true);
-        $data['gridsquare'] = strtoupper($this->stations->find_gridsquare());
-        
-        // load view
-        $this->load->view('components/hamsat/table', $data);
-    }
+	public function index() {
+		$this->load->model("user_options_model");
+		$hkey_opt=$this->user_options_model->get_options('hamsat',array('option_name'=>'hamsat_key','option_key'=>'api'))->result();
+		if (count($hkey_opt)>0) {
+			$data['user_hamsat_key'] = $hkey_opt[0]->option_value;
+		} else {
+			$data['user_hamsat_key']='';
+		}
+		$url = 'https://hams.at/api/alerts/upcoming';
+		if ($data['user_hamsat_key'] ?? '' != '') {
+			$options = array(
+				'http' => array(
+					'method' => 'GET',
+					'header' => "Authorization: Bearer ".$data['user_hamsat_key']."\r\n"
+				)
+			);
+			$context = stream_context_create($options);
+			$json = file_get_contents($url, false, $context);
+		} else {
+			$json = file_get_contents($url);
+		}
+		$hkey_opt=$this->user_options_model->get_options('hamsat',array('option_name'=>'hamsat_key','option_key'=>'workable'))->result();
+		if (count($hkey_opt)>0) {
+			$data['user_hamsat_workable_only'] = $hkey_opt[0]->option_value;
+		} else {
+			$data['user_hamsat_workable_only'] = 0;
+		}
+
+		$this->load->model('stations');
+		$data['rovedata'] = json_decode($json, true);
+		$data['gridsquare'] = strtoupper($this->stations->find_gridsquare());
+
+		// load view
+		$this->load->view('components/hamsat/table', $data);
+	}
 }
diff --git a/application/controllers/Contesting.php b/application/controllers/Contesting.php
index db31db910..25b7b4380 100644
--- a/application/controllers/Contesting.php
+++ b/application/controllers/Contesting.php
@@ -202,6 +202,8 @@ public function checkIfWorkedBefore() {
         		$custom_date_format = $this->session->userdata('user_date_format');
 			$abstimeb4=date($custom_date_format, strtotime($result->row()->COL_TIME_OFF)).' '.date('H:i',strtotime($result->row()->COL_TIME_OFF));
 			echo json_encode(array('message' => 'Worked at '.$abstimeb4.' ('.$timeb4.' ago) before'));
+		} else {
+			echo json_encode(array('message' => 'OKAY'));
 		}
 		return;
 	}
diff --git a/application/controllers/Dashboard.php b/application/controllers/Dashboard.php
index e6df2b75e..ef1f4015e 100644
--- a/application/controllers/Dashboard.php
+++ b/application/controllers/Dashboard.php
@@ -89,6 +89,64 @@ public function index()
 			$data['total_countries_confirmed_eqsl'] = $CountriesBreakdown['Countries_Worked_EQSL'];
 			$data['total_countries_confirmed_lotw'] = $CountriesBreakdown['Countries_Worked_LOTW'];
 
+			$data['dashboard_upcoming_dx_card'] = false;
+			$data['dashboard_qslcard_card'] = false;
+			$data['dashboard_eqslcard_card'] = false;
+			$data['dashboard_lotw_card'] = false;
+			$data['dashboard_vuccgrids_card'] = false;
+
+			$dashboard_options = $this->user_options_model->get_options('dashboard')->result();
+
+			foreach ($dashboard_options as $item) {
+				$option_name = $item->option_name;
+				$option_key = $item->option_key;
+				$option_value = $item->option_value;
+			
+				if ($option_name == 'dashboard_upcoming_dx_card' && $option_key == 'enabled') {
+					if($option_value == 'true') {
+						$data['dashboard_upcoming_dx_card'] = true;
+					} else {				
+						$data['dashboard_upcoming_dx_card'] = false;
+					}
+				}
+
+				if ($option_name == 'dashboard_qslcards_card' && $option_key == 'enabled') {
+					if($item->option_value == 'true') {
+						$data['dashboard_qslcard_card'] = true;
+					} else {
+						$data['dashboard_qslcard_card'] = false;
+					}
+				}
+
+				if ($option_name == 'dashboard_eqslcards_card' && $option_key == 'enabled') {
+					if($item->option_value == 'true') {
+						$data['dashboard_eqslcard_card'] = true;
+					} else {
+						$data['dashboard_eqslcard_card'] = false;
+					}
+				}
+
+				if ($option_name == 'dashboard_lotw_card' && $option_key == 'enabled') {
+					if($item->option_value == 'true') {
+						$data['dashboard_lotw_card'] = true;
+					} else {
+						$data['dashboard_lotw_card'] = false;
+					}
+				}
+
+				if ($option_name == 'dashboard_vuccgrids_card' && $option_key == 'enabled') {
+					if($item->option_value == 'true') {
+						$data['dashboard_vuccgrids_card'] = true;
+
+						$data['vucc'] = $this->vucc->fetchVuccSummary();
+						$data['vuccSAT'] = $this->vucc->fetchVuccSummary('SAT');
+					} else {
+						$data['dashboard_vuccgrids_card'] = false;
+					}
+				}
+			}
+
+		
 			$QSLStatsBreakdownArray = $this->logbook_model->get_QSLStats($logbooks_locations_array);
 
 			$data['total_qsl_sent'] = $QSLStatsBreakdownArray['QSL_Sent'];
@@ -115,9 +173,6 @@ public function index()
 
 			$data['last_five_qsos'] = $this->logbook_model->get_last_qsos('18', $logbooks_locations_array);
 
-			$data['vucc'] = $this->vucc->fetchVuccSummary();
-			$data['vuccSAT'] = $this->vucc->fetchVuccSummary('SAT');
-
 			$data['page_title'] = "Dashboard";
 
 			$this->load->model('dxcc');
diff --git a/application/controllers/User.php b/application/controllers/User.php
index dbff5ef4d..2c63e4233 100644
--- a/application/controllers/User.php
+++ b/application/controllers/User.php
@@ -95,6 +95,8 @@ function add() {
 				$data['user_qso_end_times'] = $this->input->post('user_qso_end_times');
 				$data['user_quicklog'] = $this->input->post('user_quicklog');
 				$data['user_quicklog_enter'] = $this->input->post('user_quicklog_enter');
+				$data['user_hamsat_key'] = $this->input->post('user_hamsat_key');
+				$data['user_hamsat_workable_only'] = $this->input->post('user_hamsat_workable_only');
 				$data['language'] = $this->input->post('language');
 				$this->load->view('user/edit', $data);
 			} else {
@@ -134,6 +136,8 @@ function add() {
 				$this->input->post('user_quicklog'),
 				$this->input->post('user_quicklog_enter'),
 				$this->input->post('language'),
+				$this->input->post('user_hamsat_key'),
+				$this->input->post('user_hamsat_workable_only')                            
 				)) {
 				// Check for errors
 				case EUSERNAMEEXISTS:
@@ -491,6 +495,87 @@ function edit() {
 				$data['user_winkey'] = $q->winkey;
 			}
 
+			$this->load->model('user_options_model');
+			$hamsat_user_object = $this->user_options_model->get_options('hamsat')->result();
+
+			if($this->input->post('user_hamsat_key', true)) {
+				$data['user_hamsat_key'] = $this->input->post('user_hamsat_key', true);
+			} else {
+				// get $q->hamsat_key if its set if not null
+				if(isset($hamsat_user_object[0]->option_value)) {
+					$data['user_hamsat_key'] = $hamsat_user_object[0]->option_value;
+				} else {
+					$data['user_hamsat_key'] = "";
+				}
+			}
+
+			if($this->input->post('user_hamsat_workable_only')) {
+				$data['user_hamsat_workable_only'] = $this->input->post('user_hamsat_workable_only', false);
+			} else {
+				if(isset($hamsat_user_object[1]->option_value)) {
+					$data['user_hamsat_workable_only'] = $hamsat_user_object[1]->option_value;
+				} else {
+					$data['user_hamsat_workable_only'] = "";
+				}
+			}
+
+			// Get Settings for Dashboard
+
+			// Set defaults
+			$data['dashboard_upcoming_dx_card'] = false;
+			$data['dashboard_qslcard_card'] = false;
+			$data['dashboard_eqslcard_card'] = false;
+			$data['dashboard_lotw_card'] = false;
+			$data['dashboard_vuccgrids_card'] = false;
+
+			$dashboard_options = $this->user_options_model->get_options('dashboard')->result();
+
+			foreach ($dashboard_options as $item) {
+				$option_name = $item->option_name;
+				$option_key = $item->option_key;
+				$option_value = $item->option_value;
+			
+				if ($option_name == 'dashboard_upcoming_dx_card' && $option_key == 'enabled') {
+					if($item->option_value == 'true') {
+						$data['dashboard_upcoming_dx_card'] = true;
+					} else {
+						$data['dashboard_upcoming_dx_card'] = false;
+					}
+				}
+
+				if ($option_name == 'dashboard_qslcards_card' && $option_key == 'enabled') {
+					if($item->option_value == 'true') {
+						$data['dashboard_qslcard_card'] = true;
+					} else {
+						$data['dashboard_qslcard_card'] = false;
+					}
+				}
+
+				if ($option_name == 'dashboard_eqslcards_card' && $option_key == 'enabled') {
+					if($item->option_value == 'true') {
+						$data['dashboard_eqslcard_card'] = true;
+					} else {
+						$data['dashboard_eqslcard_card'] = false;
+					}
+				}
+
+				if ($option_name == 'dashboard_lotw_card' && $option_key == 'enabled') {
+					if($item->option_value == 'true') {
+						$data['dashboard_lotw_card'] = true;
+					} else {
+						$data['dashboard_lotw_card'] = false;
+					}
+				}
+
+				if ($option_name == 'dashboard_vuccgrids_card' && $option_key == 'enabled') {
+					if($item->option_value == 'true') {
+						$data['dashboard_vuccgrids_card'] = true;
+					} else {
+						$data['dashboard_vuccgrids_card'] = false;
+					}
+				}
+			}
+
 			// [MAP Custom] GET user options //
 			$this->load->model('user_options_model');
 			$options_object = $this->user_options_model->get_options('map_custom')->result();
@@ -553,6 +638,36 @@ function edit() {
 						$this->input->set_cookie($cookie);
 					}
 					if($this->session->userdata('user_id') == $this->input->post('id', true)) {
+						if (isset($_POST['user_dashboard_enable_dxpedition_card'])) {
+							$this->user_options_model->set_option('dashboard', 'dashboard_upcoming_dx_card', array('enabled' => 'true'));
+						} else {
+							$this->user_options_model->set_option('dashboard', 'dashboard_upcoming_dx_card', array('enabled' => 'false'));
+						}
+
+						if (isset($_POST['user_dashboard_enable_qslcards_card'])) {
+							$this->user_options_model->set_option('dashboard', 'dashboard_qslcards_card', array('enabled' => 'true'));
+						} else {
+							$this->user_options_model->set_option('dashboard', 'dashboard_qslcards_card', array('enabled' => 'false'));
+						}
+
+						if (isset($_POST['user_dashboard_enable_eqslcards_card'])) {
+							$this->user_options_model->set_option('dashboard', 'dashboard_eqslcards_card', array('enabled' => 'true'));
+						} else {
+							$this->user_options_model->set_option('dashboard', 'dashboard_eqslcards_card', array('enabled' => 'false'));
+						}
+
+						if (isset($_POST['user_dashboard_enable_lotw_card'])) {
+							$this->user_options_model->set_option('dashboard', 'dashboard_lotw_card', array('enabled' => 'true'));
+						} else {
+							$this->user_options_model->set_option('dashboard', 'dashboard_lotw_card', array('enabled' => 'false'));
+						}
+
+						if (isset($_POST['user_dashboard_enable_vuccgrids_card'])) {
+							$this->user_options_model->set_option('dashboard', 'dashboard_vuccgrids_card', array('enabled' => 'true'));
+						} else {
+							$this->user_options_model->set_option('dashboard', 'dashboard_vuccgrids_card', array('enabled' => 'false'));
+						}
+						
 						// [MAP Custom] ADD to user options //
 						$array_icon = array('station','qso','qsoconfirm');
 						foreach ($array_icon as $icon) {
@@ -580,7 +695,6 @@ function edit() {
 					return;
 			}
 			$data['page_title'] = "Edit User";
-
 			$this->load->view('interface_assets/header', $data);
 			$data['user_name'] = $this->input->post('user_name', true);
 			$data['user_email'] = $this->input->post('user_email', true);
@@ -614,6 +728,11 @@ function edit() {
 			$data['user_quicklog_enter'] = $this->input->post('user_quicklog_enter');
 			$data['language'] = $this->input->post('language');
 			$data['user_winkey'] = $this->input->post('user_winkey');
+			$data['user_hamsat_key'] = $this->input->post('user_hamsat_key');
+			$data['user_hamsat_workable_only'] = $this->input->post('user_hamsat_workable_only');
+
+
+
 			$this->load->view('user/edit');
 			$this->load->view('interface_assets/footer');
 		}
diff --git a/application/language/bulgarian/account_lang.php b/application/language/bulgarian/account_lang.php
index e71da6d1b..339c8213f 100644
--- a/application/language/bulgarian/account_lang.php
+++ b/application/language/bulgarian/account_lang.php
@@ -126,4 +126,9 @@
 $lang['account_qso_logging_options'] = "QSO Logging Options";
 $lang['account_third_party_services'] = "Third Party Services";
 $lang['account_default_values'] = "Default Values";
-$lang['account_miscellaneous'] = "Miscellaneous";
\ No newline at end of file
+$lang['account_miscellaneous'] = "Miscellaneous";
+
+$lang['account_hamsat'] = "Hams.at";
+$lang['account_hamsat_private_feed_key'] = "Private Feed Key";
+$lang['account_hamsat_hint'] = "See your profile at <a href='https://hams.at/users/settings' target='_blank'>https://hams.at/users/settings</a>.";
+$lang['account_hamsat_workable_only'] = "Show Workable Passes Only";
diff --git a/application/language/chinese_simplified/account_lang.php b/application/language/chinese_simplified/account_lang.php
index 13a72ea9f..ffcf33d31 100644
--- a/application/language/chinese_simplified/account_lang.php
+++ b/application/language/chinese_simplified/account_lang.php
@@ -127,3 +127,8 @@
 $lang['account_third_party_services'] = "第三方服务";
 $lang['account_default_values'] = "默认值";
 $lang['account_miscellaneous'] = "其他";
+
+$lang['account_hamsat'] = "Hams.at";
+$lang['account_hamsat_private_feed_key'] = "Private Feed Key";
+$lang['account_hamsat_hint'] = "See your profile at <a href='https://hams.at/users/settings' target='_blank'>https://hams.at/users/settings</a>.";
+$lang['account_hamsat_workable_only'] = "Show Workable Passes Only";
diff --git a/application/language/czech/account_lang.php b/application/language/czech/account_lang.php
index b524c7f2c..2e51f1309 100644
--- a/application/language/czech/account_lang.php
+++ b/application/language/czech/account_lang.php
@@ -127,3 +127,8 @@
 $lang['account_third_party_services'] = "Third Party Services";
 $lang['account_default_values'] = "Default Values";
 $lang['account_miscellaneous'] = "Miscellaneous";
+
+$lang['account_hamsat'] = "Hams.at";
+$lang['account_hamsat_private_feed_key'] = "Private Feed Key";
+$lang['account_hamsat_hint'] = "See your profile at <a href='https://hams.at/users/settings' target='_blank'>https://hams.at/users/settings</a>.";
+$lang['account_hamsat_workable_only'] = "Show Workable Passes Only";
diff --git a/application/language/dutch/account_lang.php b/application/language/dutch/account_lang.php
index 72491743f..7387aef38 100644
--- a/application/language/dutch/account_lang.php
+++ b/application/language/dutch/account_lang.php
@@ -126,4 +126,9 @@
 $lang['account_qso_logging_options'] = "QSO Logging Options";
 $lang['account_third_party_services'] = "Third Party Services";
 $lang['account_default_values'] = "Default Values";
-$lang['account_miscellaneous'] = "Miscellaneous";
\ No newline at end of file
+$lang['account_miscellaneous'] = "Miscellaneous";
+
+$lang['account_hamsat'] = "Hams.at";
+$lang['account_hamsat_private_feed_key'] = "Private Feed Key";
+$lang['account_hamsat_hint'] = "See your profile at <a href='https://hams.at/users/settings' target='_blank'>https://hams.at/users/settings</a>.";
+$lang['account_hamsat_workable_only'] = "Show Workable Passes Only";
diff --git a/application/language/english/account_lang.php b/application/language/english/account_lang.php
index a461e07e2..045160f70 100644
--- a/application/language/english/account_lang.php
+++ b/application/language/english/account_lang.php
@@ -127,3 +127,9 @@
 $lang['account_third_party_services'] = "Third Party Services";
 $lang['account_default_values'] = "Default Values";
 $lang['account_miscellaneous'] = "Miscellaneous";
+
+$lang['account_hamsat'] = "Hams.at";
+$lang['account_hamsat_private_feed_key'] = "Private Feed Key";
+$lang['account_hamsat_hint'] = "See your profile at <a href='https://hams.at/users/settings' target='_blank'>https://hams.at/users/settings</a>.";
+$lang['account_hamsat_workable_only'] = "Show Workable Passes Only";
+$lang['account_hamsat_workable_only_hint'] = "If enabled shows only workable passes based on the gridsquare set in your hams.at account. Requires private feed key to be set.";
diff --git a/application/language/finnish/account_lang.php b/application/language/finnish/account_lang.php
index 217044f23..0a2e51e2b 100644
--- a/application/language/finnish/account_lang.php
+++ b/application/language/finnish/account_lang.php
@@ -126,4 +126,9 @@
 $lang['account_qso_logging_options'] = "QSO Logging Options";
 $lang['account_third_party_services'] = "Third Party Services";
 $lang['account_default_values'] = "Default Values";
-$lang['account_miscellaneous'] = "Miscellaneous";
\ No newline at end of file
+$lang['account_miscellaneous'] = "Miscellaneous";
+
+$lang['account_hamsat'] = "Hams.at";
+$lang['account_hamsat_private_feed_key'] = "Private Feed Key";
+$lang['account_hamsat_hint'] = "See your profile at <a href='https://hams.at/users/settings' target='_blank'>https://hams.at/users/settings</a>.";
+$lang['account_hamsat_workable_only'] = "Show Workable Passes Only";
diff --git a/application/language/french/account_lang.php b/application/language/french/account_lang.php
index 9f5dd6a33..1b41f7858 100644
--- a/application/language/french/account_lang.php
+++ b/application/language/french/account_lang.php
@@ -124,4 +124,9 @@
 $lang['account_qso_logging_options'] = "QSO Logging Options";
 $lang['account_third_party_services'] = "Third Party Services";
 $lang['account_default_values'] = "Valeur par défaut";
-$lang['account_miscellaneous'] = "Divers";
\ No newline at end of file
+$lang['account_miscellaneous'] = "Divers";
+
+$lang['account_hamsat'] = "Hams.at";
+$lang['account_hamsat_private_feed_key'] = "Private Feed Key";
+$lang['account_hamsat_hint'] = "See your profile at <a href='https://hams.at/users/settings' target='_blank'>https://hams.at/users/settings</a>.";
+$lang['account_hamsat_workable_only'] = "Show Workable Passes Only";
diff --git a/application/language/german/account_lang.php b/application/language/german/account_lang.php
index e9e4cac61..0499cb586 100644
--- a/application/language/german/account_lang.php
+++ b/application/language/german/account_lang.php
@@ -126,4 +126,9 @@
 $lang['account_qso_logging_options'] = "QSO-Logging Optionen";
 $lang['account_third_party_services'] = "Externe Dienste";
 $lang['account_default_values'] = "Standardwerte / Favoriten";
-$lang['account_miscellaneous'] = "Verschiedenes";
\ No newline at end of file
+$lang['account_miscellaneous'] = "Verschiedenes";
+
+$lang['account_hamsat'] = "Hams.at";
+$lang['account_hamsat_private_feed_key'] = "Private Feed Key";
+$lang['account_hamsat_hint'] = "Siehe dein Profil unter <a href='https://hams.at/users/settings' target='_blank'>https://hams.at/users/settings</a>.";
+$lang['account_hamsat_workable_only'] = "Zeige nur Überflüge an, die gearbeitet werden können";
diff --git a/application/language/greek/account_lang.php b/application/language/greek/account_lang.php
index d832b6ccd..1891aba4e 100644
--- a/application/language/greek/account_lang.php
+++ b/application/language/greek/account_lang.php
@@ -126,4 +126,9 @@
 $lang['account_qso_logging_options'] = "QSO Logging Options";
 $lang['account_third_party_services'] = "Third Party Services";
 $lang['account_default_values'] = "Default Values";
-$lang['account_miscellaneous'] = "Miscellaneous";
\ No newline at end of file
+$lang['account_miscellaneous'] = "Miscellaneous";
+
+$lang['account_hamsat'] = "Hams.at";
+$lang['account_hamsat_private_feed_key'] = "Private Feed Key";
+$lang['account_hamsat_hint'] = "See your profile at <a href='https://hams.at/users/settings' target='_blank'>https://hams.at/users/settings</a>.";
+$lang['account_hamsat_workable_only'] = "Show Workable Passes Only";
diff --git a/application/language/italian/account_lang.php b/application/language/italian/account_lang.php
index 439380ef2..9b0ad70db 100644
--- a/application/language/italian/account_lang.php
+++ b/application/language/italian/account_lang.php
@@ -126,4 +126,9 @@
 $lang['account_qso_logging_options'] = "QSO Logging Options";
 $lang['account_third_party_services'] = "Third Party Services";
 $lang['account_default_values'] = "Default Values";
-$lang['account_miscellaneous'] = "Miscellaneous";
\ No newline at end of file
+$lang['account_miscellaneous'] = "Miscellaneous";
+
+$lang['account_hamsat'] = "Hams.at";
+$lang['account_hamsat_private_feed_key'] = "Private Feed Key";
+$lang['account_hamsat_hint'] = "See your profile at <a href='https://hams.at/users/settings' target='_blank'>https://hams.at/users/settings</a>.";
+$lang['account_hamsat_workable_only'] = "Show Workable Passes Only";
diff --git a/application/language/polish/account_lang.php b/application/language/polish/account_lang.php
index b163ed3f7..9a7ea5427 100644
--- a/application/language/polish/account_lang.php
+++ b/application/language/polish/account_lang.php
@@ -126,4 +126,9 @@
 $lang['account_qso_logging_options'] = "QSO Logging Options";
 $lang['account_third_party_services'] = "Third Party Services";
 $lang['account_default_values'] = "Default Values";
-$lang['account_miscellaneous'] = "Miscellaneous";
\ No newline at end of file
+$lang['account_miscellaneous'] = "Miscellaneous";
+
+$lang['account_hamsat'] = "Hams.at";
+$lang['account_hamsat_private_feed_key'] = "Private Feed Key";
+$lang['account_hamsat_hint'] = "See your profile at <a href='https://hams.at/users/settings' target='_blank'>https://hams.at/users/settings</a>.";
+$lang['account_hamsat_workable_only'] = "Show Workable Passes Only";
diff --git a/application/language/russian/account_lang.php b/application/language/russian/account_lang.php
index 3022af13a..32b2c521b 100644
--- a/application/language/russian/account_lang.php
+++ b/application/language/russian/account_lang.php
@@ -126,4 +126,10 @@
 $lang['account_qso_logging_options'] = "Настройки записи QSO";
 $lang['account_third_party_services'] = "Сторонние сервисы";
 $lang['account_default_values'] = "Значения по умолчанию";
-$lang['account_miscellaneous'] = "Разное";
\ No newline at end of file
+$lang['account_miscellaneous'] = "Разное";
+
+$lang['account_hamsat'] = "Hams.at";
+$lang['account_hamsat_private_feed_key'] = "Private Feed Key";
+$lang['account_hamsat_hint'] = "See your profile at <a href='https://hams.at/users/settings' target='_blank'>https://hams.at/users/settings</a>.";
+$lang['account_hamsat_workable_only'] = "Show Workable Passes Only";
+$lang['account_hamsat_workable_only_hint'] = "If enabled shows only workable passes based on the gridsquare set in your hams.at account. Requires private feed key to be set.";
diff --git a/application/language/spanish/account_lang.php b/application/language/spanish/account_lang.php
index c0e4eb2ae..cedf07ea1 100644
--- a/application/language/spanish/account_lang.php
+++ b/application/language/spanish/account_lang.php
@@ -127,3 +127,8 @@
 $lang['account_third_party_services'] = "Servicios de Terceros";
 $lang['account_default_values'] = "Valores por Defecto";
 $lang['account_miscellaneous'] = "Otras Opciones";
+
+$lang['account_hamsat'] = "Hams.at";
+$lang['account_hamsat_private_feed_key'] = "Private Feed Key";
+$lang['account_hamsat_hint'] = "See your profile at <a href='https://hams.at/users/settings' target='_blank'>https://hams.at/users/settings</a>.";
+$lang['account_hamsat_workable_only'] = "Show Workable Passes Only";
diff --git a/application/language/swedish/account_lang.php b/application/language/swedish/account_lang.php
index 5cad692a3..a63fdbc17 100644
--- a/application/language/swedish/account_lang.php
+++ b/application/language/swedish/account_lang.php
@@ -126,4 +126,9 @@
 $lang['account_qso_logging_options'] = "QSO Logging Options";
 $lang['account_third_party_services'] = "Third Party Services";
 $lang['account_default_values'] = "Default Values";
-$lang['account_miscellaneous'] = "Miscellaneous";
\ No newline at end of file
+$lang['account_miscellaneous'] = "Miscellaneous";
+
+$lang['account_hamsat'] = "Hams.at";
+$lang['account_hamsat_private_feed_key'] = "Private Feed Key";
+$lang['account_hamsat_hint'] = "See your profile at <a href='https://hams.at/users/settings' target='_blank'>https://hams.at/users/settings</a>.";
+$lang['account_hamsat_workable_only'] = "Show Workable Passes Only";
diff --git a/application/language/turkish/account_lang.php b/application/language/turkish/account_lang.php
index 60ba989fc..867fa9376 100644
--- a/application/language/turkish/account_lang.php
+++ b/application/language/turkish/account_lang.php
@@ -126,4 +126,9 @@
 $lang['account_qso_logging_options'] = "QSO Logging Options";
 $lang['account_third_party_services'] = "Third Party Services";
 $lang['account_default_values'] = "Default Values";
-$lang['account_miscellaneous'] = "Miscellaneous";
\ No newline at end of file
+$lang['account_miscellaneous'] = "Miscellaneous";
+
+$lang['account_hamsat'] = "Hams.at";
+$lang['account_hamsat_private_feed_key'] = "Private Feed Key";
+$lang['account_hamsat_hint'] = "See your profile at <a href='https://hams.at/users/settings' target='_blank'>https://hams.at/users/settings</a>.";
+$lang['account_hamsat_workable_only'] = "Show Workable Passes Only";
diff --git a/application/migrations/174_tag_2_6_7.php b/application/migrations/174_tag_2_6_7.php
new file mode 100644
index 000000000..34eb4441d
--- /dev/null
+++ b/application/migrations/174_tag_2_6_7.php
@@ -0,0 +1,30 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+/*
+*   Tag Cloudlog as 2.6.7
+*/
+
+class Migration_tag_2_6_7 extends CI_Migration {
+
+    public function up()
+    {
+    
+        // Tag Cloudlog 2.6.3
+        $this->db->where('option_name', 'version');
+        $this->db->update('options', array('option_value' => '2.6.7'));
+
+        // Trigger Version Info Dialog
+        $this->db->where('option_type', 'version_dialog');
+        $this->db->where('option_name', 'confirmed');
+        $this->db->update('user_options', array('option_value' => 'false'));
+
+    }
+
+    public function down()
+    {
+        $this->db->where('option_name', 'version');
+        $this->db->update('options', array('option_value' => '2.6.6'));
+    }
+}
\ No newline at end of file
diff --git a/application/models/Qsl_model.php b/application/models/Qsl_model.php
index 1fdc317b0..d4232a174 100644
--- a/application/models/Qsl_model.php
+++ b/application/models/Qsl_model.php
@@ -1,25 +1,32 @@
 <?php
-class Qsl_model extends CI_Model {
-    function getQsoWithQslList() {
-        $CI =& get_instance();
+class Qsl_model extends CI_Model
+{
+    function getQsoWithQslList()
+    {
+        $CI = &get_instance();
         $CI->load->model('logbooks_model');
         $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
 
-        $this->db->select('*');
-        $this->db->from($this->config->item('table_name'));
-        $this->db->join('qsl_images', 'qsl_images.qsoid = ' . $this->config->item('table_name') . '.col_primary_key');
-        $this->db->where_in('station_id', $logbooks_locations_array);
-        $this->db->order_by("id", "desc");
+        if (is_array($logbooks_locations_array) && !empty($logbooks_locations_array)) {
+            $this->db->select('*');
+            $this->db->from($this->config->item('table_name'));
+            $this->db->join('qsl_images', 'qsl_images.qsoid = ' . $this->config->item('table_name') . '.col_primary_key');
+            $this->db->where_in('station_id', $logbooks_locations_array);
+            $this->db->order_by("id", "desc");
 
-        return $this->db->get();
+            return $this->db->get();
+        } else {
+            return false;
+        }
     }
 
-    function getQslForQsoId($id) {
+    function getQslForQsoId($id)
+    {
         // Clean ID
         $clean_id = $this->security->xss_clean($id);
 
         // be sure that QSO belongs to user
-        $CI =& get_instance();
+        $CI = &get_instance();
         $CI->load->model('logbook_model');
         if (!$CI->logbook_model->check_qso_is_accessible($clean_id)) {
             return;
@@ -32,12 +39,13 @@ function getQslForQsoId($id) {
         return $this->db->get()->result();
     }
 
-    function saveQsl($qsoid, $filename) {
+    function saveQsl($qsoid, $filename)
+    {
         // Clean ID
         $clean_id = $this->security->xss_clean($qsoid);
 
         // be sure that QSO belongs to user
-        $CI =& get_instance();
+        $CI = &get_instance();
         $CI->load->model('logbook_model');
         if (!$CI->logbook_model->check_qso_is_accessible($clean_id)) {
             return;
@@ -53,12 +61,13 @@ function saveQsl($qsoid, $filename) {
         return $this->db->insert_id();
     }
 
-    function deleteQsl($id) {
+    function deleteQsl($id)
+    {
         // Clean ID
         $clean_id = $this->security->xss_clean($id);
 
         // be sure that QSO belongs to user
-        $CI =& get_instance();
+        $CI = &get_instance();
         $CI->load->model('logbook_model');
         $this->db->select('qsoid');
         $this->db->from('qsl_images');
@@ -72,12 +81,13 @@ function deleteQsl($id) {
         $this->db->delete('qsl_images', array('id' => $clean_id));
     }
 
-    function getFilename($id) {
+    function getFilename($id)
+    {
         // Clean ID
         $clean_id = $this->security->xss_clean($id);
 
         // be sure that QSO belongs to user
-        $CI =& get_instance();
+        $CI = &get_instance();
         $CI->load->model('logbook_model');
         $this->db->select('qsoid');
         $this->db->from('qsl_images');
@@ -94,37 +104,39 @@ function getFilename($id) {
         return $this->db->get();
     }
 
-    function searchQsos($callsign) {
-        $CI =& get_instance();
+    function searchQsos($callsign)
+    {
+        $CI = &get_instance();
         $CI->load->model('logbooks_model');
         $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
 
-		$this->db->select('*');
-		$this->db->from($this->config->item('table_name'));
-		$this->db->where_in('station_id', $logbooks_locations_array);
-		$this->db->where('col_call', $callsign);
+        $this->db->select('*');
+        $this->db->from($this->config->item('table_name'));
+        $this->db->where_in('station_id', $logbooks_locations_array);
+        $this->db->where('col_call', $callsign);
 
-		return $this->db->get();
-	}
+        return $this->db->get();
+    }
 
-	function addQsotoQsl($qsoid, $filename) {
-		$clean_qsoid = $this->security->xss_clean($qsoid);
-		$clean_filename = $this->security->xss_clean($filename);
+    function addQsotoQsl($qsoid, $filename)
+    {
+        $clean_qsoid = $this->security->xss_clean($qsoid);
+        $clean_filename = $this->security->xss_clean($filename);
 
-		// be sure that QSO belongs to user
-		$CI =& get_instance();
-		$CI->load->model('logbook_model');
-		if (!$CI->logbook_model->check_qso_is_accessible($clean_qsoid)) {
-			return;
-		}
+        // be sure that QSO belongs to user
+        $CI = &get_instance();
+        $CI->load->model('logbook_model');
+        if (!$CI->logbook_model->check_qso_is_accessible($clean_qsoid)) {
+            return;
+        }
 
-		$data = array(
-			'qsoid' => $clean_qsoid,
-			'filename' => $filename
-		);
+        $data = array(
+            'qsoid' => $clean_qsoid,
+            'filename' => $filename
+        );
 
-		$this->db->insert('qsl_images', $data);
+        $this->db->insert('qsl_images', $data);
 
-		return $this->db->insert_id();
-	}
+        return $this->db->insert_id();
+    }
 }
diff --git a/application/models/User_model.php b/application/models/User_model.php
index 57c97a054..34b499ba5 100644
--- a/application/models/User_model.php
+++ b/application/models/User_model.php
@@ -149,7 +149,8 @@ function add($username, $password, $email, $type, $firstname, $lastname, $callsi
 		$measurement, $user_date_format, $user_stylesheet, $user_qth_lookup, $user_sota_lookup, $user_wwff_lookup,
 		$user_pota_lookup, $user_show_notes, $user_column1, $user_column2, $user_column3, $user_column4, $user_column5,
 		$user_show_profile_image, $user_previous_qsl_type, $user_amsat_status_upload, $user_mastodon_url,
-		$user_default_band, $user_default_confirmation, $user_qso_end_times, $user_quicklog, $user_quicklog_enter, $language) {
+		$user_default_band, $user_default_confirmation, $user_qso_end_times, $user_quicklog, $user_quicklog_enter,
+		$language, $user_hamsat_key, $user_hamsat_workable_only) {
 		// Check that the user isn't already used
 		if(!$this->exists($username)) {
 			$data = array(
@@ -184,7 +185,7 @@ function add($username, $password, $email, $type, $firstname, $lastname, $callsi
 				'user_qso_end_times' => xss_clean($user_qso_end_times),
 				'user_quicklog' => xss_clean($user_quicklog),
 				'user_quicklog_enter' => xss_clean($user_quicklog_enter),
-				'language' => xss_clean($language),
+				'language' => xss_clean($language)
 			);
 
 			// Check the password is valid
@@ -202,6 +203,8 @@ function add($username, $password, $email, $type, $firstname, $lastname, $callsi
 			$insert_id = $this->db->insert_id();
 			$this->db->query("insert into bandxuser (bandid, userid, active, cq, dok, dxcc, iota, pota, sig, sota, uscounties, was, wwff, vucc) select bands.id, " . $insert_id . ", 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 from bands;");
 			$this->db->query("insert into paper_types (user_id,paper_name,metric,width,orientation,height) SELECT ".$insert_id.", paper_name, metric, width, orientation,height FROM paper_types where user_id = -1;");
+			$this->db->query("insert into user_options (user_id, option_type, option_name, option_key, option_value) values (" . $insert_id . ", 'hamsat','hamsat_key','api','".xss_clean($user_hamsat_key)."');");
+			$this->db->query("insert into user_options (user_id, option_type, option_name, option_key, option_value) values (" . $insert_id . ", 'hamsat','hamsat_key','workable','".xss_clean($user_hamsat_workable_only)."');");
 			return OK;
 		} else {
 			return EUSERNAMEEXISTS;
@@ -252,6 +255,9 @@ function edit($fields) {
 					'winkey' => xss_clean($fields['user_winkey']),
 				);
 
+				$this->db->query("replace into user_options (user_id, option_type, option_name, option_key, option_value) values (" . $fields['id'] . ", 'hamsat','hamsat_key','api','".xss_clean($fields['user_hamsat_key'])."');");
+				$this->db->query("replace into user_options (user_id, option_type, option_name, option_key, option_value) values (" . $fields['id'] . ", 'hamsat','hamsat_key','workable','".xss_clean($fields['user_hamsat_workable_only'])."');");
+
 				// Check to see if the user is allowed to change user levels
 				if($this->session->userdata('user_type') == 99) {
 					$data['user_type'] = $fields['user_type'];
@@ -308,6 +314,7 @@ function delete($user_id) {
 
 		if($this->exists_by_id($user_id)) {
 			$this->db->query("DELETE FROM ".$this->config->item('auth_table')." WHERE user_id = '".$user_id."'");
+			$this->db->query("delete from user_options where user_id=?",$user_id);
 
 			return 1;
 		} else {
@@ -380,7 +387,7 @@ function update_session($id) {
 			'active_station_logbook' => $u->row()->active_station_logbook,
 			'language' => isset($u->row()->language) ? $u->row()->language: 'english',
 			'isWinkeyEnabled' => $u->row()->winkey,
-			'hasQrzKey' => $this->hasQrzKey($u->row()->user_id),
+			'hasQrzKey' => $this->hasQrzKey($u->row()->user_id)
 		);
 
 		$this->session->set_userdata($userdata);
diff --git a/application/models/User_options_model.php b/application/models/User_options_model.php
index f5cff23ef..1c4cacd53 100644
--- a/application/models/User_options_model.php
+++ b/application/models/User_options_model.php
@@ -33,8 +33,10 @@ public function set_option_at_all_users($option_type, $option_name, $option_arra
 		}
 	}	
 
-	public function get_options($option_type, $option_array=null) {
-		$uid=$this->session->userdata('user_id');
+	public function get_options($option_type, $option_array=null, $uid=null) {
+		if ($uid ?? '' == '') {
+			$uid=$this->session->userdata('user_id');
+		}
 		$sql_more = "";
 		$array_sql_value = array($uid, $option_type);
 		if (is_array($option_array)) {
diff --git a/application/views/components/hamsat/table.php b/application/views/components/hamsat/table.php
index e0b41b29c..8238d644a 100644
--- a/application/views/components/hamsat/table.php
+++ b/application/views/components/hamsat/table.php
@@ -1,116 +1,154 @@
 <div class="table-responsive">
     <br>
     <h2>Hamsat - Satellite Rovers</h2>
-    <p>This data is from <a target="_blank" href="https://hams.at/">https://hams.at/</a></p>
+    <p>This data is from <a target="_blank" href="https://hams.at/">https://hams.at/</a>.
+    <?php if ($user_hamsat_workable_only) {
+    echo " Only workable passes shown.";
+    } else {
+    echo " All passes shown.";
+    }?>
+    </p>
+    <?php if ($user_hamsat_workable_only && $user_hamsat_key == '') { ?>
+    <div class="alert alert-warning" role="warning">
+       Private feed key empty. Please set the feed key in your profile.
+    </div>
+    <?php } else { ?>
     <?php if ($rovedata['data'] == []) { ?>
      <div class="alert alert-warning" role="warning">
        <?php echo lang('hams_at_no_activations_found');?>
     </div>
     <?php } else { ?>
-    <table class="table table-striped table-hover">
-        <thead>
-            <tr>
-                <th>Date</th>
-                <th>Time</th>
-                <th>Callsign</th>
-                <th>Comment</th>
-                <th>Satellite</th>
-                <th>Gridsquare(s)</th>
-                <th></th>
-                <th></th>
-            </tr>
-        </thead>
-        <tbody>
-            <?php foreach ($rovedata['data'] as $rove) : ?>
-                <tr>
-                    <td>
-                        <?php
-
-                        // Get Date format
-                        if ($this->session->userdata('user_date_format')) {
-                            // If Logged in and session exists
-                            $custom_date_format = $this->session->userdata('user_date_format');
-                        } else {
-                            // Get Default date format from /config/cloudlog.php
-                            $custom_date_format = $this->config->item('qso_date_format');
-                        }
-
-                        ?>
-
-                        <?php $timestamp = strtotime($rove['aos_at']);
-                           echo date($custom_date_format, $timestamp); ?>
-
-                    </td>
-                    <td>
-                        <?php echo date("H:i:s", $timestamp)." - ".date("H:i:s", strtotime($rove['los_at'])); ?>
-                    </td>
-                    <td>
-                        <?php
-                        $CI = &get_instance();
-                        $CI->load->model('logbooks_model');
-                        $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
-                        $CI->load->model('logbook_model');
-                        $call_worked = $CI->logbook_model->check_if_callsign_worked_in_logbook($rove['callsign'], $logbooks_locations_array, "SAT");
-                        if ($call_worked != 0) {
-                            echo "<span class=\"text-success\">".$rove['callsign']."</span>";
-                        } else {
-                            echo $rove['callsign'];
-                        }
-                        ?>
-                    </td>
-                    <td>
-                        <?php
-                        echo xss_clean($rove['comment'] ?? '-');
-                        ?>
-                    </td>
-                    <?php
-                       $direction = '';
-                       if ($rove['mhz_direction'] == 'up') {
-                          $direction = '&uarr;';
-                       } else if ($rove['mhz_direction'] == 'down') {
-                          $direction = '&darr;';
-                       }
-                       $modeclass = '';
-                       if ($rove['mode'] == 'SSB' || $rove['mode'] == 'CW') {
-                          $modeclass = 'hamsatBgLin';
-                       } else if ($rove['mode'] == 'Data') {
-                          $modeclass = 'hamsatBgData';
-                       } else if ($rove['mode'] == 'FM') {
-                          $modeclass = 'hamsatBgFm';
-                       }
-
-                    ?>
-                    <td><span data-bs-toggle="tooltip" title="<?php if ($rove['mhz'] != '') { printf("%.3f", $rove['mhz']); echo " ".$direction ?? ''; } ?>"><?= $rove['satellite']['name'] ?></span> <span title="<?php echo $rove['mode']; ?>" class="badge <?php echo $modeclass; ?>"><?php echo $rove['mode']; ?></span></td>
-                    <td>
-
-
-                        <?php
-                        // Load the logbook model and call check_if_grid_worked_in_logbook
-                        foreach ($rove['grids'] as $grid) {
-                        $worked = $CI->logbook_model->check_if_grid_worked_in_logbook($grid, null, "SAT");
-                           if ($worked != 0) {
-                               echo " <span data-bs-toggle=\"tooltip\" title=\"Worked\" class=\"badge bg-success\">" . $grid . "</span>";
+       <table class="table table-striped table-hover">
+           <thead>
+               <tr>
+                   <th>Date</th>
+                   <th>Time</th>
+                   <th>Callsign</th>
+                   <th>Comment</th>
+                   <th>Satellite</th>
+                   <th>Mode</th>
+                   <th>Gridsquare(s)</th>
+                   <th>Workable</th>
+                   <th></th>
+                   <th></th>
+               </tr>
+           </thead>
+           <tbody>
+               <?php foreach ($rovedata['data'] as $rove) :
+               if ($user_hamsat_workable_only) {
+                  if (!$rove['is_workable']) {
+                     continue;
+                  }
+               } ?>
+                   <tr>
+                       <td>
+                           <?php
+   
+                           // Get Date format
+                           if ($this->session->userdata('user_date_format')) {
+                               // If Logged in and session exists
+                               $custom_date_format = $this->session->userdata('user_date_format');
+                           } else {
+                               // Get Default date format from /config/wavelog.php
+                               $custom_date_format = $this->config->item('qso_date_format');
+                           }
+   
+                           ?>
+   
+                           <?php $timestamp = strtotime($rove['aos_at']);
+                              echo date($custom_date_format, $timestamp); ?>
+   
+                       </td>
+                       <td>
+                           <?php echo date("H:i:s", $timestamp)." - ".date("H:i:s", strtotime($rove['los_at'])); ?>
+                       </td>
+                       <td>
+                           <?php
+                           $CI = &get_instance();
+                           $CI->load->model('logbooks_model');
+                           $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
+                           $CI->load->model('logbook_model');
+                           $call_worked = $CI->logbook_model->check_if_callsign_worked_in_logbook($rove['callsign'], $logbooks_locations_array, "SAT");
+                           if ($call_worked != 0) {
+                               echo "<span class=\"text-success\">".$rove['callsign']."</span>";
                            } else {
-                               echo " <span data-bs-toggle=\"tooltip\" title=\"Not Worked\" class=\"badge bg-danger\">" . $grid . "</span>";
+                               echo $rove['callsign'];
+                           }
+                           ?>
+                       </td>
+                       <td>
+                           <?php
+                           echo xss_clean($rove['comment'] ?? '-');
+                           ?>
+                       </td>
+                       <?php
+                          $direction = '';
+                          if ($rove['mhz_direction'] == 'up') {
+                             $direction = '&uarr;';
+                          } else if ($rove['mhz_direction'] == 'down') {
+                             $direction = '&darr;';
+                          }
+                          $modeclass = '';
+                          if ($rove['mode'] == 'SSB' || $rove['mode'] == 'CW') {
+                             $modeclass = 'hamsatBgLin';
+                          } else if ($rove['mode'] == 'Data') {
+                             $modeclass = 'hamsatBgData';
+                          } else if ($rove['mode'] == 'FM') {
+                             $modeclass = 'hamsatBgFm';
+                          }
+   
+                       ?>
+                       <td><span data-bs-toggle="tooltip" title="<?php if ($rove['mhz'] != '') { printf("%.3f", $rove['mhz']); echo " ".$direction ?? ''; } ?>"><?= $rove['satellite']['name'] ?></span></td>
+                       <td><span title="<?php echo $rove['mode']; ?>" class="badge <?php echo $modeclass; ?>"><?php echo $rove['mode']; ?></span></td>
+                       <td>
+   
+   
+                           <?php
+                           // Load the logbook model and call check_if_grid_worked_in_logbook
+                           foreach ($rove['grids'] as $grid) {
+                           $worked = $CI->logbook_model->check_if_grid_worked_in_logbook($grid, null, "SAT");
+                              if ($worked != 0) {
+                                  echo " <span data-bs-toggle=\"tooltip\" title=\"Worked\" class=\"badge bg-success\">" . $grid . "</span>";
+                              } else {
+                                  echo " <span data-bs-toggle=\"tooltip\" title=\"Not Worked\" class=\"badge bg-danger\">" . $grid . "</span>";
+                              }
+                           }
+                           ?>
+   
+   
+                       </td>
+                       <td>
+                       <?php
+                          if ($user_hamsat_key != '') {
+                             if ($rove['is_workable']) {
+                                echo date("H:i", strtotime($rove['workable_start_at']))." - ".date("H:i", strtotime($rove['workable_end_at']));
+                             } else {
+                                echo "<span data-bs-toggle=\"tooltip\" title=\"No\" class=\"badge bg-danger\">No</span>";
+                             }
+                          } else {
+                                echo "<span data-bs-toggle=\"tooltip\" title=\"Unkown\" class=\"badge bg-warning\">Unknown</span>";
+                          }
+                       ?>
+                       </td>
+                       <td><a href="<?php echo $rove['url']; ?>" target="_blank">Track</a></td>
+                       <?php
+                           $sat = $rove['satellite']['name'];
+                           switch (strtoupper($rove['satellite']['name'])) {
+                           case "GREENCUBE":
+                              $sat = 'IO-117';
+                              break;
                            }
-                        }
-                        ?>
-
-
-                    </td>
-                    <td><a href="<?php echo $rove['url']; ?>" target="_blank">Track</a></td>
-                    <?php
-                        $sat = $rove['satellite']['name'];
-                        switch (strtoupper($rove['satellite']['name'])) {
-                        case "GREENCUBE":
-                           $sat = 'IO-117';
-                           break;
-                        }
-                    ?>
-                    <td><a href="https://sat.fg8oj.com/sked.php?s%5B%5D=<?php echo $sat; ?>&l=<?php echo strtoupper($gridsquare); ?>&el1=0&l2=<?php echo $rove['grids'][0]; ?>&el2=0&duration=1&start=0&OK=Search" target="_blank">Sked</a></td>
-                </tr>
-            <?php endforeach; ?>
-        </tbody>
-    </table>
+                       ?>
+                       <td>
+                       <?php
+                          if ($rove['is_workable'] || $user_hamsat_key == '') { ?>
+   <a href="https://sat.fg8oj.com/sked.php?s%5B%5D=<?php echo $sat; ?>&l=<?php echo strtoupper($gridsquare); ?>&el1=0&l2=<?php echo $rove['grids'][0]; ?>&el2=0&duration=1&start=0&OK=Search" target="_blank">Sked</a>
+                       <?php } ?>
+                       </td>
+                   </tr>
+               <?php endforeach; ?>
+           </tbody>
+       </table>
+       <?php } ?>
     <?php } ?>
 </div>
diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php
index 63b0822a9..99b49f88b 100644
--- a/application/views/dashboard/index.php
+++ b/application/views/dashboard/index.php
@@ -296,8 +296,10 @@ function echoQrbCalcLink($mygrid, $grid, $vucc)
 
 				<div id="radio_display" hx-get="<?php echo site_url('visitor/radio_display_component'); ?>" hx-trigger="load, every 5s"></div>
 				<div>
-					<div id="upcoming_dxccs_component" hx-get="<?php echo site_url('dashboard/upcoming_dxcc_component'); ?>" hx-trigger="load" hx-indicator="#loading_upcoming_dxcc"></div>
-					<div id="loading_upcoming_dxcc" style="display: none;">Loading Upcoming DXPeditions.</div>
+					<?php if ($dashboard_upcoming_dx_card != false) { ?>
+						<div id="upcoming_dxccs_component" hx-get="<?php echo site_url('dashboard/upcoming_dxcc_component'); ?>" hx-trigger="load" hx-indicator="#loading_upcoming_dxcc"></div>
+						<div id="loading_upcoming_dxcc" style="display: none;">Loading Upcoming DXPeditions.</div>
+					<?php } ?>
 				</div>
 				<table class="table table-striped border-top">
 					<tr class="titles">
@@ -345,7 +347,8 @@ function echoQrbCalcLink($mygrid, $grid, $vucc)
 						<td width="50%"><?php echo $total_countries_needed; ?></td>
 					</tr>
 				</table>
-
+				
+				<?php if ($dashboard_qslcard_card != false) { ?>
 				<?php if ((($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_qsl_sent != 0 || $total_qsl_rcvd != 0 || $total_qsl_requested != 0)) { ?>
 					<table class="table table-striped border-top">
 						<tr class="titles">
@@ -372,7 +375,9 @@ function echoQrbCalcLink($mygrid, $grid, $vucc)
 						</tr>
 					</table>
 				<?php } ?>
+				<?php } ?>
 
+				<?php if ($dashboard_eqslcard_card != false) { ?>
 				<?php if ((($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_eqsl_sent != 0 || $total_eqsl_rcvd != 0)) { ?>
 					<table class="table table-striped border-top">
 						<tr class="titles">
@@ -393,7 +398,9 @@ function echoQrbCalcLink($mygrid, $grid, $vucc)
 						</tr>
 					</table>
 				<?php } ?>
+				<?php } ?>
 
+				<?php if ($dashboard_lotw_card != false) { ?>
 				<?php if ((($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === false) && ($total_lotw_sent != 0 || $total_lotw_rcvd != 0)) { ?>
 					<table class="table table-striped border-top">
 						<tr class="titles">
@@ -414,6 +421,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc)
 						</tr>
 					</table>
 				<?php } ?>
+				<?php } ?>
 
 				<?php if ((($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === false) && ($total_qrz_sent != 0 || $total_qrz_rcvd != 0)) { ?>
 					<table class="table table-striped border-top">
@@ -436,6 +444,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc)
 					</table>
 				<?php } ?>
 
+				<?php if ($dashboard_vuccgrids_card != false) { ?>
 				<?php if ((($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE)) { ?>
 					<table class="table table-striped border-top">
 						<tr class="titles">
@@ -457,6 +466,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc)
 
 					</table>
 				<?php } ?>
+				<?php } ?>
 			</div>
 		</div>
 	</div>
diff --git a/application/views/qslcard/index.php b/application/views/qslcard/index.php
index 38cb3f057..1c9933cca 100644
--- a/application/views/qslcard/index.php
+++ b/application/views/qslcard/index.php
@@ -18,7 +18,7 @@
 		$custom_date_format = $this->config->item('qso_date_format');
 	}
 
-    if (is_array($qslarray->result())) {
+    if ($qslarray !== FALSE && is_array($qslarray->result())) {
         echo '<table style="width:100%" class="qsltable table table-sm table-bordered table-hover table-striped table-condensed">
         <thead>
         <tr>
@@ -57,6 +57,8 @@
         }
 
         echo '</tbody></table>';
+    } else {
+        echo '<div class="alert alert-warning" role="alert">No QSL Cards Found.</div>';
     }
     ?>
 
diff --git a/application/views/user/edit.php b/application/views/user/edit.php
index 0e8d49235..eddb75ba0 100644
--- a/application/views/user/edit.php
+++ b/application/views/user/edit.php
@@ -1,135 +1,162 @@
 <div class="container">
 	<h3>
-	  <?php if (isset($user_add)) { 
-		echo lang('account_create_user_account');
-	  } else {
-		echo lang('account_edit_account')." <small class=\"text-muted\">".$user_name."</small>";
-	  }  
-	  ?>
-	  
+		<?php if (isset($user_add)) {
+			echo lang('account_create_user_account');
+		} else {
+			echo lang('account_edit_account') . " <small class=\"text-muted\">" . $user_name . "</small>";
+		}
+		?>
+
 	</h3>
 
-	<?php if($this->session->flashdata('success')) { ?>
+	<?php if ($this->session->flashdata('success')) { ?>
 		<!-- Display Success Message -->
 		<div class="alert alert-success">
-		  <?php echo $this->session->flashdata('success'); ?>
+			<?php echo $this->session->flashdata('success'); ?>
 		</div>
 	<?php } ?>
 
-	<?php if($this->session->flashdata('message')) { ?>
+	<?php if ($this->session->flashdata('message')) { ?>
 		<!-- Display Message -->
 		<div class="alert-message error">
-		  <?php echo $this->session->flashdata('message'); ?>
+			<?php echo $this->session->flashdata('message'); ?>
 		</div>
 	<?php } ?>
 
-	<?php if(validation_errors()) { ?>
-    <div class="alert alert-danger">
-    	<a class="btn-close" data-bs-dismiss="alert">x</a>
- 		<?php echo validation_errors(); ?>
-    </div>
+	<?php if (validation_errors()) { ?>
+		<div class="alert alert-danger">
+			<a class="btn-close" data-bs-dismiss="alert">x</a>
+			<?php echo validation_errors(); ?>
+		</div>
 	<?php } ?>
 
 	<?php $this->load->helper('form'); ?>
 
 	<form method="post" action="<?php echo $user_form_action; ?>" name="users" autocomplete="off">
-	<div class="accordion user_edit">
-		<!-- ZONE 1 / USER -->
-		<div class="accordion-item">
-			<h2 class="accordion-header" id="panelsStayOpen-H_user_general">
-				<button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-B_user_general" aria-expanded="true" aria-controls="panelsStayOpen-B_user_general">
-				<?php echo lang('account_general_information'); ?></button>
-			</h2>
-			<div id="panelsStayOpen-B_user_general" class="accordion-collapse collapse show" aria-labelledby="panelsStayOpen-H_user_general">
-				<div class="accordion-body">
-					<div class="row">
-						<!-- Account Information -->
-						<div class="col-md">
-							<div class="card">
-								<div class="card-header"><?php echo lang('account_account_information'); ?></div>
-								<div class="card-body">
-									<div class="mb-3">
-										<label><?php echo lang('account_username'); ?></label>
-										<input class="form-control" type="text" name="user_name" value="<?php if(isset($user_name)) { echo $user_name; } ?>" />
-										<?php if(isset($username_error)) { echo "<small class=\"error\">".$username_error."</small>"; } ?>
-									</div>
+		<div class="accordion user_edit">
+			<!-- ZONE 1 / USER -->
+			<div class="accordion-item">
+				<h2 class="accordion-header" id="panelsStayOpen-H_user_general">
+					<button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-B_user_general" aria-expanded="true" aria-controls="panelsStayOpen-B_user_general">
+						<?php echo lang('account_general_information'); ?></button>
+				</h2>
+				<div id="panelsStayOpen-B_user_general" class="accordion-collapse collapse show" aria-labelledby="panelsStayOpen-H_user_general">
+					<div class="accordion-body">
+						<div class="row">
+							<!-- Account Information -->
+							<div class="col-md">
+								<div class="card">
+									<div class="card-header"><?php echo lang('account_account_information'); ?></div>
+									<div class="card-body">
+										<div class="mb-3">
+											<label><?php echo lang('account_username'); ?></label>
+											<input class="form-control" type="text" name="user_name" value="<?php if (isset($user_name)) {
+																												echo $user_name;
+																											} ?>" />
+											<?php if (isset($username_error)) {
+												echo "<small class=\"error\">" . $username_error . "</small>";
+											} ?>
+										</div>
 
-									<div class="mb-3">
-										<label><?php echo lang('account_email_address'); ?></label>
-										<input class="form-control" type="text" name="user_email" value="<?php if(isset($user_email)) { echo $user_email; } ?>" />
-										<?php if(isset($email_error)) { echo "<small class=\"error\">".$email_error."</small>"; } ?>
-									</div>
-									
-									<div class="mb-3">
-										<label><?php echo lang('account_password'); ?></label>
-										<div class="input-group">
-											<input class="form-control" type="password" name="user_password" />
-											<span class="input-group-btn"><button class="btn btn-default btn-pwd-showhide" type="button"><i class="fa fa-eye-slash"></i></button></span>
+										<div class="mb-3">
+											<label><?php echo lang('account_email_address'); ?></label>
+											<input class="form-control" type="text" name="user_email" value="<?php if (isset($user_email)) {
+																													echo $user_email;
+																												} ?>" />
+											<?php if (isset($email_error)) {
+												echo "<small class=\"error\">" . $email_error . "</small>";
+											} ?>
 										</div>
-										<?php if(isset($password_error)) { echo "<small class=\"error\">".$password_error."</small>"; } else { ?>
-										<small class="form-text text-muted"><?php echo lang('account_leave_blank_to_keep_existing_password'); ?></small>
-										<?php } ?>
-									</div>
 
-									<hr/>
-									<div class="mb-3">
-										<label><?php echo lang('account_user_role'); ?></label>
-										<?php if($this->session->userdata('user_type') == 99) { ?>
-											<select class="form-select" name="user_type">
-											<?php
-												$levels = $this->config->item('auth_level');
-												foreach ($levels as $key => $value) {
-													echo '<option value="'. $key . '" '. (($user_type == $key)?"selected=\"selected\"":""). '>' . $value . '</option>';
-												}
-											?>
-											</select>
-										<?php } else {
-											$l = $this->config->item('auth_level');
-											echo $l[$user_type];
-										}?>
+										<div class="mb-3">
+											<label><?php echo lang('account_password'); ?></label>
+											<div class="input-group">
+												<input class="form-control" type="password" name="user_password" />
+												<span class="input-group-btn"><button class="btn btn-default btn-pwd-showhide" type="button"><i class="fa fa-eye-slash"></i></button></span>
+											</div>
+											<?php if (isset($password_error)) {
+												echo "<small class=\"error\">" . $password_error . "</small>";
+											} else { ?>
+												<small class="form-text text-muted"><?php echo lang('account_leave_blank_to_keep_existing_password'); ?></small>
+											<?php } ?>
+										</div>
+
+										<hr />
+										<div class="mb-3">
+											<label><?php echo lang('account_user_role'); ?></label>
+											<?php if ($this->session->userdata('user_type') == 99) { ?>
+												<select class="form-select" name="user_type">
+													<?php
+													$levels = $this->config->item('auth_level');
+													foreach ($levels as $key => $value) {
+														echo '<option value="' . $key . '" ' . (($user_type == $key) ? "selected=\"selected\"" : "") . '>' . $value . '</option>';
+													}
+													?>
+												</select>
+											<?php } else {
+												$l = $this->config->item('auth_level');
+												echo $l[$user_type];
+											} ?>
+										</div>
 									</div>
 								</div>
 							</div>
-						</div>
 
-						<!-- Personal Information -->
-						<div class="col-md">
-							<div class="card">
-								<div class="card-header"><?php echo lang('account_personal_information'); ?></div>
-								<div class="card-body">
-									<div class="mb-3">
-										<label><?php echo lang('account_first_name'); ?></label>
-										<input class="form-control" type="text" name="user_firstname" value="<?php if(isset($user_firstname)) { echo $user_firstname; } ?>" />
-											<?php if(isset($firstname_error)) { echo "<small class=\"error\">".$firstname_error."</small>"; } else { ?>
+							<!-- Personal Information -->
+							<div class="col-md">
+								<div class="card">
+									<div class="card-header"><?php echo lang('account_personal_information'); ?></div>
+									<div class="card-body">
+										<div class="mb-3">
+											<label><?php echo lang('account_first_name'); ?></label>
+											<input class="form-control" type="text" name="user_firstname" value="<?php if (isset($user_firstname)) {
+																														echo $user_firstname;
+																													} ?>" />
+											<?php if (isset($firstname_error)) {
+												echo "<small class=\"error\">" . $firstname_error . "</small>";
+											} else { ?>
 											<?php } ?>
-									</div>
+										</div>
 
-									<div class="mb-3">
-										<label><?php echo lang('account_last_name'); ?></label>
-										<input class="form-control" type="text" name="user_lastname" value="<?php if(isset($user_lastname)) { echo $user_lastname; } ?>" />
-											<?php if(isset($lastname_error)) { echo "<small class=\"error\">".$lastname_error."</small>"; } else { ?>
+										<div class="mb-3">
+											<label><?php echo lang('account_last_name'); ?></label>
+											<input class="form-control" type="text" name="user_lastname" value="<?php if (isset($user_lastname)) {
+																													echo $user_lastname;
+																												} ?>" />
+											<?php if (isset($lastname_error)) {
+												echo "<small class=\"error\">" . $lastname_error . "</small>";
+											} else { ?>
 											<?php } ?>
+										</div>
 									</div>
 								</div>
 							</div>
-						</div>
-						<!-- Ham Radio Information -->
-						<div class="col-md">
-							<div class="card">
-								<div class="card-header"><?php echo lang('account_hamradio_information'); ?></div>
-								<div class="card-body">
-									<div class="mb-3">
-										<label><?php echo lang('account_callsign'); ?></label>
-										<input class="form-control" type="text" name="user_callsign" value="<?php if(isset($user_callsign)) { echo $user_callsign; } ?>" />
-											<?php if(isset($callsign_error)) { echo "<small class=\"error\">".$callsign_error."</small>"; } else { ?>
+							<!-- Ham Radio Information -->
+							<div class="col-md">
+								<div class="card">
+									<div class="card-header"><?php echo lang('account_hamradio_information'); ?></div>
+									<div class="card-body">
+										<div class="mb-3">
+											<label><?php echo lang('account_callsign'); ?></label>
+											<input class="form-control" type="text" name="user_callsign" value="<?php if (isset($user_callsign)) {
+																													echo $user_callsign;
+																												} ?>" />
+											<?php if (isset($callsign_error)) {
+												echo "<small class=\"error\">" . $callsign_error . "</small>";
+											} else { ?>
 											<?php } ?>
-									</div>
+										</div>
 
-									<div class="mb-3">
-										<label><?php echo lang('account_gridsquare'); ?></label>
-										<input class="form-control" type="text" name="user_locator" value="<?php if(isset($user_locator)) { echo $user_locator; } ?>" />
-											<?php if(isset($locator_error)) { echo "<small class=\"error\">".$locator_error."</small>"; } else { ?>
+										<div class="mb-3">
+											<label><?php echo lang('account_gridsquare'); ?></label>
+											<input class="form-control" type="text" name="user_locator" value="<?php if (isset($user_locator)) {
+																													echo $user_locator;
+																												} ?>" />
+											<?php if (isset($locator_error)) {
+												echo "<small class=\"error\">" . $locator_error . "</small>";
+											} else { ?>
 											<?php } ?>
+										</div>
 									</div>
 								</div>
 							</div>
@@ -137,478 +164,781 @@
 					</div>
 				</div>
 			</div>
-		</div>
-		<!-- ZONE 2 / Cloudlog -->
-		<div class="accordion-item">
-			<h2 class="accordion-header" id="panelsStayOpen-H_cloudlog_general">
-				<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-B_cloudlog_general" aria-expanded="false" aria-controls="panelsStayOpen-B_cloudlog_general">
-				<?php echo lang('account_cloudlog_preferences'); ?></button>
-			</h2>
-			<div id="panelsStayOpen-B_cloudlog_general" class="accordion-collapse collapse" aria-labelledby="panelsStayOpen-H_cloudlog_general">
-				<div class="accordion-body">
-					<div class="row mb-3">
-						<!-- Cloudlog Preferences -->
-						<div class="col-md">
-							<div class="card">
-								<div class="card-header"><?php echo lang('general_word_general'); ?></div>
-								<div class="card-body">
-									<div class="mb-3">
-										<label><?php echo lang('account_theme').' / '.lang('account_stylesheet'); ?></label>
-										<?php if(!isset($user_stylesheet)) { $user_stylesheet='default'; }?>
-										<select class="form-select" id="user_stylesheet" name="user_stylesheet" required>
-											<?php
-											foreach ($themes as $theme) {
-												echo '<option value="' . $theme->foldername . '" ' . (( $user_stylesheet == $theme->foldername)?'selected="selected"':"") . '>' . $theme->name . '</option>';
-											}
-											?>
-										</select>
-									</div>
-									<hr/>
-									<?php if ($this->config->item('cl_multilanguage')) { ?>
+			<!-- ZONE 2 / Cloudlog -->
+			<div class="accordion-item">
+				<h2 class="accordion-header" id="panelsStayOpen-H_cloudlog_general">
+					<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-B_cloudlog_general" aria-expanded="false" aria-controls="panelsStayOpen-B_cloudlog_general">
+						<?php echo lang('account_cloudlog_preferences'); ?></button>
+				</h2>
+				<div id="panelsStayOpen-B_cloudlog_general" class="accordion-collapse collapse" aria-labelledby="panelsStayOpen-H_cloudlog_general">
+					<div class="accordion-body">
+						<div class="row mb-3">
+							<!-- Cloudlog Preferences -->
+							<div class="col-md">
+								<div class="card">
+									<div class="card-header"><?php echo lang('general_word_general'); ?></div>
+									<div class="card-body">
+										<div class="mb-3">
+											<label><?php echo lang('account_theme') . ' / ' . lang('account_stylesheet'); ?></label>
+											<?php if (!isset($user_stylesheet)) {
+												$user_stylesheet = 'default';
+											} ?>
+											<select class="form-select" id="user_stylesheet" name="user_stylesheet" required>
+												<?php
+												foreach ($themes as $theme) {
+													echo '<option value="' . $theme->foldername . '" ' . (($user_stylesheet == $theme->foldername) ? 'selected="selected"' : "") . '>' . $theme->name . '</option>';
+												}
+												?>
+											</select>
+										</div>
+										<hr />
+										<?php if ($this->config->item('cl_multilanguage')) { ?>
+											<div class="mb-3">
+												<label for="language"><?php echo lang('account_cloudlog_language'); ?></label>
+												<?php
+												foreach ($existing_languages as $lang) {
+													$options[$lang] = ucfirst($lang);
+												}
+												echo form_dropdown('language', $options, $language);
+												?>
+												<small id="language_Help" class="form-text text-muted"><?php echo lang('account_choose_cloudlog_language'); ?></small>
+											</div>
+										<?php } ?>
+
 										<div class="mb-3">
-											<label for="language"><?php echo lang('account_cloudlog_language'); ?></label>
+											<label><?php echo lang('account_timezone'); ?></label>
 											<?php
-											foreach($existing_languages as $lang){
-												$options[$lang] = ucfirst($lang);
+											if (!isset($user_timezone)) {
+												$user_timezone = '151';
 											}
-											echo form_dropdown('language', $options, $language);
+											echo form_dropdown('user_timezone', $timezones, $user_timezone);
 											?>
-											<small id="language_Help" class="form-text text-muted"><?php echo lang('account_choose_cloudlog_language'); ?></small>
 										</div>
-									<?php } ?>
-
-									<div class="mb-3">
-										<label><?php echo lang('account_timezone'); ?></label>
-										<?php 
-										if(!isset($user_timezone)) { $user_timezone='151'; }
-										echo form_dropdown('user_timezone', $timezones, $user_timezone); 
-										?>
-									</div>
 
-									<div class="mb-3">
-										<label for="SelectDateFormat"><?php echo lang('account_date_format'); ?></label>
-										<?php if(!isset($user_date_format)) { $user_date_format='d/m/y'; }?>
-										<select name="user_date_format" class="form-select" id="SelectDateFormat" aria-describedby="SelectDateFormatHelp">
-											<option value="d/m/y" <?php if($user_date_format == "d/m/y") { echo "selected=\"selected\""; } ?>><?php echo date('d/m/y'); ?></option>
-											<option value="d/m/Y" <?php if($user_date_format == "d/m/Y") { echo "selected=\"selected\""; } ?>><?php echo date('d/m/Y'); ?></option>
-											<option value="m/d/y" <?php if($user_date_format == "m/d/y") { echo "selected=\"selected\""; } ?>><?php echo date('m/d/y'); ?></option>
-											<option value="m/d/Y" <?php if($user_date_format == "m/d/Y") { echo "selected=\"selected\""; } ?>><?php echo date('m/d/Y'); ?></option>
-											<option value="d.m.Y" <?php if($user_date_format == "d.m.Y") { echo "selected=\"selected\""; } ?>><?php echo date('d.m.Y'); ?></option>
-											<option value="y/m/d" <?php if($user_date_format == "y/m/d") { echo "selected=\"selected\""; } ?>><?php echo date('y/m/d'); ?></option>
-											<option value="Y-m-d" <?php if($user_date_format == "Y-m-d") { echo "selected=\"selected\""; } ?>><?php echo date('Y-m-d'); ?></option>
-											<option value="M d, Y" <?php if($user_date_format == "M d, Y") { echo "selected=\"selected\""; } ?>><?php echo date('M d, Y'); ?></option>
-											<option value="M d, y" <?php if($user_date_format == "M d, y") { echo "selected=\"selected\""; } ?>><?php echo date('M d, y'); ?></option>
-										</select>
-										<small id="SelectDateFormatHelp" class="form-text text-muted"><?php echo lang('account_select_how_you_would_like_dates_shown_when_logged_into_your_account'); ?></small>
-									</div>
+										<div class="mb-3">
+											<label for="SelectDateFormat"><?php echo lang('account_date_format'); ?></label>
+											<?php if (!isset($user_date_format)) {
+												$user_date_format = 'd/m/y';
+											} ?>
+											<select name="user_date_format" class="form-select" id="SelectDateFormat" aria-describedby="SelectDateFormatHelp">
+												<option value="d/m/y" <?php if ($user_date_format == "d/m/y") {
+																			echo "selected=\"selected\"";
+																		} ?>><?php echo date('d/m/y'); ?></option>
+												<option value="d/m/Y" <?php if ($user_date_format == "d/m/Y") {
+																			echo "selected=\"selected\"";
+																		} ?>><?php echo date('d/m/Y'); ?></option>
+												<option value="m/d/y" <?php if ($user_date_format == "m/d/y") {
+																			echo "selected=\"selected\"";
+																		} ?>><?php echo date('m/d/y'); ?></option>
+												<option value="m/d/Y" <?php if ($user_date_format == "m/d/Y") {
+																			echo "selected=\"selected\"";
+																		} ?>><?php echo date('m/d/Y'); ?></option>
+												<option value="d.m.Y" <?php if ($user_date_format == "d.m.Y") {
+																			echo "selected=\"selected\"";
+																		} ?>><?php echo date('d.m.Y'); ?></option>
+												<option value="y/m/d" <?php if ($user_date_format == "y/m/d") {
+																			echo "selected=\"selected\"";
+																		} ?>><?php echo date('y/m/d'); ?></option>
+												<option value="Y-m-d" <?php if ($user_date_format == "Y-m-d") {
+																			echo "selected=\"selected\"";
+																		} ?>><?php echo date('Y-m-d'); ?></option>
+												<option value="M d, Y" <?php if ($user_date_format == "M d, Y") {
+																			echo "selected=\"selected\"";
+																		} ?>><?php echo date('M d, Y'); ?></option>
+												<option value="M d, y" <?php if ($user_date_format == "M d, y") {
+																			echo "selected=\"selected\"";
+																		} ?>><?php echo date('M d, y'); ?></option>
+											</select>
+											<small id="SelectDateFormatHelp" class="form-text text-muted"><?php echo lang('account_select_how_you_would_like_dates_shown_when_logged_into_your_account'); ?></small>
+										</div>
 
-									<div class="mb-3">
-										<label for="user_measurement_base"><?php echo lang('account_measurement_preferences'); ?></label>
-										<?php if(!isset($user_measurement_base)) { $user_measurement_base='M'; }?>
-										<select class="form-select" id="user_measurement_base" name="user_measurement_base" aria-describedby="user_measurement_base_Help" required>
-											<option value ''></option>
-											<option value='K' <?php if($user_measurement_base == "K") { echo "selected=\"selected\""; } ?>>Kilometers</option>
-											<option value='M' <?php if($user_measurement_base == "M") { echo "selected=\"selected\""; } ?>>Miles</option>
-											<option value='N' <?php if($user_measurement_base == "N") { echo "selected=\"selected\""; } ?>>Nautical miles</option>
-										</select>
-										<small id="user_measurement_base_Help" class="form-text text-muted"><?php echo lang('account_choose_which_unit_distances_will_be_shown_in'); ?></small>
+										<div class="mb-3">
+											<label for="user_measurement_base"><?php echo lang('account_measurement_preferences'); ?></label>
+											<?php if (!isset($user_measurement_base)) {
+												$user_measurement_base = 'M';
+											} ?>
+											<select class="form-select" id="user_measurement_base" name="user_measurement_base" aria-describedby="user_measurement_base_Help" required>
+												<option value ''></option>
+												<option value='K' <?php if ($user_measurement_base == "K") {
+																		echo "selected=\"selected\"";
+																	} ?>>Kilometers</option>
+												<option value='M' <?php if ($user_measurement_base == "M") {
+																		echo "selected=\"selected\"";
+																	} ?>>Miles</option>
+												<option value='N' <?php if ($user_measurement_base == "N") {
+																		echo "selected=\"selected\"";
+																	} ?>>Nautical miles</option>
+											</select>
+											<small id="user_measurement_base_Help" class="form-text text-muted"><?php echo lang('account_choose_which_unit_distances_will_be_shown_in'); ?></small>
+										</div>
 									</div>
 								</div>
 							</div>
-						</div>
 
-						<!-- Logbook fields Setting -->
-						<div class="col-md">
-							<div class="card">
-								<div class="card-header"><?php echo lang('account_logbook_fields'); ?></div>
-								<div class="card-body">
-									<div class="mb-3">
-										<label for="column1"><?php echo lang('account_column1_text'); ?></label>
-										<?php if(!isset($user_column1)) { $user_column1='Mode'; }?>
-										<select class="form-select" id="column1" name="user_column1">
-											<option value="Band" <?php if ($user_column1 == "Band") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_band'); ?></option>
-											<option value="Frequency" <?php if ($user_column1 == "Frequency") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_frequency'); ?></option>
-											<option value="Mode" <?php if ($user_column1 == "Mode") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_mode'); ?></option>
-											<option value="RSTS" <?php if ($user_column1 == "RSTS") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_rsts'); ?></option>
-											<option value="RSTR" <?php if ($user_column1 == "RSTR") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_rstr'); ?></option>
-											<option value="Country" <?php if ($user_column1 == "Country") { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_country'); ?></option>
-											<option value="IOTA" <?php if ($user_column1 == "IOTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_iota'); ?></option>
-											<option value="SOTA" <?php if ($user_column1 == "SOTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_sota'); ?></option>
-											<option value="WWFF" <?php if ($user_column1 == "WWFF") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_wwff'); ?></option>
-											<option value="POTA" <?php if ($user_column1 == "POTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_pota'); ?></option>
-											<option value="State" <?php if ($user_column1 == "State") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_state'); ?></option>
-											<option value="Grid" <?php if ($user_column1 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_gridsquare'); ?></option>
-											<option value="Distance" <?php if ($user_column1 == "Distance") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_distance'); ?></option>
-											<option value="Operator" <?php if ($user_column1 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_operator'); ?></option>
-											<option value="Name" <?php if ($user_column1 == "Name") { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_name'); ?></option>
-										</select>
-									</div>
+							<div class="col-md">
+								<div class="card">
+									<div class="card-header">Dashboard Options</div>
+									<div class="card-body">
+										<div class="mb-3">
+											<div class="form-check form-switch">
+												<input name="user_dashboard_enable_dxpedition_card" class="form-check-input" type="checkbox" role="switch" id="DashboardUpcomingDXpeditionCheck" <?php if ($dashboard_upcoming_dx_card) { echo 'checked'; } ?>>
+												<label class="form-check-label" for="DashboardUpcomingDXpeditionCheck" >Enable Upcoming DXPedition Card</label>
+											</div>
 
-									<div class="mb-3">
-										<label for="column2"><?php echo lang('account_column2_text'); ?></label>
-										<?php if(!isset($user_column2)) { $user_column2='RSTS'; }?>
-										<select class="form-select" id="column2" name="user_column2">
-											<option value="Band" <?php if ($user_column2 == "Band") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_band'); ?></option>
-											<option value="Frequency" <?php if ($user_column2 == "Frequency") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_frequency'); ?></option>
-											<option value="Mode" <?php if ($user_column2 == "Mode") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_mode'); ?></option>
-											<option value="RSTS" <?php if ($user_column2 == "RSTS") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_rsts'); ?></option>
-											<option value="RSTR" <?php if ($user_column2 == "RSTR") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_rstr'); ?></option>
-											<option value="Country" <?php if ($user_column2 == "Country") { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_country'); ?></option>
-											<option value="IOTA" <?php if ($user_column2 == "IOTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_iota'); ?></option>
-											<option value="SOTA" <?php if ($user_column2 == "SOTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_sota'); ?></option>
-											<option value="WWFF" <?php if ($user_column1 == "WWFF") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_wwff'); ?></option>
-											<option value="POTA" <?php if ($user_column1 == "POTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_pota'); ?></option>
-											<option value="State" <?php if ($user_column2 == "State") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_state'); ?></option>
-											<option value="Grid" <?php if ($user_column2 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_gridsquare'); ?></option>
-											<option value="Distance" <?php if ($user_column2 == "Distance") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_distance'); ?></option>
-											<option value="Operator" <?php if ($user_column2 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_operator'); ?></option>
-											<option value="Name" <?php if ($user_column2 == "Name") { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_name'); ?></option>
-										</select>
-									</div>
+											<div class="form-check form-switch">
+												<input name="user_dashboard_enable_qslcards_card" class="form-check-input" type="checkbox" role="switch" id="DashboardQSLCardCheck" <?php if ($dashboard_qslcard_card) { echo 'checked'; } ?>>
+												<label class="form-check-label" for="DashboardQSLCardCheck" >Enable QSL Cards Card</label>
+											</div>
 
-									<div class="mb-3">
-										<label for="column3"><?php echo lang('account_column3_text'); ?></label>
-										<?php if(!isset($user_column3)) { $user_column3='RSTR'; }?>
-										<select class="form-select" id="column3" name="user_column3">
-											<option value="Band" <?php if ($user_column3 == "Band") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_band'); ?></option>
-											<option value="Frequency" <?php if ($user_column3 == "Frequency") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_frequency'); ?></option>
-											<option value="Mode" <?php if ($user_column3 == "Mode") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_mode'); ?></option>
-											<option value="RSTS" <?php if ($user_column3 == "RSTS") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_rsts'); ?></option>
-											<option value="RSTR" <?php if ($user_column3 == "RSTR") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_rstr'); ?></option>
-											<option value="Country" <?php if ($user_column3 == "Country") { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_country'); ?></option>
-											<option value="IOTA" <?php if ($user_column3 == "IOTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_iota'); ?></option>
-											<option value="SOTA" <?php if ($user_column3 == "SOTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_sota'); ?></option>
-											<option value="WWFF" <?php if ($user_column1 == "WWFF") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_wwff'); ?></option>
-											<option value="POTA" <?php if ($user_column1 == "POTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_pota'); ?></option>
-											<option value="State" <?php if ($user_column3 == "State") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_state'); ?></option>
-											<option value="Grid" <?php if ($user_column3 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_gridsquare'); ?></option>
-											<option value="Distance" <?php if ($user_column3 == "Distance") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_distance'); ?></option>
-											<option value="Operator" <?php if ($user_column3 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_operator'); ?></option>
-											<option value="Name" <?php if ($user_column3 == "Name") { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_name'); ?></option>
-										</select>
-									</div>
+											<div class="form-check form-switch">
+												<input name="user_dashboard_enable_eqslcards_card" class="form-check-input" type="checkbox" role="switch" id="DashboardeQSLCardCheck" <?php if ($dashboard_eqslcard_card) { echo 'checked'; } ?>>
+												<label class="form-check-label" for="DashboardeQSLCardCheck" >Enable eQSL Cards Card</label>
+											</div>
 
-									<div class="mb-3">
-										<label for="column4"><?php echo lang('account_column4_text'); ?></label>
-										<?php if(!isset($user_column4)) { $user_column4='Band'; }?>
-										<select class="form-select" id="column4" name="user_column4">
-											<option value="Band" <?php if ($user_column4 == "Band") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_band'); ?></option>
-											<option value="Frequency" <?php if ($user_column4 == "Frequency") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_frequency'); ?></option>
-											<option value="Mode" <?php if ($user_column4 == "Mode") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_mode'); ?></option>
-											<option value="RSTS" <?php if ($user_column4 == "RSTS") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_rsts'); ?></option>
-											<option value="RSTR" <?php if ($user_column4 == "RSTR") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_rstr'); ?></option>
-											<option value="Country" <?php if ($user_column4 == "Country") { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_country'); ?></option>
-											<option value="IOTA" <?php if ($user_column4 == "IOTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_iota'); ?></option>
-											<option value="SOTA" <?php if ($user_column4 == "SOTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_sota'); ?></option>
-											<option value="WWFF" <?php if ($user_column1 == "WWFF") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_wwff'); ?></option>
-											<option value="POTA" <?php if ($user_column1 == "POTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_pota'); ?></option>
-											<option value="State" <?php if ($user_column4 == "State") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_state'); ?></option>
-											<option value="Grid" <?php if ($user_column4 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_gridsquare'); ?></option>
-											<option value="Distance" <?php if ($user_column4 == "Distance") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_distance'); ?></option>
-											<option value="Operator" <?php if ($user_column4 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_operator'); ?></option>
-											<option value="Name" <?php if ($user_column4 == "Name") { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_name'); ?></option>
-										</select>
-									</div>
+											<div class="form-check form-switch">
+												<input name="user_dashboard_enable_lotw_card" class="form-check-input" type="checkbox" role="switch" id="DashboardlotwCardCheck" <?php if ($dashboard_lotw_card) { echo 'checked'; } ?>>
+												<label class="form-check-label" for="DashboardlotwCardCheck" >Enable Logbook of the World Card</label>
+											</div>
 
-									<div class="mb-3">
-										<label for="column5"><?php echo lang('account_column5_text'); ?></label>
-										<?php if(!isset($user_column5)) { $user_column5='Country'; }?>
-										<select class="form-select" id="column5" name="user_column5">
-											<option value="" <?php if ($user_column5 == "") { echo " selected =\"selected\""; } ?>></option>
-											<option value="Band" <?php if ($user_column5 == "Band") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_band'); ?></option>
-											<option value="Frequency" <?php if ($user_column5 == "Frequency") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_frequency'); ?></option>
-											<option value="Mode" <?php if ($user_column5 == "Mode") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_mode'); ?></option>
-											<option value="RSTS" <?php if ($user_column5 == "RSTS") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_rsts'); ?></option>
-											<option value="RSTR" <?php if ($user_column5 == "RSTR") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_rstr'); ?></option>
-											<option value="Country" <?php if ($user_column5 == "Country") { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_country'); ?></option>
-											<option value="IOTA" <?php if ($user_column5 == "IOTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_iota'); ?></option>
-											<option value="SOTA" <?php if ($user_column5 == "SOTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_sota'); ?></option>
-											<option value="WWFF" <?php if ($user_column1 == "WWFF") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_wwff'); ?></option>
-											<option value="POTA" <?php if ($user_column1 == "POTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_pota'); ?></option>
-											<option value="State" <?php if ($user_column5 == "State") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_state'); ?></option>
-											<option value="Grid" <?php if ($user_column5 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_gridsquare'); ?></option>
-											<option value="Distance" <?php if ($user_column5 == "Distance") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_distance'); ?></option>
-											<option value="Operator" <?php if ($user_column5 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_operator'); ?></option>
-											<option value="Name" <?php if ($user_column5 == "Name") { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_name'); ?></option>
-											<option value="Location" <?php if ($user_column5 == "Location") { echo " selected =\"selected\""; } ?>><?php echo lang('cloudlog_station_profile'); ?></option>
-										</select>
+											<div class="form-check form-switch">
+												<input name="user_dashboard_enable_vuccgrids_card" class="form-check-input" type="checkbox" role="switch" id="DashboardvuccgridsCardCheck" <?php if ($dashboard_vuccgrids_card) { echo 'checked'; } ?>>
+												<label class="form-check-label" for="DashboardvuccgridsCardCheck" >Enable VUCC-Grids Card</label>
+											</div>
+										</div>
 									</div>
 								</div>
 							</div>
-						</div>
 
-						<!-- QSO Logging Options -->
-						<div class="col-md">
-							<div class="card">
-								<div class="card-header"><?php echo lang('account_qso_logging_options'); ?></div>
-								<div class="card-body">
-									<div class="mb-3">
-										<label for="logendtime"><?php echo lang('account_log_end_time'); ?></label>
-										<?php if(!isset($user_qso_end_times)) { $user_qso_end_times='0'; }?>
-										<select class="form-select" id="logendtimes" name="user_qso_end_times">
-											<option value="1" <?php if ($user_qso_end_times == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_yes'); ?></option>
-											<option value="0" <?php if ($user_qso_end_times == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_no'); ?></option>
-										</select>
-										<small id="SelectDateFormatHelp" class="form-text text-muted"><?php echo lang('account_log_end_time_hint'); ?></small>
-									</div>
-
-									<hr />
-									<div class="mb-3">
-										<label for="profileimages"><?php echo lang('account_show_profile_picture_of_qso_partner_from_qrzcom_hamqthcom_profile_in_the_log_qso_section'); ?></label>
-										<?php if(!isset($user_show_profile_image)) { $user_show_profile_image='0'; }?>
-										<select class="form-select" id="profileimages" name="user_show_profile_image">
-											<option value="1" <?php if ($user_show_profile_image == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_yes'); ?></option>
-											<option value="0" <?php if ($user_show_profile_image == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_no'); ?></option>
-										</select>
-										<small class="form-text text-muted"><?php echo lang('account_please_set_your_qrzcom_hamqthcom_credentials_in_the_general_config_file'); ?></small>
-									</div>
+							<div class="row mb-3">
+								<!-- Logbook fields Setting -->
+								<div class="col-md">
+									<div class="card">
+										<div class="card-header"><?php echo lang('account_logbook_fields'); ?></div>
+										<div class="card-body">
+											<div class="mb-3">
+												<label for="column1"><?php echo lang('account_column1_text'); ?></label>
+												<?php if (!isset($user_column1)) {
+													$user_column1 = 'Mode';
+												} ?>
+												<select class="form-select" id="column1" name="user_column1">
+													<option value="Band" <?php if ($user_column1 == "Band") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_band'); ?></option>
+													<option value="Frequency" <?php if ($user_column1 == "Frequency") {
+																					echo " selected =\"selected\"";
+																				} ?>><?php echo lang('gen_hamradio_frequency'); ?></option>
+													<option value="Mode" <?php if ($user_column1 == "Mode") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_mode'); ?></option>
+													<option value="RSTS" <?php if ($user_column1 == "RSTS") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_rsts'); ?></option>
+													<option value="RSTR" <?php if ($user_column1 == "RSTR") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_rstr'); ?></option>
+													<option value="Country" <?php if ($user_column1 == "Country") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('general_word_country'); ?></option>
+													<option value="IOTA" <?php if ($user_column1 == "IOTA") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_iota'); ?></option>
+													<option value="SOTA" <?php if ($user_column1 == "SOTA") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_sota'); ?></option>
+													<option value="WWFF" <?php if ($user_column1 == "WWFF") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_wwff'); ?></option>
+													<option value="POTA" <?php if ($user_column1 == "POTA") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_pota'); ?></option>
+													<option value="State" <?php if ($user_column1 == "State") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_state'); ?></option>
+													<option value="Grid" <?php if ($user_column1 == "Grid") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_gridsquare'); ?></option>
+													<option value="Distance" <?php if ($user_column1 == "Distance") {
+																					echo " selected =\"selected\"";
+																				} ?>><?php echo lang('gen_hamradio_distance'); ?></option>
+													<option value="Operator" <?php if ($user_column1 == "Operator") {
+																					echo " selected =\"selected\"";
+																				} ?>><?php echo lang('gen_hamradio_operator'); ?></option>
+													<option value="Name" <?php if ($user_column1 == "Name") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('general_word_name'); ?></option>
+												</select>
+											</div>
 
-									<hr />
-									<div class="mb-3">
-										<label for="qthlookup"><?php echo lang('account_location_auto_lookup'); ?></label>
-										<?php if(!isset($user_qth_lookup)) { $user_qth_lookup='0'; }?>
-										<select class="form-select" id="qthlookup" name="user_qth_lookup">
-											<option value="1" <?php if ($user_qth_lookup == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_yes'); ?></option>
-											<option value="0" <?php if ($user_qth_lookup == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_no'); ?></option>
-										</select>
-										<small class="form-text text-muted"><?php echo lang('account_if_set_gridsquare_is_fetched_based_on_location_name'); ?></small>
-									</div>
+											<div class="mb-3">
+												<label for="column2"><?php echo lang('account_column2_text'); ?></label>
+												<?php if (!isset($user_column2)) {
+													$user_column2 = 'RSTS';
+												} ?>
+												<select class="form-select" id="column2" name="user_column2">
+													<option value="Band" <?php if ($user_column2 == "Band") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_band'); ?></option>
+													<option value="Frequency" <?php if ($user_column2 == "Frequency") {
+																					echo " selected =\"selected\"";
+																				} ?>><?php echo lang('gen_hamradio_frequency'); ?></option>
+													<option value="Mode" <?php if ($user_column2 == "Mode") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_mode'); ?></option>
+													<option value="RSTS" <?php if ($user_column2 == "RSTS") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_rsts'); ?></option>
+													<option value="RSTR" <?php if ($user_column2 == "RSTR") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_rstr'); ?></option>
+													<option value="Country" <?php if ($user_column2 == "Country") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('general_word_country'); ?></option>
+													<option value="IOTA" <?php if ($user_column2 == "IOTA") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_iota'); ?></option>
+													<option value="SOTA" <?php if ($user_column2 == "SOTA") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_sota'); ?></option>
+													<option value="WWFF" <?php if ($user_column1 == "WWFF") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_wwff'); ?></option>
+													<option value="POTA" <?php if ($user_column1 == "POTA") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_pota'); ?></option>
+													<option value="State" <?php if ($user_column2 == "State") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_state'); ?></option>
+													<option value="Grid" <?php if ($user_column2 == "Grid") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_gridsquare'); ?></option>
+													<option value="Distance" <?php if ($user_column2 == "Distance") {
+																					echo " selected =\"selected\"";
+																				} ?>><?php echo lang('gen_hamradio_distance'); ?></option>
+													<option value="Operator" <?php if ($user_column2 == "Operator") {
+																					echo " selected =\"selected\"";
+																				} ?>><?php echo lang('gen_hamradio_operator'); ?></option>
+													<option value="Name" <?php if ($user_column2 == "Name") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('general_word_name'); ?></option>
+												</select>
+											</div>
 
-									<div class="mb-3">
-										<label for="sotalookup"><?php echo lang('account_sota_auto_lookup_gridsquare_and_name_for_summit'); ?></label>
-										<?php if(!isset($user_sota_lookup)) { $user_sota_lookup='0'; }?>
-										<select class="form-select" id="sotalookup" name="user_sota_lookup">
-											<option value="1" <?php if ($user_sota_lookup == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_yes'); ?></option>
-											<option value="0" <?php if ($user_sota_lookup == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_no'); ?></option>
-										</select>
-										<small class="form-text text-muted"><?php echo lang('account_if_set_name_and_gridsquare_is_fetched_from_the_api_and_filled_in_location_and_locator'); ?></small>
-									</div>
+											<div class="mb-3">
+												<label for="column3"><?php echo lang('account_column3_text'); ?></label>
+												<?php if (!isset($user_column3)) {
+													$user_column3 = 'RSTR';
+												} ?>
+												<select class="form-select" id="column3" name="user_column3">
+													<option value="Band" <?php if ($user_column3 == "Band") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_band'); ?></option>
+													<option value="Frequency" <?php if ($user_column3 == "Frequency") {
+																					echo " selected =\"selected\"";
+																				} ?>><?php echo lang('gen_hamradio_frequency'); ?></option>
+													<option value="Mode" <?php if ($user_column3 == "Mode") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_mode'); ?></option>
+													<option value="RSTS" <?php if ($user_column3 == "RSTS") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_rsts'); ?></option>
+													<option value="RSTR" <?php if ($user_column3 == "RSTR") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_rstr'); ?></option>
+													<option value="Country" <?php if ($user_column3 == "Country") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('general_word_country'); ?></option>
+													<option value="IOTA" <?php if ($user_column3 == "IOTA") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_iota'); ?></option>
+													<option value="SOTA" <?php if ($user_column3 == "SOTA") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_sota'); ?></option>
+													<option value="WWFF" <?php if ($user_column1 == "WWFF") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_wwff'); ?></option>
+													<option value="POTA" <?php if ($user_column1 == "POTA") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_pota'); ?></option>
+													<option value="State" <?php if ($user_column3 == "State") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_state'); ?></option>
+													<option value="Grid" <?php if ($user_column3 == "Grid") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_gridsquare'); ?></option>
+													<option value="Distance" <?php if ($user_column3 == "Distance") {
+																					echo " selected =\"selected\"";
+																				} ?>><?php echo lang('gen_hamradio_distance'); ?></option>
+													<option value="Operator" <?php if ($user_column3 == "Operator") {
+																					echo " selected =\"selected\"";
+																				} ?>><?php echo lang('gen_hamradio_operator'); ?></option>
+													<option value="Name" <?php if ($user_column3 == "Name") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('general_word_name'); ?></option>
+												</select>
+											</div>
 
-									<div class="mb-3">
-										<label for="wwfflookup"><?php echo lang('account_wwff_auto_lookup_gridsquare_and_name_for_reference'); ?></label>
-										<?php if(!isset($user_wwff_lookup)) { $user_wwff_lookup='0'; }?>
-										<select class="form-select" id="wwfflookup" name="user_wwff_lookup">
-											<option value="1" <?php if ($user_wwff_lookup == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_yes'); ?></option>
-											<option value="0" <?php if ($user_wwff_lookup == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_no'); ?></option>
-										</select>
-										<small class="form-text text-muted"><?php echo lang('account_if_set_name_and_gridsquare_is_fetched_from_the_api_and_filled_in_location_and_locator'); ?></small>
-									</div>
+											<div class="mb-3">
+												<label for="column4"><?php echo lang('account_column4_text'); ?></label>
+												<?php if (!isset($user_column4)) {
+													$user_column4 = 'Band';
+												} ?>
+												<select class="form-select" id="column4" name="user_column4">
+													<option value="Band" <?php if ($user_column4 == "Band") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_band'); ?></option>
+													<option value="Frequency" <?php if ($user_column4 == "Frequency") {
+																					echo " selected =\"selected\"";
+																				} ?>><?php echo lang('gen_hamradio_frequency'); ?></option>
+													<option value="Mode" <?php if ($user_column4 == "Mode") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_mode'); ?></option>
+													<option value="RSTS" <?php if ($user_column4 == "RSTS") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_rsts'); ?></option>
+													<option value="RSTR" <?php if ($user_column4 == "RSTR") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_rstr'); ?></option>
+													<option value="Country" <?php if ($user_column4 == "Country") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('general_word_country'); ?></option>
+													<option value="IOTA" <?php if ($user_column4 == "IOTA") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_iota'); ?></option>
+													<option value="SOTA" <?php if ($user_column4 == "SOTA") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_sota'); ?></option>
+													<option value="WWFF" <?php if ($user_column1 == "WWFF") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_wwff'); ?></option>
+													<option value="POTA" <?php if ($user_column1 == "POTA") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_pota'); ?></option>
+													<option value="State" <?php if ($user_column4 == "State") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_state'); ?></option>
+													<option value="Grid" <?php if ($user_column4 == "Grid") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_gridsquare'); ?></option>
+													<option value="Distance" <?php if ($user_column4 == "Distance") {
+																					echo " selected =\"selected\"";
+																				} ?>><?php echo lang('gen_hamradio_distance'); ?></option>
+													<option value="Operator" <?php if ($user_column4 == "Operator") {
+																					echo " selected =\"selected\"";
+																				} ?>><?php echo lang('gen_hamradio_operator'); ?></option>
+													<option value="Name" <?php if ($user_column4 == "Name") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('general_word_name'); ?></option>
+												</select>
+											</div>
 
-									<div class="mb-3">
-										<label for="potalookup"><?php echo lang('account_pota_auto_lookup_gridsquare_and_name_for_park'); ?></label>
-										<?php if(!isset($user_pota_lookup)) { $user_pota_lookup='0'; }?>
-										<select class="form-select" id="potalookup" name="user_pota_lookup">
-											<option value="1" <?php if ($user_pota_lookup == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_yes'); ?></option>
-											<option value="0" <?php if ($user_pota_lookup == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_no'); ?></option>
-										</select>
-										<small class="form-text text-muted"><?php echo lang('account_if_set_name_and_gridsquare_is_fetched_from_the_api_and_filled_in_location_and_locator'); ?></small>
+											<div class="mb-3">
+												<label for="column5"><?php echo lang('account_column5_text'); ?></label>
+												<?php if (!isset($user_column5)) {
+													$user_column5 = 'Country';
+												} ?>
+												<select class="form-select" id="column5" name="user_column5">
+													<option value="" <?php if ($user_column5 == "") {
+																			echo " selected =\"selected\"";
+																		} ?>></option>
+													<option value="Band" <?php if ($user_column5 == "Band") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_band'); ?></option>
+													<option value="Frequency" <?php if ($user_column5 == "Frequency") {
+																					echo " selected =\"selected\"";
+																				} ?>><?php echo lang('gen_hamradio_frequency'); ?></option>
+													<option value="Mode" <?php if ($user_column5 == "Mode") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_mode'); ?></option>
+													<option value="RSTS" <?php if ($user_column5 == "RSTS") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_rsts'); ?></option>
+													<option value="RSTR" <?php if ($user_column5 == "RSTR") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_rstr'); ?></option>
+													<option value="Country" <?php if ($user_column5 == "Country") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('general_word_country'); ?></option>
+													<option value="IOTA" <?php if ($user_column5 == "IOTA") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_iota'); ?></option>
+													<option value="SOTA" <?php if ($user_column5 == "SOTA") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_sota'); ?></option>
+													<option value="WWFF" <?php if ($user_column1 == "WWFF") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_wwff'); ?></option>
+													<option value="POTA" <?php if ($user_column1 == "POTA") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_pota'); ?></option>
+													<option value="State" <?php if ($user_column5 == "State") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_state'); ?></option>
+													<option value="Grid" <?php if ($user_column5 == "Grid") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('gen_hamradio_gridsquare'); ?></option>
+													<option value="Distance" <?php if ($user_column5 == "Distance") {
+																					echo " selected =\"selected\"";
+																				} ?>><?php echo lang('gen_hamradio_distance'); ?></option>
+													<option value="Operator" <?php if ($user_column5 == "Operator") {
+																					echo " selected =\"selected\"";
+																				} ?>><?php echo lang('gen_hamradio_operator'); ?></option>
+													<option value="Name" <?php if ($user_column5 == "Name") {
+																				echo " selected =\"selected\"";
+																			} ?>><?php echo lang('general_word_name'); ?></option>
+													<option value="Location" <?php if ($user_column5 == "Location") {
+																					echo " selected =\"selected\"";
+																				} ?>><?php echo lang('cloudlog_station_profile'); ?></option>
+												</select>
+											</div>
+										</div>
 									</div>
 								</div>
-							</div>
-						</div>
-					</div>
 
-					<div class="row mb-3">
-						<!-- Menu Options -->
-						<div class="col-md">
-							<div class="card">
-								<div class="card-header"><?php echo lang('account_main_menu'); ?></div>
-								<div class="card-body">
-									<div class="mb-3">
-										<label for="shownotes"><?php echo lang('account_show_notes_in_the_main_menu'); ?></label>
-										<?php if(!isset($user_show_notes)) { $user_show_notes='0'; }?>
-										<select class="form-select" id="shownotes" name="user_show_notes">
-											<option value="1" <?php if ($user_show_notes == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_yes'); ?></option>
-											<option value="0" <?php if ($user_show_notes == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_no'); ?></option>
-										</select>
-									</div>
-									
-									<hr/>
-									<div class="mb-3">
-										<label for="quicklog"><?php echo lang('account_quicklog_feature'); ?></label>
-										<?php if(!isset($user_quicklog)) { $user_quicklog='0'; }?>
-										<select class="form-select" id="quicklog" name="user_quicklog">
-											<option value="1" <?php if ($user_quicklog == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_yes'); ?></option>
-											<option value="0" <?php if ($user_quicklog == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_no'); ?></option>
-										</select>
-										<small id="SelectDateFormatHelp" class="form-text text-muted"><?php echo lang('account_quicklog_feature_hint'); ?></small>
-									</div>
+								<!-- QSO Logging Options -->
+								<div class="col-md">
+									<div class="card">
+										<div class="card-header"><?php echo lang('account_qso_logging_options'); ?></div>
+										<div class="card-body">
+											<div class="mb-3">
+												<label for="logendtime"><?php echo lang('account_log_end_time'); ?></label>
+												<?php if (!isset($user_qso_end_times)) {
+													$user_qso_end_times = '0';
+												} ?>
+												<select class="form-select" id="logendtimes" name="user_qso_end_times">
+													<option value="1" <?php if ($user_qso_end_times == 1) {
+																			echo " selected =\"selected\"";
+																		} ?>><?php echo lang('general_word_yes'); ?></option>
+													<option value="0" <?php if ($user_qso_end_times == 0) {
+																			echo " selected =\"selected\"";
+																		} ?>><?php echo lang('general_word_no'); ?></option>
+												</select>
+												<small id="SelectDateFormatHelp" class="form-text text-muted"><?php echo lang('account_log_end_time_hint'); ?></small>
+											</div>
 
-									<div class="mb-3">
-										<label for="quicklog_enter"><?php echo lang('account_quicklog_enter'); ?></label>
-										<?php if(!isset($user_quicklog_enter)) { $user_quicklog_enter='0'; }?>
-										<select class="form-select" id="quicklog_enter" name="user_quicklog_enter">
-											<option value="0" <?php if ($user_quicklog_enter == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('account_quicklog_enter_log'); ?></option>
-											<option value="1" <?php if ($user_quicklog_enter == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('account_quicklog_enter_search'); ?></option>
-										</select>
-										<small id="SelectDateFormatHelp" class="form-text text-muted"><?php echo lang('account_quicklog_enter_hint'); ?></small>
+											<hr />
+											<div class="mb-3">
+												<label for="profileimages"><?php echo lang('account_show_profile_picture_of_qso_partner_from_qrzcom_hamqthcom_profile_in_the_log_qso_section'); ?></label>
+												<?php if (!isset($user_show_profile_image)) {
+													$user_show_profile_image = '0';
+												} ?>
+												<select class="form-select" id="profileimages" name="user_show_profile_image">
+													<option value="1" <?php if ($user_show_profile_image == 1) {
+																			echo " selected =\"selected\"";
+																		} ?>><?php echo lang('general_word_yes'); ?></option>
+													<option value="0" <?php if ($user_show_profile_image == 0) {
+																			echo " selected =\"selected\"";
+																		} ?>><?php echo lang('general_word_no'); ?></option>
+												</select>
+												<small class="form-text text-muted"><?php echo lang('account_please_set_your_qrzcom_hamqthcom_credentials_in_the_general_config_file'); ?></small>
+											</div>
+
+											<hr />
+											<div class="mb-3">
+												<label for="qthlookup"><?php echo lang('account_location_auto_lookup'); ?></label>
+												<?php if (!isset($user_qth_lookup)) {
+													$user_qth_lookup = '0';
+												} ?>
+												<select class="form-select" id="qthlookup" name="user_qth_lookup">
+													<option value="1" <?php if ($user_qth_lookup == 1) {
+																			echo " selected =\"selected\"";
+																		} ?>><?php echo lang('general_word_yes'); ?></option>
+													<option value="0" <?php if ($user_qth_lookup == 0) {
+																			echo " selected =\"selected\"";
+																		} ?>><?php echo lang('general_word_no'); ?></option>
+												</select>
+												<small class="form-text text-muted"><?php echo lang('account_if_set_gridsquare_is_fetched_based_on_location_name'); ?></small>
+											</div>
+
+											<div class="mb-3">
+												<label for="sotalookup"><?php echo lang('account_sota_auto_lookup_gridsquare_and_name_for_summit'); ?></label>
+												<?php if (!isset($user_sota_lookup)) {
+													$user_sota_lookup = '0';
+												} ?>
+												<select class="form-select" id="sotalookup" name="user_sota_lookup">
+													<option value="1" <?php if ($user_sota_lookup == 1) {
+																			echo " selected =\"selected\"";
+																		} ?>><?php echo lang('general_word_yes'); ?></option>
+													<option value="0" <?php if ($user_sota_lookup == 0) {
+																			echo " selected =\"selected\"";
+																		} ?>><?php echo lang('general_word_no'); ?></option>
+												</select>
+												<small class="form-text text-muted"><?php echo lang('account_if_set_name_and_gridsquare_is_fetched_from_the_api_and_filled_in_location_and_locator'); ?></small>
+											</div>
+
+											<div class="mb-3">
+												<label for="wwfflookup"><?php echo lang('account_wwff_auto_lookup_gridsquare_and_name_for_reference'); ?></label>
+												<?php if (!isset($user_wwff_lookup)) {
+													$user_wwff_lookup = '0';
+												} ?>
+												<select class="form-select" id="wwfflookup" name="user_wwff_lookup">
+													<option value="1" <?php if ($user_wwff_lookup == 1) {
+																			echo " selected =\"selected\"";
+																		} ?>><?php echo lang('general_word_yes'); ?></option>
+													<option value="0" <?php if ($user_wwff_lookup == 0) {
+																			echo " selected =\"selected\"";
+																		} ?>><?php echo lang('general_word_no'); ?></option>
+												</select>
+												<small class="form-text text-muted"><?php echo lang('account_if_set_name_and_gridsquare_is_fetched_from_the_api_and_filled_in_location_and_locator'); ?></small>
+											</div>
+
+											<div class="mb-3">
+												<label for="potalookup"><?php echo lang('account_pota_auto_lookup_gridsquare_and_name_for_park'); ?></label>
+												<?php if (!isset($user_pota_lookup)) {
+													$user_pota_lookup = '0';
+												} ?>
+												<select class="form-select" id="potalookup" name="user_pota_lookup">
+													<option value="1" <?php if ($user_pota_lookup == 1) {
+																			echo " selected =\"selected\"";
+																		} ?>><?php echo lang('general_word_yes'); ?></option>
+													<option value="0" <?php if ($user_pota_lookup == 0) {
+																			echo " selected =\"selected\"";
+																		} ?>><?php echo lang('general_word_no'); ?></option>
+												</select>
+												<small class="form-text text-muted"><?php echo lang('account_if_set_name_and_gridsquare_is_fetched_from_the_api_and_filled_in_location_and_locator'); ?></small>
+											</div>
+										</div>
 									</div>
 								</div>
 							</div>
-						</div>
 
-						<!-- Map Setting -->
-						<?php if ($this->session->userdata('user_id') == $this->uri->segment(3)) { ?>
-						<div class="col-md">
-							<div class="card">
-								<div class="card-header"><?php echo $this->lang->line('account_map_params'); ?></div>
-								<div class="card-body">
-									<div class="row"> <!-- Station -->
-										<div class="mb-3 col-md-4">
-											<label>&nbsp;</label><br/><label><?php echo $this->lang->line('gen_hamradio_station'); ?></label>
-										</div>
-										<div class="mb-3 col-md-3">
-											<label><?php echo $this->lang->line('general_word_icon'); ?></label><br/>
-											<div class="icon_selectBox" data-boxcontent="station">
-												<input type="hidden" name="user_map_station_icon" value="<?php echo $user_map_station_icon; ?>">
-												<div class="form-select icon_overSelect"><?php echo (($user_map_station_icon=="0")?substr($this->lang->line('general_word_not_display'),0,10).'.':("<i class='".$user_map_station_icon."'></i>")); ?></div>
-											</div>
-											<div class="col-md-3 icon_selectBox_data" data-boxcontent="station"> 
-												<?php foreach($map_icon_select['station'] as $val) {
-													echo "<label data-value='".$val."'>".(($val=="0")?$this->lang->line('general_word_not_display'):("<i class='".$val."'></i>"))."</label>";
+							<div class="row mb-3">
+								<!-- Menu Options -->
+								<div class="col-md">
+									<div class="card">
+										<div class="card-header"><?php echo lang('account_main_menu'); ?></div>
+										<div class="card-body">
+											<div class="mb-3">
+												<label for="shownotes"><?php echo lang('account_show_notes_in_the_main_menu'); ?></label>
+												<?php if (!isset($user_show_notes)) {
+													$user_show_notes = '0';
 												} ?>
+												<select class="form-select" id="shownotes" name="user_show_notes">
+													<option value="1" <?php if ($user_show_notes == 1) {
+																			echo " selected =\"selected\"";
+																		} ?>><?php echo lang('general_word_yes'); ?></option>
+													<option value="0" <?php if ($user_show_notes == 0) {
+																			echo " selected =\"selected\"";
+																		} ?>><?php echo lang('general_word_no'); ?></option>
+												</select>
 											</div>
-										</div>
-										<div class="mb-3 col-md-2">
-											<label><?php echo $this->lang->line('general_word_colors'); ?></label><br/><input type="color" class="form-control user_icon_color" name="user_map_station_color" id="user_map_station_color" value="<?php echo $user_map_station_color; ?>" style="padding:initial;<?php echo ($user_map_station_icon=="0")?'display:none;':''; ?>" data-icon="station" /></div>
-									</div>
-									<div class="row"> <!-- QSO (default) -->
-										<div class="mb-3 col-md-4">
-											<label><?php echo $this->lang->line('account_map_qso_by_default'); ?></label>
-										</div>
-										<div class="mb-3 col-md-3">
-											<div class="icon_selectBox" data-boxcontent="qso">
-												<input type="hidden" name="user_map_qso_icon" value="<?php echo $user_map_qso_icon; ?>">
-												<div class="form-select icon_overSelect"><?php echo "<i class='".$user_map_qso_icon."'></i>"; ?></div>
-											</div>
-											<div class="col-md-3 icon_selectBox_data" data-boxcontent="qso"> 
-												<?php foreach($map_icon_select['qso'] as $val) {
-													echo "<label data-value='".$val."'><i class='".$val."'></i></label>";
+
+											<hr />
+											<div class="mb-3">
+												<label for="quicklog"><?php echo lang('account_quicklog_feature'); ?></label>
+												<?php if (!isset($user_quicklog)) {
+													$user_quicklog = '0';
 												} ?>
+												<select class="form-select" id="quicklog" name="user_quicklog">
+													<option value="1" <?php if ($user_quicklog == 1) {
+																			echo " selected =\"selected\"";
+																		} ?>><?php echo lang('general_word_yes'); ?></option>
+													<option value="0" <?php if ($user_quicklog == 0) {
+																			echo " selected =\"selected\"";
+																		} ?>><?php echo lang('general_word_no'); ?></option>
+												</select>
+												<small id="SelectDateFormatHelp" class="form-text text-muted"><?php echo lang('account_quicklog_feature_hint'); ?></small>
 											</div>
-										</div>
-										<div class="mb-3 col-md-2">
-											<input type="color" class="form-control user_icon_color" name="user_map_qso_color" id="user_map_qso_color" value="<?php echo $user_map_qso_color; ?>" style="padding:initial;" data-icon="qso" />
-										</div>
-									</div>
-									<div class="row"> <!-- QSO (confirmed) -->
-										<div class="mb-3 col-md-4">
-											<label><?php echo $this->lang->line('account_map_qso_confirm'); ?></label>
-											<small class="form-text text-muted"><?php echo lang('account_map_qso_confirm_same_qso'); ?></small>
-										</div>
-										<div class="mb-3 col-md-3">
-											<div class="icon_selectBox" data-boxcontent="qsoconfirm">
-												<input type="hidden" name="user_map_qsoconfirm_icon" value="<?php echo $user_map_qsoconfirm_icon; ?>">
-												<div class="form-select icon_overSelect"><?php echo (($user_map_qsoconfirm_icon=="0")?$this->lang->line('general_word_no'):("<i class='".$user_map_qsoconfirm_icon."'></i>")); ?></div>
-											</div>
-											<div class="col-md-3 icon_selectBox_data" data-boxcontent="qsoconfirm"> 
-												<?php foreach($map_icon_select['qsoconfirm'] as $val) {
-													echo "<label data-value='".$val."'>".(($val=="0")?$this->lang->line('general_word_no'):("<i class='".$val."'></i>"))."</label>";
+
+											<div class="mb-3">
+												<label for="quicklog_enter"><?php echo lang('account_quicklog_enter'); ?></label>
+												<?php if (!isset($user_quicklog_enter)) {
+													$user_quicklog_enter = '0';
 												} ?>
+												<select class="form-select" id="quicklog_enter" name="user_quicklog_enter">
+													<option value="0" <?php if ($user_quicklog_enter == 0) {
+																			echo " selected =\"selected\"";
+																		} ?>><?php echo lang('account_quicklog_enter_log'); ?></option>
+													<option value="1" <?php if ($user_quicklog_enter == 1) {
+																			echo " selected =\"selected\"";
+																		} ?>><?php echo lang('account_quicklog_enter_search'); ?></option>
+												</select>
+												<small id="SelectDateFormatHelp" class="form-text text-muted"><?php echo lang('account_quicklog_enter_hint'); ?></small>
 											</div>
 										</div>
-										<div class="md-3 col-md-2">
-											<input type="color" class="form-control user_icon_color" name="user_map_qsoconfirm_color" id="user_map_qsoconfirm_color" value="<?php echo $user_map_qsoconfirm_color; ?>" style="padding:initial;<?php echo ($user_map_qsoconfirm_icon=="0")?'display:none;':''; ?>" data-icon="qsoconfirm" />
-										</div>
 									</div>
-									<div class="row">
-										<div class="md-3 col-md-4">
-											<label><?php echo $this->lang->line('gen_hamradio_gridsquare_show'); ?></label>
-										</div>
-										<div class="md-3 col-md-3">
-											<select class="form-select" id="user_map_gridsquare_show" name="user_map_gridsquare_show">
-												<option value="1" <?php if ($user_map_gridsquare_show == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_yes'); ?></option>
-												<option value="0" <?php if ($user_map_gridsquare_show == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_no'); ?></option>
-											</select>
+								</div>
+
+								<!-- Map Setting -->
+								<?php if ($this->session->userdata('user_id') == $this->uri->segment(3)) { ?>
+									<div class="col-md">
+										<div class="card">
+											<div class="card-header"><?php echo $this->lang->line('account_map_params'); ?></div>
+											<div class="card-body">
+												<div class="row"> <!-- Station -->
+													<div class="mb-3 col-md-4">
+														<label>&nbsp;</label><br /><label><?php echo $this->lang->line('gen_hamradio_station'); ?></label>
+													</div>
+													<div class="mb-3 col-md-3">
+														<label><?php echo $this->lang->line('general_word_icon'); ?></label><br />
+														<div class="icon_selectBox" data-boxcontent="station">
+															<input type="hidden" name="user_map_station_icon" value="<?php echo $user_map_station_icon; ?>">
+															<div class="form-select icon_overSelect"><?php echo (($user_map_station_icon == "0") ? substr($this->lang->line('general_word_not_display'), 0, 10) . '.' : ("<i class='" . $user_map_station_icon . "'></i>")); ?></div>
+														</div>
+														<div class="col-md-3 icon_selectBox_data" data-boxcontent="station">
+															<?php foreach ($map_icon_select['station'] as $val) {
+																echo "<label data-value='" . $val . "'>" . (($val == "0") ? $this->lang->line('general_word_not_display') : ("<i class='" . $val . "'></i>")) . "</label>";
+															} ?>
+														</div>
+													</div>
+													<div class="mb-3 col-md-2">
+														<label><?php echo $this->lang->line('general_word_colors'); ?></label><br /><input type="color" class="form-control user_icon_color" name="user_map_station_color" id="user_map_station_color" value="<?php echo $user_map_station_color; ?>" style="padding:initial;<?php echo ($user_map_station_icon == "0") ? 'display:none;' : ''; ?>" data-icon="station" />
+													</div>
+												</div>
+												<div class="row"> <!-- QSO (default) -->
+													<div class="mb-3 col-md-4">
+														<label><?php echo $this->lang->line('account_map_qso_by_default'); ?></label>
+													</div>
+													<div class="mb-3 col-md-3">
+														<div class="icon_selectBox" data-boxcontent="qso">
+															<input type="hidden" name="user_map_qso_icon" value="<?php echo $user_map_qso_icon; ?>">
+															<div class="form-select icon_overSelect"><?php echo "<i class='" . $user_map_qso_icon . "'></i>"; ?></div>
+														</div>
+														<div class="col-md-3 icon_selectBox_data" data-boxcontent="qso">
+															<?php foreach ($map_icon_select['qso'] as $val) {
+																echo "<label data-value='" . $val . "'><i class='" . $val . "'></i></label>";
+															} ?>
+														</div>
+													</div>
+													<div class="mb-3 col-md-2">
+														<input type="color" class="form-control user_icon_color" name="user_map_qso_color" id="user_map_qso_color" value="<?php echo $user_map_qso_color; ?>" style="padding:initial;" data-icon="qso" />
+													</div>
+												</div>
+												<div class="row"> <!-- QSO (confirmed) -->
+													<div class="mb-3 col-md-4">
+														<label><?php echo $this->lang->line('account_map_qso_confirm'); ?></label>
+														<small class="form-text text-muted"><?php echo lang('account_map_qso_confirm_same_qso'); ?></small>
+													</div>
+													<div class="mb-3 col-md-3">
+														<div class="icon_selectBox" data-boxcontent="qsoconfirm">
+															<input type="hidden" name="user_map_qsoconfirm_icon" value="<?php echo $user_map_qsoconfirm_icon; ?>">
+															<div class="form-select icon_overSelect"><?php echo (($user_map_qsoconfirm_icon == "0") ? $this->lang->line('general_word_no') : ("<i class='" . $user_map_qsoconfirm_icon . "'></i>")); ?></div>
+														</div>
+														<div class="col-md-3 icon_selectBox_data" data-boxcontent="qsoconfirm">
+															<?php foreach ($map_icon_select['qsoconfirm'] as $val) {
+																echo "<label data-value='" . $val . "'>" . (($val == "0") ? $this->lang->line('general_word_no') : ("<i class='" . $val . "'></i>")) . "</label>";
+															} ?>
+														</div>
+													</div>
+													<div class="md-3 col-md-2">
+														<input type="color" class="form-control user_icon_color" name="user_map_qsoconfirm_color" id="user_map_qsoconfirm_color" value="<?php echo $user_map_qsoconfirm_color; ?>" style="padding:initial;<?php echo ($user_map_qsoconfirm_icon == "0") ? 'display:none;' : ''; ?>" data-icon="qsoconfirm" />
+													</div>
+												</div>
+												<div class="row">
+													<div class="md-3 col-md-4">
+														<label><?php echo $this->lang->line('gen_hamradio_gridsquare_show'); ?></label>
+													</div>
+													<div class="md-3 col-md-3">
+														<select class="form-select" id="user_map_gridsquare_show" name="user_map_gridsquare_show">
+															<option value="1" <?php if ($user_map_gridsquare_show == 1) {
+																					echo " selected =\"selected\"";
+																				} ?>><?php echo lang('general_word_yes'); ?></option>
+															<option value="0" <?php if ($user_map_gridsquare_show == 0) {
+																					echo " selected =\"selected\"";
+																				} ?>><?php echo lang('general_word_no'); ?></option>
+														</select>
+													</div>
+												</div>
+											</div>
 										</div>
 									</div>
-								</div>
+								<?php } ?>
 							</div>
-						</div>
-						<?php } ?>
-					</div>
 
-					<div class="row">
-						<!-- Previous QSL -->
-						<div class="col-md">
-							<div class="card">
-								<div class="card-header"><?php echo lang('account_previous_qsl_type'); ?></div>
-								<div class="card-body">
-									<div class="mb-3">
-										<label for="profileimages"><?php echo lang('account_select_the_type_of_qsl_to_show_in_the_previous_qsos_section'); ?></label>
-										<?php if(!isset($user_previous_qsl_type)) { $user_previous_qsl_type='0'; }?>
-										<select class="form-select" id="previousqsltype" name="user_previous_qsl_type">
-											<option value="0" <?php if ($user_previous_qsl_type == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_qsl'); ?></option>
-											<option value="1" <?php if ($user_previous_qsl_type == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('lotw_short'); ?></option>
-											<option value="2" <?php if ($user_previous_qsl_type == 2) { echo " selected =\"selected\""; } ?>><?php echo lang('eqsl_short'); ?></option>
-											<option value="4" <?php if ($user_previous_qsl_type == 4) { echo " selected =\"selected\""; } ?>>QRZ</option>
-										</select>
-									</div>
+							<div class="row">
+								<!-- Previous QSL -->
+								<div class="col-md">
+									<div class="card">
+										<div class="card-header"><?php echo lang('account_previous_qsl_type'); ?></div>
+										<div class="card-body">
+											<div class="mb-3">
+												<label for="profileimages"><?php echo lang('account_select_the_type_of_qsl_to_show_in_the_previous_qsos_section'); ?></label>
+												<?php if (!isset($user_previous_qsl_type)) {
+													$user_previous_qsl_type = '0';
+												} ?>
+												<select class="form-select" id="previousqsltype" name="user_previous_qsl_type">
+													<option value="0" <?php if ($user_previous_qsl_type == 0) {
+																			echo " selected =\"selected\"";
+																		} ?>><?php echo lang('gen_hamradio_qsl'); ?></option>
+													<option value="1" <?php if ($user_previous_qsl_type == 1) {
+																			echo " selected =\"selected\"";
+																		} ?>><?php echo lang('lotw_short'); ?></option>
+													<option value="2" <?php if ($user_previous_qsl_type == 2) {
+																			echo " selected =\"selected\"";
+																		} ?>><?php echo lang('eqsl_short'); ?></option>
+													<option value="4" <?php if ($user_previous_qsl_type == 4) {
+																			echo " selected =\"selected\"";
+																		} ?>>QRZ</option>
+												</select>
+											</div>
 
+										</div>
+									</div>
 								</div>
 							</div>
 						</div>
 					</div>
 				</div>
-			</div>
-		</div>
-		<!-- ZONE 3 / Default Value -->
-		<div class="accordion-item">
-			<h2 class="accordion-header" id="panelsStayOpen-H_default_value">
-				<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-B_default_value" aria-expanded="false" aria-controls="panelsStayOpen-B_default_value">
-					<?php echo lang('account_default_values');?></button>
-			</h2>
-			<div id="panelsStayOpen-B_default_value" class="accordion-collapse collapse" aria-labelledby="panelsStayOpen-H_default_value">
-				<div class="accordion-body">
-					<div class="row">
-						<!-- Default -->
-						<div class="col-md">
-							<div class="card">
-								<!--<div class="card-header"><?php echo lang('account_default_band_settings'); ?></div>-->
-								<div class="card-body">
-									<div class="mb-3">
-										<label for="user_default_band"><?php echo lang('account_gridmap_default_band'); ?></label>
-										<?php if(!isset($user_default_band)) { $user_default_band='All'; }?>
-										<select id="user_default_band" class="form-select" name="user_default_band">
-											<option value="All">All</option>;
-											<?php foreach($bands as $band) {
-												echo '<option value="'.$band.'" '.(($user_default_band == $band)?' selected="selected"':'').'>'.$band.'</option>'."\n";
-											} ?>
-										</select>
-									</div>
-									<div class="mb-3">
-										<label class="my-1 me-2"><?php echo lang('account_qsl_settings'); ?></label>
-										<div class="form-check-inline">
-											<?php echo '<input class="form-check-input" type="checkbox" name="user_default_confirmation_qsl" id="user_default_confirmation_qsl"';
-											if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) {
-												echo ' checked';
-											}
-											echo '>'; ?>
-											<label class="form-check-label" for="user_default_confirmation_qsl"><?php echo lang('gen_hamradio_qsl'); ?></label>
-										</div>
-										<div class="form-check-inline">
-											<?php echo '<input class="form-check-input" type="checkbox" name="user_default_confirmation_lotw" id="user_default_confirmation_lotw"';
-											if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) {
-												echo ' checked';
-											}
-											echo '>'; ?>
-											<label class="form-check-label" for="user_default_confirmation_lotw"><?php echo lang('lotw_short'); ?></label>
-										</div>
-										<div class="form-check-inline">
-											<?php echo '<input class="form-check-input" type="checkbox" name="user_default_confirmation_eqsl" id="user_default_confirmation_eqsl"';
-											if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'E') !== false) {
-												echo ' checked';
-											}
-											echo '>'; ?>
-											<label class="form-check-label" for="user_default_confirmation_eqsl"><?php echo lang('account_eqsl'); ?></label>
-										</div>
-										<div class="form-check-inline">
-											<?php echo '<input class="form-check-input" type="checkbox" name="user_default_confirmation_qrz" id="user_default_confirmation_qrz"';
-											if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Z') !== false) {
-												echo ' checked';
-											} 
-											echo '>'; ?>
-											<label class="form-check-label" for="user_default_confirmation_qrz">QRZ.com</label>
+				<!-- ZONE 3 / Default Value -->
+				<div class="accordion-item">
+					<h2 class="accordion-header" id="panelsStayOpen-H_default_value">
+						<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-B_default_value" aria-expanded="false" aria-controls="panelsStayOpen-B_default_value">
+							<?php echo lang('account_default_values'); ?></button>
+					</h2>
+					<div id="panelsStayOpen-B_default_value" class="accordion-collapse collapse" aria-labelledby="panelsStayOpen-H_default_value">
+						<div class="accordion-body">
+							<div class="row">
+								<!-- Default -->
+								<div class="col-md">
+									<div class="card">
+										<!--<div class="card-header"><?php echo lang('account_default_band_settings'); ?></div>-->
+										<div class="card-body">
+											<div class="mb-3">
+												<label for="user_default_band"><?php echo lang('account_gridmap_default_band'); ?></label>
+												<?php if (!isset($user_default_band)) {
+													$user_default_band = 'All';
+												} ?>
+												<select id="user_default_band" class="form-select" name="user_default_band">
+													<option value="All">All</option>;
+													<?php foreach ($bands as $band) {
+														echo '<option value="' . $band . '" ' . (($user_default_band == $band) ? ' selected="selected"' : '') . '>' . $band . '</option>' . "\n";
+													} ?>
+												</select>
+											</div>
+											<div class="mb-3">
+												<label class="my-1 me-2"><?php echo lang('account_qsl_settings'); ?></label>
+												<div class="form-check-inline">
+													<?php echo '<input class="form-check-input" type="checkbox" name="user_default_confirmation_qsl" id="user_default_confirmation_qsl"';
+													if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) {
+														echo ' checked';
+													}
+													echo '>'; ?>
+													<label class="form-check-label" for="user_default_confirmation_qsl"><?php echo lang('gen_hamradio_qsl'); ?></label>
+												</div>
+												<div class="form-check-inline">
+													<?php echo '<input class="form-check-input" type="checkbox" name="user_default_confirmation_lotw" id="user_default_confirmation_lotw"';
+													if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) {
+														echo ' checked';
+													}
+													echo '>'; ?>
+													<label class="form-check-label" for="user_default_confirmation_lotw"><?php echo lang('lotw_short'); ?></label>
+												</div>
+												<div class="form-check-inline">
+													<?php echo '<input class="form-check-input" type="checkbox" name="user_default_confirmation_eqsl" id="user_default_confirmation_eqsl"';
+													if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'E') !== false) {
+														echo ' checked';
+													}
+													echo '>'; ?>
+													<label class="form-check-label" for="user_default_confirmation_eqsl"><?php echo lang('account_eqsl'); ?></label>
+												</div>
+												<div class="form-check-inline">
+													<?php echo '<input class="form-check-input" type="checkbox" name="user_default_confirmation_qrz" id="user_default_confirmation_qrz"';
+													if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Z') !== false) {
+														echo ' checked';
+													}
+													echo '>'; ?>
+													<label class="form-check-label" for="user_default_confirmation_qrz">QRZ.com</label>
+												</div>
+											</div>
 										</div>
 									</div>
 								</div>
@@ -616,159 +946,223 @@
 						</div>
 					</div>
 				</div>
-			</div>
-		</div>
-		<!-- ZONE 4 / Confirmation Account -->
-		<div class="accordion-item">
-			<h2 class="accordion-header" id="panelsStayOpen-H_confirmation_account">
-				<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-B_confirmation_account" aria-expanded="false" aria-controls="panelsStayOpen-B_confirmation_account">
-				<?php echo lang('account_third_party_services'); ?></button>
-			</h2>
-			<div id="panelsStayOpen-B_confirmation_account" class="accordion-collapse collapse" aria-labelledby="panelsStayOpen-H_confirmation_account">
-				<div class="accordion-body">
-					<div class="row">
-						<!-- Logbook of the World -->
-						<div class="col-md">
-							<div class="card">
-								<div class="card-header"><?php echo lang('account_logbook_of_the_world'); ?></div>
-								<div class="card-body">
-									<div class="mb-3">
-										<label><?php echo lang('account_logbook_of_the_world_lotw_username'); ?></label>
-										<input class="form-control" type="text" name="user_lotw_name" value="<?php if(isset($user_lotw_name)) { echo $user_lotw_name; } ?>" />
-										<?php if(isset($userlotwname_error)) { echo "<small class=\"error\">".$userlotwname_error."</small>"; } ?>
-									</div>
+				<!-- ZONE 4 / Confirmation Account -->
+				<div class="accordion-item">
+					<h2 class="accordion-header" id="panelsStayOpen-H_confirmation_account">
+						<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-B_confirmation_account" aria-expanded="false" aria-controls="panelsStayOpen-B_confirmation_account">
+							<?php echo lang('account_third_party_services'); ?></button>
+					</h2>
+					<div id="panelsStayOpen-B_confirmation_account" class="accordion-collapse collapse" aria-labelledby="panelsStayOpen-H_confirmation_account">
+						<div class="accordion-body">
+							<div class="row">
+								<!-- Logbook of the World -->
+								<div class="col-md">
+									<div class="card">
+										<div class="card-header"><?php echo lang('account_logbook_of_the_world'); ?></div>
+										<div class="card-body">
+											<div class="mb-3">
+												<label><?php echo lang('account_logbook_of_the_world_lotw_username'); ?></label>
+												<input class="form-control" type="text" name="user_lotw_name" value="<?php if (isset($user_lotw_name)) {
+																															echo $user_lotw_name;
+																														} ?>" />
+												<?php if (isset($userlotwname_error)) {
+													echo "<small class=\"error\">" . $userlotwname_error . "</small>";
+												} ?>
+											</div>
 
-									<div class="mb-3">
-										<label><?php echo lang('account_logbook_of_the_world_lotw_password'); ?></label>
-										<div class="input-group">
-											<input class="form-control" type="password" name="user_lotw_password" />
-											<span class="input-group-btn"><button class="btn btn-default btn-pwd-showhide" type="button"><i class="fa fa-eye-slash"></i></button></span>
+											<div class="mb-3">
+												<label><?php echo lang('account_logbook_of_the_world_lotw_password'); ?></label>
+												<div class="input-group">
+													<input class="form-control" type="password" name="user_lotw_password" />
+													<span class="input-group-btn"><button class="btn btn-default btn-pwd-showhide" type="button"><i class="fa fa-eye-slash"></i></button></span>
+												</div>
+												<?php if (isset($lotwpassword_error)) {
+													echo "<small class=\"error\">" . $lotwpassword_error . "</small>";
+												} else { ?>
+													<small class="form-text text-muted"><?php echo lang('account_leave_blank_to_keep_existing_password'); ?></small>
+												<?php } ?>
+											</div>
 										</div>
-										<?php if(isset($lotwpassword_error)) { echo "<small class=\"error\">".$lotwpassword_error."</small>"; } else { ?>
-										<small class="form-text text-muted"><?php echo lang('account_leave_blank_to_keep_existing_password'); ?></small>
-										<?php } ?>
 									</div>
 								</div>
-							</div>
-						</div>
 
-						<!-- eQSL -->
-						<div class="col-md">
-							<div class="card">
-								<div class="card-header"><?php echo lang('account_eqsl'); ?></div>
-								<div class="card-body">
-									<div class="mb-3">
-										<label><?php echo lang('account_eqslcc_username'); ?></label>
-										<input class="form-control" type="text" name="user_eqsl_name" value="<?php if(isset($user_eqsl_name)) { echo $user_eqsl_name; } ?>" />
-											<?php if(isset($eqslusername_error)) { echo "<small class=\"error\">".$eqslusername_error."</small>"; } ?>
-									</div>
+								<!-- eQSL -->
+								<div class="col-md">
+									<div class="card">
+										<div class="card-header"><?php echo lang('account_eqsl'); ?></div>
+										<div class="card-body">
+											<div class="mb-3">
+												<label><?php echo lang('account_eqslcc_username'); ?></label>
+												<input class="form-control" type="text" name="user_eqsl_name" value="<?php if (isset($user_eqsl_name)) {
+																															echo $user_eqsl_name;
+																														} ?>" />
+												<?php if (isset($eqslusername_error)) {
+													echo "<small class=\"error\">" . $eqslusername_error . "</small>";
+												} ?>
+											</div>
 
-									<div class="mb-3">
-										<label><?php echo lang('account_eqslcc_password'); ?></label>
-										<div class="input-group">
-											<input class="form-control" type="password" name="user_eqsl_password" />
-											<span class="input-group-btn"><button class="btn btn-default btn-pwd-showhide" type="button"><i class="fa fa-eye-slash"></i></button></span>
+											<div class="mb-3">
+												<label><?php echo lang('account_eqslcc_password'); ?></label>
+												<div class="input-group">
+													<input class="form-control" type="password" name="user_eqsl_password" />
+													<span class="input-group-btn"><button class="btn btn-default btn-pwd-showhide" type="button"><i class="fa fa-eye-slash"></i></button></span>
+												</div>
+												<?php if (isset($eqslpassword_error)) {
+													echo "<small class=\"error\">" . $eqslpassword_error . "</small>";
+												} else { ?>
+													<small class="form-text text-muted"><?php echo lang('account_leave_blank_to_keep_existing_password'); ?></small>
+												<?php } ?>
+											</div>
 										</div>
-										<?php if(isset($eqslpassword_error)) { echo "<small class=\"error\">".$eqslpassword_error."</small>"; } else { ?>
-										<small class="form-text text-muted"><?php echo lang('account_leave_blank_to_keep_existing_password'); ?></small>
-										<?php } ?>
 									</div>
 								</div>
-							</div>
-						</div>
 
-						<!-- Club Log -->
-						<div class="col-md">
-							<div class="card">
-								<div class="card-header"><?php echo lang('account_clublog'); ?></div>
-								<div class="card-body">
-									<div class="mb-3">
-										<label><?php echo lang('account_clublog_email_callsign'); ?></label>
-										<input class="form-control" type="text" name="user_clublog_name" value="<?php if(isset($user_clublog_name)) { echo $user_clublog_name; } ?>" />
-										<small class="form-text text-muted"><?php echo lang('account_the_email_or_callsign_you_use_to_login_to_club_log'); ?></small>
-										<?php if(isset($userclublogname_error)) { echo "<small class=\"error\">".$userclublogname_error."</small>"; } ?>
-									</div>
+								<!-- Club Log -->
+								<div class="col-md">
+									<div class="card">
+										<div class="card-header"><?php echo lang('account_clublog'); ?></div>
+										<div class="card-body">
+											<div class="mb-3">
+												<label><?php echo lang('account_clublog_email_callsign'); ?></label>
+												<input class="form-control" type="text" name="user_clublog_name" value="<?php if (isset($user_clublog_name)) {
+																															echo $user_clublog_name;
+																														} ?>" />
+												<small class="form-text text-muted"><?php echo lang('account_the_email_or_callsign_you_use_to_login_to_club_log'); ?></small>
+												<?php if (isset($userclublogname_error)) {
+													echo "<small class=\"error\">" . $userclublogname_error . "</small>";
+												} ?>
+											</div>
 
-									<div class="mb-3">
-										<label><?php echo lang('account_clublog_password'); ?></label>
-										<div class="input-group">
-											<input class="form-control" type="password" name="user_clublog_password" />
-											<span class="input-group-btn"><button class="btn btn-default btn-pwd-showhide" type="button"><i class="fa fa-eye-slash"></i></button></span>
+											<div class="mb-3">
+												<label><?php echo lang('account_clublog_password'); ?></label>
+												<div class="input-group">
+													<input class="form-control" type="password" name="user_clublog_password" />
+													<span class="input-group-btn"><button class="btn btn-default btn-pwd-showhide" type="button"><i class="fa fa-eye-slash"></i></button></span>
+												</div>
+												<?php if (isset($clublogpassword_error)) {
+													echo "<small class=\"error\">" . $clublogpassword_error . "</small>";
+												} else { ?>
+													<small class="form-text text-muted"><?php echo lang('account_leave_blank_to_keep_existing_password'); ?></small>
+												<?php } ?>
+											</div>
 										</div>
-										<?php if(isset($clublogpassword_error)) { echo "<small class=\"error\">".$clublogpassword_error."</small>"; } else { ?>
-										<small class="form-text text-muted"><?php echo lang('account_leave_blank_to_keep_existing_password'); ?></small>
-										<?php } ?>
 									</div>
 								</div>
 							</div>
 						</div>
 					</div>
 				</div>
-			</div>
-		</div>
-		<!-- ZONE 5 / Miscellaneous -->
-		<div class="accordion-item">
-			<h2 class="accordion-header" id="panelsStayOpen-H_miscellaneous">
-				<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-B_miscellaneous" aria-expanded="false" aria-controls="panelsStayOpen-B_miscellaneous">
-				<?php echo lang('account_miscellaneous');?></button>
-			</h2>
-			<div id="panelsStayOpen-B_miscellaneous" class="accordion-collapse collapse" aria-labelledby="panelsStayOpen-H_miscellaneous">
-				<div class="accordion-body">
-					<div class="row">
-						<!-- AMSAT Upload -->
-						<div class="col-md">
-							<div class="card">
-								<div class="card-header"><?php echo lang('account_amsat_status_upload'); ?></div>
-								<div class="card-body">
-									<div class="mb-3">
-										<label for="amsatsatatusupload"><?php echo lang('account_upload_status_of_sat_qsos_to'); ?> <a href="https://www.amsat.org/status/" target="_blank">https://www.amsat.org/status/</a>.</label>
-										<?php if(!isset($user_amsat_status_upload)) { $user_amsat_status_upload='0'; }?>
-										<select class="form-select" id="amsatstatusupload" name="user_amsat_status_upload">
-											<option value="1" <?php if ($user_amsat_status_upload == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_yes'); ?></option>
-											<option value="0" <?php if ($user_amsat_status_upload == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_no'); ?></option>
-										</select>
+				<!-- ZONE 5 / Miscellaneous -->
+				<div class="accordion-item">
+					<h2 class="accordion-header" id="panelsStayOpen-H_miscellaneous">
+						<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-B_miscellaneous" aria-expanded="false" aria-controls="panelsStayOpen-B_miscellaneous">
+							<?php echo lang('account_miscellaneous'); ?></button>
+					</h2>
+					<div id="panelsStayOpen-B_miscellaneous" class="accordion-collapse collapse" aria-labelledby="panelsStayOpen-H_miscellaneous">
+						<div class="accordion-body">
+							<div class="row">
+								<!-- AMSAT Upload -->
+								<div class="col-md">
+									<div class="card">
+										<div class="card-header"><?php echo lang('account_amsat_status_upload'); ?></div>
+										<div class="card-body">
+											<div class="mb-3">
+												<label for="amsatsatatusupload"><?php echo lang('account_upload_status_of_sat_qsos_to'); ?> <a href="https://www.amsat.org/status/" target="_blank">https://www.amsat.org/status/</a>.</label>
+												<?php if (!isset($user_amsat_status_upload)) {
+													$user_amsat_status_upload = '0';
+												} ?>
+												<select class="form-select" id="amsatstatusupload" name="user_amsat_status_upload">
+													<option value="1" <?php if ($user_amsat_status_upload == 1) {
+																			echo " selected =\"selected\"";
+																		} ?>><?php echo lang('general_word_yes'); ?></option>
+													<option value="0" <?php if ($user_amsat_status_upload == 0) {
+																			echo " selected =\"selected\"";
+																		} ?>><?php echo lang('general_word_no'); ?></option>
+												</select>
+											</div>
+										</div>
+									</div>
+								</div>
+
+								<!-- Mastodon -->
+								<div class="col-md">
+									<div class="card">
+										<div class="card-header"><?php echo lang('account_mastodon'); ?></div>
+										<div class="card-body">
+											<div class="mb-3">
+												<label><?php echo lang('account_user_mastodon'); ?></label>
+												<input class="form-control" type="text" name="user_mastodon_url" value="<?php if (isset($user_mastodon_url)) {
+																															echo $user_mastodon_url;
+																														} ?>" />
+												<small class="form-text text-muted"><?php echo lang('account_user_mastodon_hint'); ?></a></small>
+											</div>
+										</div>
 									</div>
 								</div>
-							</div>
-						</div>
 
-						<!-- Mastodon -->
-						<div class="col-md">
-							<div class="card">
-								<div class="card-header"><?php echo lang('account_mastodon'); ?></div>
-								<div class="card-body">
-									<div class="mb-3">
-									<label><?php echo lang('account_user_mastodon'); ?></label>
-										<input class="form-control" type="text" name="user_mastodon_url" value="<?php if(isset($user_mastodon_url)) { echo $user_mastodon_url; } ?>" />
-										<small class="form-text text-muted"><?php echo lang('account_user_mastodon_hint'); ?></a></small>
+								<!-- Winkeyer -->
+								<div class="col-md">
+									<div class="card">
+										<div class="card-header"><?php echo lang('account_winkeyer'); ?> <span class="badge text-bg-danger float-end"><?php echo lang('admin_experimental'); ?></span></div>
+										<div class="card-body">
+											<div class="mb-3">
+												<label><?php echo lang('account_winkeyer_enabled'); ?></label>
+												<?php if (!isset($user_winkey)) {
+													$user_winkey = '0';
+												} ?>
+												<select class="form-select" name="user_winkey" id="user_winkeyer">
+													<option value="0" <?php if ($user_winkey == 0) {
+																			echo 'selected="selected"';
+																		} ?>><?php echo lang('general_word_no'); ?></option>
+													<option value="1" <?php if ($user_winkey == 1) {
+																			echo 'selected="selected"';
+																		} ?>><?php echo lang('general_word_yes'); ?></option>
+												</select>
+												<small class="form-text text-muted"><?php echo lang('account_winkeyer_hint'); ?></small>
+											</div>
+										</div>
 									</div>
 								</div>
 							</div>
-						</div>
 
-						<!-- Winkeyer -->
-						<div class="col-md">
-							<div class="card">
-								<div class="card-header"><?php echo lang('account_winkeyer'); ?> <span class="badge text-bg-danger float-end"><?php echo lang('admin_experimental'); ?></span></div>
-								<div class="card-body">
-									<div class="mb-3">
-										<label><?php echo lang('account_winkeyer_enabled'); ?></label>
-										<?php if(!isset($user_winkey)) { $user_winkey='0'; }?>
-										<select class="form-select" name="user_winkey" id="user_winkeyer">
-											<option value="0" <?php if ($user_winkey == 0) { echo 'selected="selected"'; } ?>><?php echo lang('general_word_no'); ?></option>
-											<option value="1" <?php if ($user_winkey == 1) { echo 'selected="selected"'; } ?>><?php echo lang('general_word_yes'); ?></option>
-										</select>
-										<small class="form-text text-muted"><?php echo lang('account_winkeyer_hint'); ?></small>
+							<div class="row">
+								<!-- Hams.at Settings -->
+								<div class="col-md">
+									<div class="card">
+										<div class="card-header"><?php echo lang('account_hamsat'); ?></div>
+										<div class="card-body">
+											<div class="mb-3">
+												<label><?php echo lang('account_hamsat_private_feed_key'); ?></label>
+												<input class="form-control" type="text" name="user_hamsat_key" value="<?php if (isset($user_hamsat_key)) {
+																															echo $user_hamsat_key;
+																														} ?>" />
+												<small class="form-text text-muted"><?php echo lang('account_hamsat_hint'); ?></a></small>
+											</div>
+											<div class="mb-3">
+												<label><?php echo lang('account_hamsat_workable_only'); ?></label>
+												<?php if (!isset($user_hamsat_workable_only)) {
+													$user_hamsat_workable_only = '0';
+												} ?>
+												<select class="form-select" name="user_hamsat_workable_only" id="user_hamsat_workable_only">
+													<option value="0" <?php if ($user_hamsat_workable_only == 0) {
+																			echo 'selected="selected"';
+																		} ?>><?php echo lang('general_word_no'); ?></option>
+													<option value="1" <?php if ($user_hamsat_workable_only == 1) {
+																			echo 'selected="selected"';
+																		} ?>><?php echo lang('general_word_yes'); ?></option>
+												</select>
+												<small class="form-text text-muted"><?php echo lang('account_hamsat_workable_only_hint'); ?></small>
+											</div>
+										</div>
 									</div>
 								</div>
+
 							</div>
 						</div>
 					</div>
 				</div>
 			</div>
-		</div>
-	</div>
-	<input type="hidden" name="id" value="<?php echo $this->uri->segment(3); ?>" />
-	<button type="submit" class="btn btn-primary mb-5 mt-3"><i class="fas fa-save"></i> <?php echo lang('account_save_account_changes'); ?></button>
-</form>
-</div>
+			<input type="hidden" name="id" value="<?php echo $this->uri->segment(3); ?>" />
+			<button type="submit" class="btn btn-primary mb-5 mt-3"><i class="fas fa-save"></i> <?php echo lang('account_save_account_changes'); ?></button>
+	</form>
+</div>
\ No newline at end of file
diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php
index 4942712be..9041a4cd1 100644
--- a/application/views/view_log/partial/log_ajax.php
+++ b/application/views/view_log/partial/log_ajax.php
@@ -247,11 +247,11 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
             <?php if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
                 <td>
                     <div class="dropdown">
-                        <a class="btn btn-secondary dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        <a class="btn btn-secondary dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-bs-toggle="dropdown" aria-haspopup="false" aria-expanded="false">
                             <i class="fas fa-cog"></i>
                         </a>
 
-                        <div class="dropdown-menu menuOnResultTab" data-bs-toggle="popover" data-bs-placement="auto" data-qsoid="qso_<?php echo $row->COL_PRIMARY_KEY; ?>">
+                        <div class="dropdown-menu" data-bs-toggle="popover" data-bs-placement="auto" data-qsoid="qso_<?php echo $row->COL_PRIMARY_KEY; ?>">
                             <a class="dropdown-item" id="edit_qso" href="javascript:qso_edit(<?php echo $row->COL_PRIMARY_KEY; ?>)"><i class="fas fa-edit"></i> <?php echo lang('general_edit_qso'); ?></a>
 
                             <?php if($row->COL_QSL_SENT !='Y') { ?>
@@ -320,4 +320,4 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
     <?php } ?>
 
 </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php
index 0e0acdfea..11f4964e9 100644
--- a/application/views/view_log/qso.php
+++ b/application/views/view_log/qso.php
@@ -336,6 +336,8 @@
                         <td><?php echo lang('gen_hamradio_dok'); ?></td>
                         <?php if (preg_match('/^[A-Y]\d{2}$/', $row->COL_DARC_DOK)) { ?>
                         <td><a href="https://www.darc.de/<?php echo $row->COL_DARC_DOK; ?>" target="_blank"><?php echo $row->COL_DARC_DOK; ?></a></td>
+                        <?php } else if (preg_match('/^DV[ABCDEFGHIKLMNOPQRSTUVWXY]$/', $row->COL_DARC_DOK)) { ?>
+                        <td><a href="https://www.darc.de/der-club/distrikte/<?php echo strtolower(substr($row->COL_DARC_DOK, 2, 1)); ?>" target="_blank"><?php echo $row->COL_DARC_DOK; ?></a></td>
                         <?php } else if (preg_match('/^Z\d{2}$/', $row->COL_DARC_DOK)) { ?>
                         <td><a href="https://<?php echo $row->COL_DARC_DOK; ?>.vfdb.org" target="_blank"><?php echo $row->COL_DARC_DOK; ?></a></td>
                         <?php } else { ?>
diff --git a/assets/css/superhero/overrides.css b/assets/css/superhero/overrides.css
index ae46b52bd..fd041bc4c 100644
--- a/assets/css/superhero/overrides.css
+++ b/assets/css/superhero/overrides.css
@@ -209,4 +209,8 @@ div.alert-danger {
 	width: 33%;
 	color: #000;
 	box-shadow: none !important;
+}
+
+#upcoming_dxccs_component a {
+	color: darkblue;
 }
\ No newline at end of file
diff --git a/assets/css/superhero_wide/overrides.css b/assets/css/superhero_wide/overrides.css
index da0f9f8be..c58401ced 100644
--- a/assets/css/superhero_wide/overrides.css
+++ b/assets/css/superhero_wide/overrides.css
@@ -263,4 +263,8 @@ div.alert-danger {
 	width: 33%;
 	color: #000;
 	box-shadow: none !important;
+}
+
+#upcoming_dxccs_component a {
+	color: darkblue;
 }
\ No newline at end of file
diff --git a/assets/js/sections/contesting.js b/assets/js/sections/contesting.js
index 31ff8fb6c..1ce2b5eb1 100644
--- a/assets/js/sections/contesting.js
+++ b/assets/js/sections/contesting.js
@@ -103,6 +103,11 @@ $(function () {
 	});
 });
 
+// checked if worked before after blur
+$("#callsign").blur(function () {
+	        checkIfWorkedBefore();
+});
+
 // Here we capture keystrokes to execute functions
 document.onkeyup = function (e) {
 	// ALT-W wipe
@@ -217,8 +222,8 @@ $("#callsign").keyup(function () {
 				highlight(call.toUpperCase());
 			}
 		});
-
-		checkIfWorkedBefore();
+		// moved to blur
+		// checkIfWorkedBefore();
 		var qTable = $('.qsotable').DataTable();
 		qTable.search(call).draw();
 	}
@@ -242,10 +247,21 @@ function checkIfWorkedBefore() {
 			},
 			success: function (result) {
 				if (result.message.substr(0, 6) == 'Worked') {
+					$('#callsign_info').removeClass('text-bg-success');
+					$('#callsign_info').addClass('text-bg-danger');
 					$('#callsign_info').text(result.message);
 				}
+				else if (result.message == "OKAY") {
+					$('#callsign_info').removeClass('text-bg-danger');
+					$('#callsign_info').addClass('text-bg-success');
+					$('#callsign_info').text("Go Work Them!");
+				} else {
+					$('#callsign_info').text("");
+				}
 			}
 		});
+	} else {
+		$('#callsign_info').text("");
 	}
 }