diff --git a/application/models/Dxcc.php b/application/models/Dxcc.php
index 1d4e81ba0..b3ee94222 100644
--- a/application/models/Dxcc.php
+++ b/application/models/Dxcc.php
@@ -430,9 +430,8 @@ class DXCC extends CI_Model {
      * Function gets worked and confirmed summary on each band on the active stationprofile
      */
 	function get_dxcc_summary($bands, $postdata) {
-		$CI =& get_instance();
-		$CI->load->model('logbooks_model');
-		$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
+		$this->load->model('logbooks_model');
+		$logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
 
 		if (!$logbooks_locations_array) {
 			return null;
diff --git a/application/views/awards/dxcc/index.php b/application/views/awards/dxcc/index.php
index 05fb57064..57ef24618 100644
--- a/application/views/awards/dxcc/index.php
+++ b/application/views/awards/dxcc/index.php
@@ -6,193 +6,194 @@
 }
 </style>
 <div class="container">
-        <!-- Award Info Box -->
-        <br>
-        <div id="awardInfoButton">
-            <script>
-            var lang_awards_info_button = "<?= __("Award Info"); ?>";
-            var lang_award_info_ln1 = "<?= __("DXCC Award"); ?>";
-            var lang_award_info_ln2 = "<?= sprintf(__("DXCC stands for 'DX Century Club,' an award based on worked countries. The DXCC List is based on an article created in 1935 by Clinton B. DeSoto, W1CBD, titled %s."), "<a href='http://www.arrl.org/desoto' target='_blank'>" . __("'How to Count Countries Worked, A New DX Scoring System'") . "</a>"); ?>";
-            var lang_award_info_ln3 = "<?= sprintf(__("You can find all information about the DXCC Award on the %s."), "<a href='https://www.arrl.org/dxcc-rules' target='_blank'>" . __("ARRL website") . "</a>"); ?>";
-            var lang_award_info_ln4 = "<?= __("Important Note: Over time, the criteria for the DXCC List have changed. The List remains unchanged until an entity no longer satisfies the criteria under which it was added, at which time it is moved to the Deleted List. You will find Deleted DXCC entities also in the lists on Wavelog. Be aware that these DXCC entities are outdated and no longer valid."); ?>";
-            var lang_award_info_ln5 = "<?= __("Fields taken for this Award: DXCC (Needs to be a valid one out of the DXCC-ADIF-Spec-List"); ?>";
-            </script>
-            <h2><?php echo $page_title; ?></h2>
-            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?= __("Award Info"); ?></button>
-        </div>
-        <!-- End of Award Info Box -->
+	<!-- Award Info Box -->
+	<br>
+	<div id="awardInfoButton">
+		<script>
+		var lang_awards_info_button = "<?= __("Award Info"); ?>";
+		var lang_award_info_ln1 = "<?= __("DXCC Award"); ?>";
+		var lang_award_info_ln2 = "<?= sprintf(__("DXCC stands for 'DX Century Club,' an award based on worked countries. The DXCC List is based on an article created in 1935 by Clinton B. DeSoto, W1CBD, titled %s."), "<a href='http://www.arrl.org/desoto' target='_blank'>" . __("'How to Count Countries Worked, A New DX Scoring System'") . "</a>"); ?>";
+		var lang_award_info_ln3 = "<?= sprintf(__("You can find all information about the DXCC Award on the %s."), "<a href='https://www.arrl.org/dxcc-rules' target='_blank'>" . __("ARRL website") . "</a>"); ?>";
+		var lang_award_info_ln4 = "<?= __("Important Note: Over time, the criteria for the DXCC List have changed. The List remains unchanged until an entity no longer satisfies the criteria under which it was added, at which time it is moved to the Deleted List. You will find Deleted DXCC entities also in the lists on Wavelog. Be aware that these DXCC entities are outdated and no longer valid."); ?>";
+		var lang_award_info_ln5 = "<?= __("Fields taken for this Award: DXCC (Needs to be a valid one out of the DXCC-ADIF-Spec-List"); ?>";
+		</script>
+		<h2><?php echo $page_title; ?></h2>
+		<button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?= __("Award Info"); ?></button>
+	</div>
+	<!-- End of Award Info Box -->
 
     <form class="form" action="<?php echo site_url('awards/dxcc'); ?>" method="post" enctype="multipart/form-data">
-        <fieldset>
+		<div class="mb-4 text-center">
+			<div class="dropdown" data-bs-auto-close="outside">
+				<button class="btn btn-sm btn-primary dropdown-toggle" type="button" id="filterDropdown" data-bs-toggle="dropdown" aria-expanded="false"><?= __("Filters") ?></button>
+				<button id="button1id" type="submit" name="button1id" class="btn btn-sm btn-primary"><?= __("Show"); ?></button>
+				<?php if ($dxcc_array) {
+					?><button type="button" onclick="load_dxcc_map();" class="btn btn-info btn-sm"><i class="fas fa-globe-americas"></i> <?= __("Show DXCC Map"); ?></button>
+				<?php }?>
 
-            <div class="mb-3 row">
-                <div class="col-md-2 control-label" for="checkboxes"><?= __("Deleted DXCC"); ?></div>
-                <div class="col-md-10">
-                    <div class="form-check-inline">
-                        <input class="form-check-input" type="checkbox" name="includedeleted" id="includedeleted" value="1" <?php if ($this->input->post('includedeleted')) echo ' checked="checked"'; ?> >
-                        <label class="form-check-label" for="includedeleted"><?= __("Include deleted"); ?></label>
-                    </div>
-                </div>
-            </div>
-
-            <!-- Multiple Checkboxes (inline) -->
-            <div class="mb-3 row">
-                <div class="col-md-2" for="checkboxes"><?= __("Worked / Confirmed"); ?></div>
-                <div class="col-md-10">
-                    <div class="form-check-inline">
-                        <input class="form-check-input" type="checkbox" name="worked" id="worked" value="1" <?php if ($this->input->post('worked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
-                        <label class="form-check-label" for="worked"><?= __("Show worked"); ?></label>
-                    </div>
-                    <div class="form-check-inline">
-                        <input class="form-check-input" type="checkbox" name="confirmed" id="confirmed" value="1" <?php if ($this->input->post('confirmed') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
-                        <label class="form-check-label" for="confirmed"><?= __("Show confirmed"); ?></label>
-                    </div>
-                    <div class="form-check-inline">
-                        <input class="form-check-input" type="checkbox" name="notworked" id="notworked" value="1" <?php if ($this->input->post('notworked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
-                        <label class="form-check-label" for="notworked"><?= __("Show not worked"); ?></label>
-                    </div>
-                </div>
-            </div>
-
-            <div class="mb-3 row">
-                <div class="col-md-2"><?= __("Show QSO with QSL Type"); ?></div>
-                <div class="col-md-10">
-                    <div class="form-check-inline">
-                        <input class="form-check-input" type="checkbox" name="qsl" value="1" id="qsl" <?php if ($this->input->post('qsl') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
-                        <label class="form-check-label" for="qsl"><?= __("QSL"); ?></label>
-                    </div>
-                    <div class="form-check-inline">
-                        <input class="form-check-input" type="checkbox" name="lotw" value="1" id="lotw" <?php if ($this->input->post('lotw') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
-                        <label class="form-check-label" for="lotw"><?= __("LoTW"); ?></label>
-                    </div>
-                    <div class="form-check-inline">
-                        <input class="form-check-input" type="checkbox" name="eqsl" value="1" id="eqsl" <?php if ($this->input->post('eqsl')) echo ' checked="checked"'; ?> >
-                        <label class="form-check-label" for="eqsl"><?= __("eQSL"); ?></label>
-                    </div>
-                    <div class="form-check-inline">
-                        <input class="form-check-input" type="checkbox" name="qrz" value="1" id="qrz" <?php if ($this->input->post('qrz')) echo ' checked="checked"'; ?> >
-                        <label class="form-check-label" for="qrz"><?= __("QRZ.com"); ?></label>
-                    </div>
-                     <div class="form-check-inline">
-                        <input class="form-check-input" type="checkbox" name="clublog" value="1" id="clublog" <?php if ($this->input->post('clublog')) echo ' checked="checked"'; ?> >
-                        <label class="form-check-label" for="clublog"><?= __("Clublog"); ?></label>
-                    </div>
-                </div>
-            </div>
-
-            <div class="mb-3 row">
-                <div class="col-md-2"><?= __("Continents"); ?></div>
-                <div class="col-md-10">
-                    <div class="form-check-inline">
-                        <input class="form-check-input" type="checkbox" name="Antarctica" id="Antarctica" value="1" <?php if ($this->input->post('Antarctica') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
-                        <label class="form-check-label" for="Antarctica"><?= __("Antarctica"); ?></label>
-                    </div>
-                    <div class="form-check-inline">
-                        <input class="form-check-input"  type="checkbox" name="Africa" id="Africa" value="1" <?php if ($this->input->post('Africa') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
-                        <label class="form-check-label" for="Africa"><?= __("Africa"); ?></label>
-                    </div>
-                    <div class="form-check-inline">
-                        <input class="form-check-input"  type="checkbox" name="Asia" id="Asia" value="1" <?php if ($this->input->post('Asia') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
-                        <label class="form-check-label" for="Asia"><?= __("Asia"); ?></label>
-                    </div>
-                    <div class="form-check-inline">
-                        <input class="form-check-input"  type="checkbox" name="Europe" id="Europe" value="1" <?php if ($this->input->post('Europe') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
-                        <label class="form-check-label" for="Europe"><?= __("Europe"); ?></label>
-                    </div>
-                    <div class="form-check-inline">
-                        <input class="form-check-input"  type="checkbox" name="NorthAmerica" id="NorthAmerica" value="1" <?php if ($this->input->post('NorthAmerica') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
-                        <label class="form-check-label" for="NorthAmerica"><?= __("North America"); ?></label>
-                    </div>
-                    <div class="form-check-inline">
-                        <input class="form-check-input"  type="checkbox" name="SouthAmerica" id="SouthAmerica" value="1" <?php if ($this->input->post('SouthAmerica') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
-                        <label class="form-check-label" for="SouthAmerica"><?= __("South America"); ?></label>
-                    </div>
-                    <div class="form-check-inline">
-                        <input class="form-check-input"  type="checkbox" name="Oceania" id="Oceania" value="1" <?php if ($this->input->post('Oceania') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
-                        <label class="form-check-label" for="Oceania"><?= __("Oceania"); ?></label>
-                    </div>
-                </div>
-            </div>
-
-            <div class="mb-3 row">
-                <label class="col-md-2 control-label" for="band2"><?= __("Band"); ?></label>
-                <div class="col-md-2">
-                    <select id="band2" name="band" class="form-select form-select-sm">
-                        <option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> ><?= __("Every band (w/o SAT)"); ?></option>
-                        <?php foreach($worked_bands as $band) {
-                            echo '<option value="' . $band . '"';
-                            if ($this->input->post('band') == $band) echo ' selected';
-                            echo '>' . $band . '</option>'."\n";
-                        } ?>
-                    </select>
-                </div>
-            </div>
-            <div id="satrow" class="mb-3 row" <?php if ($this->input->post('band') != 'SAT' && $this->input->post('band') != 'All') echo "style=\"display: none\""; ?>>
-			<?php if (count($sats_available) != 0) { ?>
-                <label class="col-md-2 control-label" id="satslabel" for="sats"><?= __("Satellite"); ?></label>
-				<div class="col-md-2">
-                <select class="form-select form-select-sm"  id="sats" name="sats">
-                    <option value="All" <?php if ($this->input->post('sats') == "All" || $this->input->method() !== 'post') echo ' selected'; ?>><?= __("All")?></option>
-                    <?php foreach($sats_available as $sat) {
-                        echo '<option value="' . $sat . '"';
-						if ($this->input->post('sats') == $sat) echo ' selected';
-						echo '>' . $sat . '</option>'."\n";
-                    } ?>
-                </select>
+		<!-- Dropdown Menu with Filter Content -->
+		<div class="dropdown-menu start-50 translate-middle-x p-3 mt-5" aria-labelledby="filterDropdown" style="min-width: 250px;">
+			<div class="card-body filterbody">
+				<div class="mb-3 row">
+					<div class="col-md-2 control-label" for="checkboxes"><?= __("Deleted DXCC"); ?></div>
+					<div class="col-md-10">
+						<div class="form-check-inline">
+							<input class="form-check-input" type="checkbox" name="includedeleted" id="includedeleted" value="1" <?php if ($this->input->post('includedeleted')) echo ' checked="checked"'; ?> >
+							<label class="form-check-label" for="includedeleted"><?= __("Include deleted"); ?></label>
+						</div>
+					</div>
 				</div>
-            <?php } else { ?>
-                <input id="sats" type="hidden" value="All"></input>
-            <?php } ?>
+
+				<!-- Multiple Checkboxes (inline) -->
+				<div class="mb-3 row">
+					<div class="col-md-2" for="checkboxes"><?= __("Worked / Confirmed"); ?></div>
+					<div class="col-md-10">
+						<div class="form-check-inline">
+							<input class="form-check-input" type="checkbox" name="worked" id="worked" value="1" <?php if ($this->input->post('worked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
+							<label class="form-check-label" for="worked"><?= __("Show worked"); ?></label>
+						</div>
+						<div class="form-check-inline">
+							<input class="form-check-input" type="checkbox" name="confirmed" id="confirmed" value="1" <?php if ($this->input->post('confirmed') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
+							<label class="form-check-label" for="confirmed"><?= __("Show confirmed"); ?></label>
+						</div>
+						<div class="form-check-inline">
+							<input class="form-check-input" type="checkbox" name="notworked" id="notworked" value="1" <?php if ($this->input->post('notworked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
+							<label class="form-check-label" for="notworked"><?= __("Show not worked"); ?></label>
+						</div>
+					</div>
+				</div>
+
+				<div class="mb-3 row">
+					<div class="col-md-2"><?= __("Show QSO with QSL Type"); ?></div>
+					<div class="col-md-10">
+						<div class="form-check-inline">
+							<input class="form-check-input" type="checkbox" name="qsl" value="1" id="qsl" <?php if ($this->input->post('qsl') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
+							<label class="form-check-label" for="qsl"><?= __("QSL"); ?></label>
+						</div>
+						<div class="form-check-inline">
+							<input class="form-check-input" type="checkbox" name="lotw" value="1" id="lotw" <?php if ($this->input->post('lotw') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
+							<label class="form-check-label" for="lotw"><?= __("LoTW"); ?></label>
+						</div>
+						<div class="form-check-inline">
+							<input class="form-check-input" type="checkbox" name="eqsl" value="1" id="eqsl" <?php if ($this->input->post('eqsl')) echo ' checked="checked"'; ?> >
+							<label class="form-check-label" for="eqsl"><?= __("eQSL"); ?></label>
+						</div>
+						<div class="form-check-inline">
+							<input class="form-check-input" type="checkbox" name="qrz" value="1" id="qrz" <?php if ($this->input->post('qrz')) echo ' checked="checked"'; ?> >
+							<label class="form-check-label" for="qrz"><?= __("QRZ.com"); ?></label>
+						</div>
+						<div class="form-check-inline">
+							<input class="form-check-input" type="checkbox" name="clublog" value="1" id="clublog" <?php if ($this->input->post('clublog')) echo ' checked="checked"'; ?> >
+							<label class="form-check-label" for="clublog"><?= __("Clublog"); ?></label>
+						</div>
+					</div>
+				</div>
+
+				<div class="mb-3 row">
+					<div class="col-md-2"><?= __("Continents"); ?></div>
+					<div class="col-md-10">
+						<div class="form-check-inline">
+							<input class="form-check-input" type="checkbox" name="Antarctica" id="Antarctica" value="1" <?php if ($this->input->post('Antarctica') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
+							<label class="form-check-label" for="Antarctica"><?= __("Antarctica"); ?></label>
+						</div>
+						<div class="form-check-inline">
+							<input class="form-check-input"  type="checkbox" name="Africa" id="Africa" value="1" <?php if ($this->input->post('Africa') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
+							<label class="form-check-label" for="Africa"><?= __("Africa"); ?></label>
+						</div>
+						<div class="form-check-inline">
+							<input class="form-check-input"  type="checkbox" name="Asia" id="Asia" value="1" <?php if ($this->input->post('Asia') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
+							<label class="form-check-label" for="Asia"><?= __("Asia"); ?></label>
+						</div>
+						<div class="form-check-inline">
+							<input class="form-check-input"  type="checkbox" name="Europe" id="Europe" value="1" <?php if ($this->input->post('Europe') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
+							<label class="form-check-label" for="Europe"><?= __("Europe"); ?></label>
+						</div>
+						<div class="form-check-inline">
+							<input class="form-check-input"  type="checkbox" name="NorthAmerica" id="NorthAmerica" value="1" <?php if ($this->input->post('NorthAmerica') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
+							<label class="form-check-label" for="NorthAmerica"><?= __("North America"); ?></label>
+						</div>
+						<div class="form-check-inline">
+							<input class="form-check-input"  type="checkbox" name="SouthAmerica" id="SouthAmerica" value="1" <?php if ($this->input->post('SouthAmerica') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
+							<label class="form-check-label" for="SouthAmerica"><?= __("South America"); ?></label>
+						</div>
+						<div class="form-check-inline">
+							<input class="form-check-input"  type="checkbox" name="Oceania" id="Oceania" value="1" <?php if ($this->input->post('Oceania') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
+							<label class="form-check-label" for="Oceania"><?= __("Oceania"); ?></label>
+						</div>
+					</div>
+				</div>
+
+				<div class="mb-3 row">
+					<label class="col-md-2 control-label" for="band2"><?= __("Band"); ?></label>
+					<div class="col-md-3">
+						<select id="band2" name="band" class="form-select form-select-sm">
+							<option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> ><?= __("Every band (w/o SAT)"); ?></option>
+							<?php foreach($worked_bands as $band) {
+								echo '<option value="' . $band . '"';
+								if ($this->input->post('band') == $band) echo ' selected';
+								echo '>' . $band . '</option>'."\n";
+							} ?>
+						</select>
+					</div>
+				</div>
+				<div id="satrow" class="mb-3 row" <?php if ($this->input->post('band') != 'SAT' && $this->input->post('band') != 'All') echo "style=\"display: none\""; ?>>
+				<?php if (count($sats_available) != 0) { ?>
+					<label class="col-md-2 control-label" id="satslabel" for="sats"><?= __("Satellite"); ?></label>
+					<div class="col-md-3">
+					<select class="form-select form-select-sm"  id="sats" name="sats">
+						<option value="All" <?php if ($this->input->post('sats') == "All" || $this->input->method() !== 'post') echo ' selected'; ?>><?= __("All")?></option>
+						<?php foreach($sats_available as $sat) {
+							echo '<option value="' . $sat . '"';
+							if ($this->input->post('sats') == $sat) echo ' selected';
+							echo '>' . $sat . '</option>'."\n";
+						} ?>
+					</select>
+					</div>
+				<?php } else { ?>
+					<input id="sats" type="hidden" value="All"></input>
+				<?php } ?>
+				</div>
+			<div id="orbitrow" class="mb-3 row" <?php if ($this->input->post('band') != 'SAT' && $this->input->post('band') != 'All') echo "style=\"display: none\""; ?>>
+				<label class="col-md-2 control-label" id="orbitslabel" for="orbits"><?= __("Orbit"); ?></label>
+					<div class="col-md-3">
+						<select class="form-select form-select-sm"  id="orbits" name="orbits">
+							<option value="All" <?php if ($this->input->post('orbits') == "All" || $this->input->method() !== 'post') echo ' selected'; ?>><?= __("All")?></option>
+							<?php
+							foreach($orbits as $orbit){
+								echo '<option value="' . $orbit . '"';
+								if ($this->input->post('orbits') == $orbit) echo ' selected';
+								echo '>' . strtoupper($orbit) . '</option>'."\n";
+							}
+							?>
+						</select>
+					</div>
 			</div>
-         <div id="orbitrow" class="mb-3 row" <?php if ($this->input->post('band') != 'SAT' && $this->input->post('band') != 'All') echo "style=\"display: none\""; ?>>
-                <label class="col-md-2 control-label" id="orbitslabel" for="orbits"><?= __("Orbit"); ?></label>
-				<div class="col-md-2">
-                <select class="form-select form-select-sm"  id="orbits" name="orbits">
-                    <option value="All" <?php if ($this->input->post('orbits') == "All" || $this->input->method() !== 'post') echo ' selected'; ?>><?= __("All")?></option>
-                    <?php
-                    foreach($orbits as $orbit){
-                        echo '<option value="' . $orbit . '"';
-						if ($this->input->post('orbits') == $orbit) echo ' selected';
-						echo '>' . strtoupper($orbit) . '</option>'."\n";
-                    }
-                    ?>
-            </select>
+		</div>
+			<div class="mb-3 row">
+				<label class="col-md-2 control-label" for="mode"><?= __("Mode"); ?></label>
+				<div class="col-md-3">
+					<select id="mode" name="mode" class="form-select form-select-sm">
+						<option value="All" <?php if ($this->input->post('mode') == "All" || $this->input->method() !== 'mode') echo ' selected'; ?>><?= __("All"); ?></option>
+						<?php
+						foreach($modes->result() as $mode){
+							if ($mode->submode == null) {
+								echo '<option value="' . $mode->mode . '"';
+								if ($this->input->post('mode') == $mode->mode) echo ' selected';
+								echo '>'. $mode->mode . '</option>'."\n";
+							} else {
+								echo '<option value="' . $mode->submode . '"';
+								if ($this->input->post('mode') == $mode->submode) echo ' selected';
+								echo '>' . $mode->submode . '</option>'."\n";
+							}
+						}
+						?>
+					</select>
 				</div>
-				</div>
-            <div class="mb-3 row">
-                <label class="col-md-2 control-label" for="mode"><?= __("Mode"); ?></label>
-                <div class="col-md-2">
-                <select id="mode" name="mode" class="form-select form-select-sm">
-                    <option value="All" <?php if ($this->input->post('mode') == "All" || $this->input->method() !== 'mode') echo ' selected'; ?>><?= __("All"); ?></option>
-                    <?php
-                    foreach($modes->result() as $mode){
-                        if ($mode->submode == null) {
-                            echo '<option value="' . $mode->mode . '"';
-                            if ($this->input->post('mode') == $mode->mode) echo ' selected';
-                            echo '>'. $mode->mode . '</option>'."\n";
-                        } else {
-                            echo '<option value="' . $mode->submode . '"';
-                            if ($this->input->post('mode') == $mode->submode) echo ' selected';
-                            echo '>' . $mode->submode . '</option>'."\n";
-                        }
-                    }
-                    ?>
-                </select>
-                </div>
-            </div>
-
-            <div class="mb-3 row">
-                <label class="col-md-2 control-label" for="button1id"></label>
-                <div class="col-md-10">
-                    <button id="button2id" type="reset" name="button2id" class="btn btn-sm btn-warning"><?= __("Reset"); ?></button>
-                    <button id="button1id" type="submit" name="button1id" class="btn btn-sm btn-primary"><?= __("Show"); ?></button>
-                    <?php if ($dxcc_array) {
-                        ?><button type="button" onclick="load_dxcc_map();" class="btn btn-info btn-sm"><i class="fas fa-globe-americas"></i> <?= __("Show DXCC Map"); ?></button>
-                    <?php }?>
-                </div>
-            </div>
-
-        </fieldset>
+			</div>
+			<div class="mb-4 text-center">
+				<button id="button2id" type="reset" name="button2id" class="btn btn-sm btn-warning"><?= __("Reset"); ?></button>
+			</div>
+		</div>
     </form>
 
     <ul class="nav nav-tabs" id="myTab" role="tablist">
diff --git a/assets/js/sections/dxccmap.js b/assets/js/sections/dxccmap.js
index a4a3b49c7..b09181d67 100644
--- a/assets/js/sections/dxccmap.js
+++ b/assets/js/sections/dxccmap.js
@@ -1,3 +1,13 @@
+document.addEventListener("DOMContentLoaded", function() {
+  document.querySelectorAll('.dropdown').forEach(dd => {
+		dd.addEventListener('hide.bs.dropdown', function (e) {
+			if (e.clickEvent && e.clickEvent.target.closest('.dropdown-menu')) {
+				e.preventDefault(); // stop Bootstrap from closing
+			}
+		});
+	});
+});
+
 var osmUrl = $('#dxccmapjs').attr("tileUrl");