diff --git a/application/views/contesting/index.php b/application/views/contesting/index.php
index 441311b58..85829d2ea 100644
--- a/application/views/contesting/index.php
+++ b/application/views/contesting/index.php
@@ -3,7 +3,7 @@
         <button type="button" class="btn btn-sm btn-primary me-2" onclick="openBandmap()" title="Open DX Cluster Bandmap"><i class="fas fa-chart-line"></i> <?php echo lang('menu_bandmap'); ?></button>
         <button type="button" class="btn btn-sm btn-warning" onclick="reset_contest_session()"><i class="fas fa-sync-alt"></i> <?php echo lang('contesting_button_reset_contest_session'); ?></button>
     </div>
-    <h2 style="display:inline"><?php echo lang('contesting_page_title'); ?> </h2> <?php echo ($_GET['manual'] == 0 ? " <span style='display:inline' class='align-text-top badge text-bg-success'>LIVE</span>" : " <span style='display:inline' class='align-text-top badge text-bg-danger'>POST</span>");  ?>
+    <h2 style="display:inline"><?php echo lang('contesting_page_title'); ?> </h2> <?php echo ($_GET['manual'] == 0 ? " <span style='display:inline; cursor: pointer;' class='align-text-top badge text-bg-success' onclick=\"window.location.href='" . site_url('contesting') . "?manual=1'\" title='Switch to POST mode'>LIVE</span>" : " <span style='display:inline; cursor: pointer;' class='align-text-top badge text-bg-danger' onclick=\"window.location.href='" . site_url('contesting') . "?manual=0'\" title='Switch to LIVE mode'>POST</span>");  ?>
     <div class="row">
 
         <div class="col-sm-12 col-md-12">
diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php
index 8fdfd653a..2e506ddac 100644
--- a/application/views/interface_assets/header.php
+++ b/application/views/interface_assets/header.php
@@ -98,13 +98,9 @@
 							<div class="dropdown-menu" aria-labelledby="navbarDropdown">
 								<a class="dropdown-item" href="<?php echo site_url('qso?manual=0'); ?>" title="Log Live QSOs"><i class="fas fa-list-ul"></i> <?php echo lang('menu_live_qso'); ?></a>
 								<div class="dropdown-divider"></div>
-								<a class="dropdown-item" href="<?php echo site_url('qso?manual=1'); ?>" title="Log QSO made in the past"><i class="fas fa-list"></i> <?php echo lang('menu_post_qso'); ?></a>
-								<div class="dropdown-divider"></div>
 								<a class="dropdown-item" href="<?php echo site_url('simplefle'); ?>" title="Simple Fast Log Entry"><i class="fas fa-list-alt"></i> <?php echo lang('menu_fast_log_entry'); ?></a>
 								<div class="dropdown-divider"></div>
 								<a class="dropdown-item" href="<?php echo site_url('contesting?manual=0'); ?>" title="Live contest QSOs"><i class="fas fa-list-ol"></i> <?php echo lang('menu_live_contest_logging'); ?></a>
-								<div class="dropdown-divider"></div>
-								<a class="dropdown-item" href="<?php echo site_url('contesting?manual=1'); ?>" title="Post contest QSOs"><i class="fas fa-list-ol"></i> <?php echo lang('menu_post_contest_logging'); ?></a>
 							</div>
 						</li>
 
diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index bb2a11424..96fec6495 100755
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -17,10 +17,10 @@
             <ul style="font-size: 15px;" class="nav nav-tabs card-header-tabs pull-right" id="myTab" role="tablist">
               <li class="nav-item">
                 <a class="nav-link active" id="qsp-tab" data-bs-toggle="tab" href="#qso" role="tab" aria-controls="qso" aria-selected="true"><?php echo lang('gen_hamradio_qso'); ?><?php if ($_GET['manual'] == 0) {
-                                                                                                                                                                                      echo " <span class=\"badge text-bg-success\">LIVE</span>";
+                                                                                                                                                                                      echo " <span class=\"badge text-bg-success\" style=\"cursor: pointer;\" onclick=\"window.location.href='" . site_url('qso') . "?manual=1'\" title=\"Switch to POST mode\">LIVE</span>";
                                                                                                                                                                                     };
                                                                                                                                                                                     if ($_GET['manual'] == 1) {
-                                                                                                                                                                                      echo " <span class=\"badge text-bg-danger\">POST</span>";
+                                                                                                                                                                                      echo " <span class=\"badge text-bg-danger\" style=\"cursor: pointer;\" onclick=\"window.location.href='" . site_url('qso') . "?manual=0'\" title=\"Switch to LIVE mode\">POST</span>";
                                                                                                                                                                                     } ?></a>
               </li>