diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php
index 593dd3505..4c7fc7e16 100644
--- a/application/views/station_profile/create.php
+++ b/application/views/station_profile/create.php
@@ -20,17 +20,17 @@ if ($dxcc_list->result() > 0) {
 
 <div class="container" id="create_station_profile">
 
-<br>
+	<br>
 	<?php if($this->session->flashdata('message')) { ?>
 		<!-- Display Message -->
 		<div class="alert-message error">
-		  <p><?php echo $this->session->flashdata('message'); ?></p>
+			<p><?php echo $this->session->flashdata('message'); ?></p>
 		</div>
 	<?php } ?>
 
 	<?php if($this->session->flashdata('notice')) { ?>
 		<div id="message" >
-		<?php echo $this->session->flashdata('notice'); ?>
+			<?php echo $this->session->flashdata('notice'); ?>
 		</div>
 	<?php } ?>
 
@@ -42,278 +42,393 @@ if ($dxcc_list->result() > 0) {
 		</div>
 	<?php } ?>
 
-<div class="card">
-  <div class="card-header">
-    <?php echo $page_title; ?>
-  </div>
-  <div class="card-body">
-    <h5 class="card-title"></h5>
-    <p class="card-text"></p>
+	<form method="post" action="<?php echo site_url('station/create'); ?>" name="create_profile">
 
-		<form method="post" action="<?php echo site_url('station/create'); ?>" name="create_profile">
-		  <div class="mb-3">
-		    <label for="stationNameInput"><?= __("Location Name"); ?></label>
-		    <input type="text" class="form-control" name="station_profile_name" id="stationNameInput" aria-describedby="stationNameInputHelp" placeholder="<?php echo _pgettext("Station Location Setup", "Home QTH"); ?>" value="<?php if(isset($station_profile_name)) { echo $station_profile_name; } ?>" required>
-		    <small id="stationNameInputHelp" class="form-text text-muted"><?= sprintf(__("Shortname for the station location. For example: %s"), _pgettext("Station Location Setup", "Home QTH")); ?></small>
-		  </div>
-
-			<div class="mb-3">
-		    <label for="stationCallsignInput"><?= __("Station Callsign"); ?></label>
-		    <input type="text" class="form-control uppercase" name="station_callsign" id="stationCallsignInput" aria-describedby="stationCallsignInputHelp" placeholder="4W7EST" value="<?php if(isset($station_callsign)) { echo $station_callsign; } ?>" required>
-		    <small id="stationCallsignInputHelp" class="form-text text-muted"><?= __("Station callsign. For example: 4W7EST/P"); ?></small>
-		  </div>
-
-			<div class="mb-3">
-		    <label for="stationPowerInput"><?= __("Station Power (W)"); ?></label>
-		    <input type="number" class="form-control" name="station_power" id="stationPowerInput" step="1" aria-describedby="stationPowerInputHelp" placeholder="10" value="<?php if(isset($station_power)) { echo $station_power; } ?>">
-		    <small id="stationPowerInputHelp" class="form-text text-muted"><?= __("Default station power in Watt. Overwritten by CAT."); ?></small>
-		  </div>
-		  <div class="mb-3">
-		    <label for="stationDXCCInput"><?= __("Station DXCC"); ?></label>
-				<?php if ($dxcc_list->num_rows() > 0) { ?>
-				<select class="form-control" id="dxcc_id" name="dxcc" aria-describedby="stationCallsignInputHelp" required>
-				<option value="" <?php if (!isset($dxcc) || $dxcc == "") { echo "selected"; } ?>><?= __("Please select one"); ?></option>
-				<?php foreach ($dxcc_list->result() as $dxcc_item) { ?>
-				<option value="<?php echo $dxcc_item->adif; ?>" <?php if(isset($dxcc) && $dxcc_item->adif == $dxcc) { echo "selected='selected'"; } ?>><?php echo ucwords(strtolower($dxcc_item->name)) . ' - ' . $dxcc_item->prefix; if ($dxcc_item->end != NULL) echo ' ('.__("Deleted DXCC").')';?>
-				</option>
-				<?php } ?>
-				</select>
-				<?php } ?>
-		    <small id="stationDXCCInputHelp" class="form-text text-muted"><?= __("Station DXCC entity. For example: Bolivia"); ?></small>
-			<div class="alert alert-danger" role="alert" id="warningMessageDXCC" style="display: none"> </div>
-		  </div>
-
-		  <div class="mb-3">
-		    <label for="stationCityInput"><?= __("Station City"); ?></label>
-		    <input type="text" class="form-control" name="city" id="stationCityInput" aria-describedby="stationCityInputHelp" value="<?php if(isset($city)) { echo $city; } ?>">
-		    <small id="stationCityInputHelp" class="form-text text-muted"><?= __("Station city. For example: Oslo"); ?></small>
-		  </div>
-
-        <!-- State -->
-		<div class="mb-3" id="location_state">
-			<label for="stateInput" id="stateInputLabel"></label>
-			<select class="form-select" name="station_state" id="stateDropdown">
-				<option value=""></option>
-			</select>
-			<small id="StateHelp" class="form-text text-muted"><?= __("Station state. Applies to certain countries only."); ?></small>
-		</div>
-
-		<!-- US County -->
-		<div class="mb-3" id="location_us_county">
-			<label for="stationCntyInput"><?= __("Station County"); ?></label>
-			<input type="text" class="form-control" name="station_cnty" id="stationCntyInputEdit" aria-describedby="stationCntyInputHelp">
-			<small id="stationCntyInputHelp" class="form-text text-muted"><?= __("Station County (Only used for specific DXCCs)."); ?></small>
-		</div>
-
-		<div class="row">
-			<div class="mb-3 col-sm-6">
-				<label for="stationCQZoneInput"><?= __("CQ Zone"); ?></label>
-				<select class="form-select" id="stationCQZoneInput" name="station_cq" required>
-					<?php
-					for ($i = 1; $i<=40; $i++) {
-						echo '<option value='.$i;
-						if(isset($station_cq) && $station_cq!= '' && $station_cq == $i) { echo " selected='selected'"; }
-						echo '>'. $i .'</option>';
-					}
-					?>
-				</select>
-				<small id="stationCQInputHelp" class="form-text text-muted"><?= sprintf(_pgettext("uses 'click here'","If you don't know your CQ Zone then %s to find it!"),"<a href='https://zone-check.eu/?m=cq' target='_blank'>".__("click here")."</a> "); ?></small>
-			</div>
-
-			<div class="mb-3 col-sm-6">
-				<label for="stationITUZoneInput"><?= __("ITU Zone"); ?></label>
-				<select class="form-select" id="stationITUZoneInput" name="station_itu" required>
-					<?php
-					for ($i = 1; $i<=90; $i++) {
-						echo '<option value='. $i;
-						if(isset($station_itu) && $station_itu!= '' && $station_itu == $i) { echo " selected='selected'"; }
-						echo '>'. $i .'</option>';
-					}
-					?>
-				</select>
-				<small id="stationITUInputHelp" class="form-text text-muted"><?= sprintf(_pgettext("uses 'click here'","If you don't know your ITU Zone then %s to find it!"),"<a href='https://zone-check.eu/?m=itu' target='_blank'>".__("click here")."</a> "); ?></small>
-			</div>
-		</div>
-
-		  <div class="mb-3">
-		    <label for="stationGridsquareInput"><?= __("Station Gridsquare"); ?></label>
-
-			<div class="input-group mb-3">
-			<input type="text" class="form-control uppercase" name="gridsquare" id="stationGridsquareInput" aria-describedby="stationGridInputHelp" value="<?php if(isset($gridsquare)) { echo $gridsquare; } ?>" required>
-			<div class="input-group-append">
-				<button type="button" class="btn btn-outline-secondary" onclick="getLocation()"><i class="fas fa-compass"></i> <?= __("Get Gridsquare"); ?></button>
-			</div>
-			</div>
-
-		    <small id="stationGridInputHelp" class="form-text text-muted"><?= sprintf(_pgettext("uses 'click here'", "Station gridsquare. For example: HM54AP. If you don't know your grid square then %s!"), "<a href='https://zone-check.eu/?m=loc' target='_blank'>".__("click here")."</a>"); ?></small><br>
-		    <small id="stationGridInputHelp" class="form-text text-muted"><?= __("If you are located on a grid line, enter multiple grid squares separated with commas. For example: IO77,IO78,IO87,IO88."); ?></small>
-		  </div>
-
-            <div class="mb-3">
-                <label for="stationIOTAInput"><?= __("IOTA Reference"); ?></label>
-                <select class="form-select" name="iota" id="stationIOTAInput" aria-describedby="stationIOTAInputHelp" placeholder="EU-005">
-                    <option value =""></option>
-
-                    <?php
-                    foreach($iota_list as $i){
-                        echo '<option value='.$i->tag;
-                        if(isset($iota) && $i->tag == $iota) { echo " selected='selected'"; }
-                        echo '>'.$i->tag.' - '.$i->name.'</option>';
-                    }
-                    ?>
-
-                </select>
-                <small id="stationIOTAInputHelp" class="form-text text-muted"><?= __("Station IOTA reference. For example: EU-005"); ?></small>
-                <small id="stationIOTAInputHelp" class="form-text text-muted"><?= sprintf(__("You can look up IOTA references at the %s."), "<a target='_blank' href='https://www.iota-world.org/iota-directory/annex-f-short-title-iota-reference-number-list.html'>".__("IOTA World website")."</a>"); ?></small>
-            </div>
-
-		  <div class="mb-3">
-		    <label for="stationSOTAInput"><?= __("SOTA Reference"); ?></label>
-		    <input type="text" class="form-control uppercase" name="sota" id="stationSOTAInput" aria-describedby="stationSOTAInputHelp" value="<?php if(isset($sota)) { echo $sota; } ?>">
-		    <small id="stationSOTAInputHelp" class="form-text text-muted"><?= sprintf(__("Station SOTA reference. You can look up SOTA references at the %s."), "<a target='_blank' href='https://www.sotamaps.org/'>".__("SOTA Maps website")."</a>"); ?></small>
-		  </div>
-
-		  <div class="mb-3">
-		    <label for="stationWWFFInput"><?= __("WWFF Reference"); ?></label>
-		    <input type="text" class="form-control uppercase" name="wwff" id="stationWWFFInput" aria-describedby="stationWWFFInputHelp" value="<?php if(isset($wwff)) { echo $wwff; } ?>">
-		    <small id="stationWWFFInputHelp" class="form-text text-muted"><?= sprintf(__("Station WWFF reference. You can look up WWFF references at the %s."), "<a target='_blank' href='https://www.cqgma.org/mvs/'>".__("GMA Map website")."</a>"); ?></small>
-		  </div>
-
-		  <div class="mb-3">
-		    <label for="stationPOTAInput"><?= __("POTA Reference(s)"); ?></label>
-		    <input type="text" class="form-control uppercase" name="pota" id="stationPOTAInput" aria-describedby="stationPOTAInputHelp" value="<?php if(isset($pota)) { echo $pota; } ?>">
-		    <small id="stationPOTAInputHelp" class="form-text text-muted"><?= sprintf(__("Station POTA reference(s). Multiple comma separated values allowed. You can look up POTA references at the %s."), "<a target='_blank' href='https://pota.app/#/map/'>".__("POTA Map website")."</a>"); ?></small>
-		  </div>
-
-		  <div class="mb-3">
-		    <label for="stationSigInput"><?= __("Signature Name"); ?></label>
-		    <input type="text" class="form-control uppercase" name="sig" id="stationSigInput" aria-describedby="stationSigInputHelp" value="<?php if(isset($sig)) { echo $sig; } ?>">
-		    <small id="stationSigInputHelp" class="form-text text-muted"><?= __("Station Special Interest Group Name (e.g. GMA)."); ?></small>
-		  </div>
-
-		  <div class="mb-3">
-		    <label for="stationSigInfoInput"><?= __("Signature Information"); ?></label>
-		    <input type="text" class="form-control uppercase" name="sig_info" id="stationSigInfoInput" aria-describedby="stationSigInfoInputHelp" value="<?php if(isset($sig_info)) { echo $sig_info; } ?>">
-		    <small id="stationSigInfoInput" class="form-text text-muted"><?= __("Station Special Interest Group Info (e.g. DA/NW-357)."); ?></small>
-		  </div>
-
-            <div class="mb-3">
-                <label for="eqslNickname"><?php echo _pgettext("Probably no translation needed","eQSL QTH Nickname"); ?></label>
-                <input type="text" class="form-control" name="eqslnickname" id="eqslNickname" aria-describedby="eqslhelp" value="<?php if(isset($eqslnickname)) { echo $eqslnickname; } ?>">
-                <small id="eqslhelp" class="form-text text-muted"><?= __("The QTH Nickname which is configured in your eQSL Profile"); ?></small>
-            </div>
-
-			<div class="mb-3">
-				<label for="eqslDefaultQSLMsg"><?= __("Default QSLMSG"); ?></label>
-				<label class="position-absolute end-0 mb-2 me-3" for="eqslDefaultQSLMsg" id="charsLeft"> </label>
-				<textarea class="form-control" name="eqsl_default_qslmsg" id="eqslDefaultQSLMsg" aria-describedby="eqsldefaultqslmsghelp" maxlength="240" rows="2" style="width:100%;"><?php if (isset($eqsl_default_qslmsg) && $eqsl_default_qslmsg != "") { echo $eqsl_default_qslmsg; } ?></textarea>
-				<small id="eqsldefaultqslmsghelp" class="form-text text-muted"><?= __("Define a default message that will be populated and sent for each QSO for this station location."); ?></small>
-			</div>
-			<div class="mb-3">
-				<label for="clublogignore"><?= __("Ignore Clublog Upload"); ?></label>
-				<select class="form-select" id="clublogignore" name="clublogignore">
-					<option value="1" <?php if (isset($clublogignore) && $clublogignore == 1) { echo ' selected="selected"'; } ?>><?= __("Yes"); ?></option>
-					<option value="0" <?php if (!isset($clublogignore) || $clublogignore != 1) { echo ' selected="selected"'; } ?>><?= __("No"); ?></option>
-				</select>
-				<small class="form-text text-muted"><?= __("If enabled, the QSOs made from this location will not be uploaded to Clublog. If this is deactivated on it's own please check if the Call is properly configured at Clublog"); ?></small>
-			</div>
-            <div class="mb-3" id="clublogrealtimediv">
-				<label for="clublogrealtime"><?= __("ClubLog Realtime Upload"); ?></label>
-				<select class="form-select" id="clublogrealtime" name="clublogrealtime">
-					<option value="1" <?php if (isset($clublogrealtime) && $clublogrealtime == 1) { echo ' selected="selected"'; } ?>><?= __("Yes"); ?></option>
-					<option value="0" <?php if (!isset($clublogrealtime) || $clublogrealtime != 1) { echo ' selected="selected"'; } ?>><?= __("No"); ?></option>
-				</select>
-			</div>
-
-            <div class="row">
-				<div class="mb-3 col-sm-3">
-					<label for="hrdlog_username"><?= __("HRDLog.net Username"); ?></label>
-					<input type="text" class="form-control" name="hrdlog_username" id="hrdlog_username" aria-describedby="hrdlog_usernameHelp" value="<?php if(isset($hrdlog_username)) { echo $hrdlog_username; } ?>">
-                    <small id="hrdlog_usernameHelp" class="form-text text-muted"><?= __("The username you are registered with at HRDlog.net (usually your callsign)."); ?></a></small>
-                </div>
-                <div class="mb-3 col-sm-3">
-					<label for="hrdlog_code"><?= __("HRDLog.net API Key"); ?></label>
-					<input type="text" class="form-control" name="hrdlog_code" id="hrdlog_code" aria-describedby="hrdlog_codeHelp" value="<?php if(isset($hrdlog_code)) { echo $hrdlog_code; } ?>">
-                    <small id="hrdlog_codeHelp" class="form-text text-muted"><?= sprintf(_pgettext("HRDLog.net Userprofile page", "Create your API Code on your %s"), "<a href='http://www.hrdlog.net/EditUser.aspx' target='_blank'>".__("HRDLog.net Userprofile page")."</a>"); ?></a></small>
-                </div>
-                <div class="mb-3 col-sm-3">
-                    <label for="hrdlogrealtime"><?= __("HRDLog.net Logbook Realtime Upload"); ?></label>
-					<select class="form-select" id="hrdlogrealtime" name="hrdlogrealtime">
-						<option value="1" <?php if (isset($hrdlogrealtime) && $hrdlogrealtime == 1) { echo ' selected="selected"'; } ?>><?= __("Yes"); ?></option>
-						<option value="0" <?php if (isset($hrdlogrealtime) && $hrdlogrealtime == 0) { echo ' selected="selected"'; } ?>><?= __("No"); ?></option>
-						<option value="-1" <?php if (!isset($hrdlogrealtime) || ($hrdlogrealtime != 1 && $hrdlogrealtime != 0)) { echo ' selected="selected"'; } ?>><?= __("Disabled"); ?></option>
-					</select>
-                </div>
-            </div>
-
-			<div class="alert alert-warning" role="alert">
-				<?php echo "QRZ.com - " . __("Subscription Required"); ?>
-			</div>
-
-            <div class="row">
-                <div class="mb-3 col-sm-6">
-                    <label for="qrzApiKey"><?php echo _pgettext("Probably no translation needed","QRZ.com Logbook API Key"); ?></label>
-					<div class="input-group">
-						<input type="text" class="form-control" name="qrzapikey" pattern="^([A-F0-9]{4}-){3}[A-F0-9]{4}$" id="qrzApiKey" aria-describedby="qrzApiKeyHelp" value="<?php if(isset($qrzapikey)) { echo $qrzapikey; } ?>">
-						<button class="btn btn-secondary" type="button" id="qrz_apitest_btn"><?= __("Test API-Key"); ?></button>
+	<div class="row">
+		<!-- Basic Station Info -->
+		<div class="col-md">
+			<div class="card">
+				<h5 class="card-header"><?php echo $page_title; ?></h5>
+				<div class="card-body">
+					<div class="mb-3">
+						<label for="stationNameInput"><?= __("Location Name"); ?></label>
+						<input type="text" class="form-control" name="station_profile_name" id="stationNameInput" aria-describedby="stationNameInputHelp" placeholder="<?php echo _pgettext("Station Location Setup", "Home QTH"); ?>" value="<?php if(isset($station_profile_name)) { echo $station_profile_name; } ?>" required>
+						<small id="stationNameInputHelp" class="form-text text-muted"><?= sprintf(__("Shortname for the station location. For example: %s"), _pgettext("Station Location Setup", "Home QTH")); ?></small>
+					</div>
+					<div class="mb-3">
+						<label for="stationCallsignInput"><?= __("Station Callsign"); ?></label>
+						<input type="text" class="form-control uppercase" name="station_callsign" id="stationCallsignInput" aria-describedby="stationCallsignInputHelp" placeholder="4W7EST" value="<?php if(isset($station_callsign)) { echo $station_callsign; } ?>" required>
+						<small id="stationCallsignInputHelp" class="form-text text-muted"><?= __("Station callsign. For example: 4W7EST/P"); ?></small>
+					</div>
+					<div class="mb-3">
+						<label for="stationPowerInput"><?= __("Station Power (W)"); ?></label>
+						<input type="number" class="form-control" name="station_power" id="stationPowerInput" step="1" aria-describedby="stationPowerInputHelp" placeholder="10" value="<?php if(isset($station_power)) { echo $station_power; } ?>">
+						<small id="stationPowerInputHelp" class="form-text text-muted"><?= __("Default station power in Watt. Overwritten by CAT."); ?></small>
 					</div>
-					<div class="alert mt-3" style="display: none;" id="qrz_apitest_msg"></div>
-                    <small id="qrzApiKeyHelp" class="form-text text-muted"><?= sprintf(_pgettext("the QRZ.com Logbook settings page", "Find your API key on %s"), "<a href='https://logbook.qrz.com/logbook' target='_blank'>".__("the QRZ.com Logbook settings page")."</a>"); ?></a></small>
-                </div>
-                <div class="mb-3 col-sm-6">
-                    <label for="qrzrealtime"><?= __("QRZ.com Logbook Upload"); ?></label>
-                    <select class="form-select" id="qrzrealtime" name="qrzrealtime">
-                        <option value="-1" <?php if (!isset($qrzrealtime) || ($qrzrealtime != 1 && $qrzrealtime != 0)) { echo ' selected="selected"'; } ?>><?= __("Disabled"); ?></option>
-                        <option value="1" <?php if (isset($qrzrealtime) && $qrzrealtime == 1) { echo ' selected="selected"'; } ?>><?= __("Realtime"); ?></option>
-                        <option value="0" <?php if (isset($qrzrealtime) && $qrzrealtime == 0) { echo ' selected="selected"'; } ?>><?= __("Enabled"); ?></option>
-                    </select>
-                </div>
-            </div>
-
-			<div class="row">
-				<div class="mb-3 col-sm-6">
-					<label for="webadifApiKey"><?php echo _pgettext("Probably no translation needed","QO-100 Dx Club API Key"); ?></label>
-					<input type="text" class="form-control" name="webadifapikey" id="webadifApiKey" aria-describedby="webadifApiKeyHelp" value="<?php if(isset($webadifapikey)) { echo $webadifapikey; } ?>">
-					<small id="webadifApiKeyHelp" class="form-text text-muted"><?= sprintf(_pgettext("QO-100 Dx Club's profile page", "Create your API key on your %s"), "<a href='https://qo100dx.club' target='_blank'>".__("QO-100 Dx Club's profile page")."</a>"); ?></a></small>
-				</div>
-				<div class="mb-3 col-sm-6">
-					<label for="webadifrealtime"><?= __("QO-100 Dx Club Realtime Upload"); ?></label>
-					<select class="form-select" id="webadifrealtime" name="webadifrealtime">
-						<option value="1" <?php if (isset($webadifrealtime) && $webadifrealtime == 1) { echo ' selected="selected"'; } ?>><?= __("Yes"); ?></option>
-						<option value="0" <?php if (!isset($webadifrealtime) || $webadifrealtime != 1) { echo ' selected="selected"'; } ?>><?= __("No"); ?></option>
-					</select>
 				</div>
 			</div>
+		</div>
+	</div>
+
+	<div class="row">
+		<!-- Location -->
+		<div class="col-md">
+			<div class="card">
+				<h5 class="card-header"><?= __("Location"); ?></h5>
+				<div class="card-body">
+					<!-- DXCC -->
+					<div class="mb-3">
+						<label for="stationDXCCInput"><?= __("Station DXCC"); ?></label>
+						<?php if ($dxcc_list->num_rows() > 0) { ?>
+						<select class="form-control" id="dxcc_id" name="dxcc" aria-describedby="stationCallsignInputHelp" required>
+							<option value="" <?php if (!isset($dxcc) || $dxcc == "") { echo ' selected'; } ?>><?= __("Please select one"); ?></option>
+							<?php foreach ($dxcc_list->result() as $dxcc_item) { ?>
+							<option value="<?php echo $dxcc_item->adif; ?>" <?php if(isset($dxcc) && $dxcc_item->adif == $dxcc) { echo ' selected'; } ?>><?php echo ucwords(strtolower($dxcc_item->name)) . ' - ' . $dxcc_item->prefix; if ($dxcc_item->end != NULL) echo ' ('.__("Deleted DXCC").')';?>
+							</option>
+							<?php } ?>
+						</select>
+						<?php } ?>
+						<small id="stationDXCCInputHelp" class="form-text text-muted"><?= __("Station DXCC entity. For example: Bolivia"); ?></small>
+						<div class="alert alert-danger" role="alert" id="warningMessageDXCC" style="display: none"> </div>
+					</div>
+
+					<!-- City -->
+					<div class="mb-3">
+						<label for="stationCityInput"><?= __("Station City"); ?></label>
+						<input type="text" class="form-control" name="city" id="stationCityInput" aria-describedby="stationCityInputHelp" value="<?php if(isset($city)) { echo $city; } ?>">
+						<small id="stationCityInputHelp" class="form-text text-muted"><?= __("Station city. For example: Oslo"); ?></small>
+					</div>
+
+					<!-- State -->
+					<div class="mb-3" id="location_state">
+						<label for="stateInput" id="stateInputLabel"></label>
+						<select class="form-select" name="station_state" id="stateDropdown">
+							<option value=""></option>
+						</select>
+						<small id="StateHelp" class="form-text text-muted"><?= __("Station state. Applies to certain countries only."); ?></small>
+					</div>
+
+					<!-- US County -->
+					<div class="mb-3" id="location_us_county">
+						<label for="stationCntyInput"><?= __("Station County"); ?></label>
+						<input type="text" class="form-control" name="station_cnty" id="stationCntyInputEdit" aria-describedby="stationCntyInputHelp" value="">
+						<small id="stationCntyInputHelp" class="form-text text-muted"><?= __("Station County (Only used for specific DXCCs)."); ?></small>
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<!-- Zones -->
+		<div class="col-md">
+			<div class="card">
+				<h5 class="card-header"><?= __("Zones"); ?></h5>
+				<div class="card-body">
+					<!-- CQ Zone -->
+					<div class="mb-3">
+						<label for="stationCQZoneInput"><?= __("CQ Zone"); ?></label>
+						<select class="form-select" id="stationCQZoneInput" name="station_cq" required>
+						<?php
+							for ($i = 1; $i<=40; $i++) {
+								echo '<option value='.$i;
+								if (isset($station_cq) && $station_cq!= '' && $station_cq == $i) { echo ' selected'; }
+								echo '>'. $i .'</option>';
+							}
+						?>
+						</select>
+						<small id="stationCQInputHelp" class="form-text text-muted"><?= sprintf(_pgettext("uses 'click here'","If you don't know your CQ Zone then %s to find it!"),"<a href='https://zone-check.eu/?m=cq' target='_blank'>".__("click here")."</a> "); ?></small>
+					</div>
+
+					<!-- ITU Zone -->
+					<div class="mb-3">
+						<label for="stationITUZoneInput"><?= __("ITU Zone"); ?></label>
+						<select class="form-select" id="stationITUZoneInput" name="station_itu" required>
+							<?php
+								for ($i = 1; $i<=90; $i++) {
+								echo '<option value='. $i;
+								if (isset($station_itu) && $station_itu!= '' && $station_itu == $i) { echo ' selected'; }
+								echo '>'. $i .'</option>';
+								}
+							?>
+						</select>
+						<small id="stationITUInputHelp" class="form-text text-muted"><?= sprintf(_pgettext("uses 'click here'","If you don't know your ITU Zone then %s to find it!"),"<a href='https://zone-check.eu/?m=itu' target='_blank'>".__("click here")."</a> "); ?></small>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<div class="row">
+		<!-- Gridsquare -->
+		<div class="col-md">
+			<div class="card">
+				<h5 class="card-header"><?= __("Station Gridsquare"); ?></h5>
+				<div class="card-body">
+					<div class="mb-3">
+						<label for="stationGridsquareInput"><?= __("Station Gridsquare"); ?></label>
+						<div class="input-group mb-3">
+							<input type="text" class="form-control uppercase" name="gridsquare" id="stationGridsquareInput" aria-describedby="stationGridInputHelp" value="<?php if(isset($gridsquare)) { echo $gridsquare; } ?>" required>
+							<div class="input-group-append">
+								<button type="button" class="btn btn-outline-secondary" onclick="getLocation()"><i class="fas fa-compass"></i> <?= __("Get Gridsquare"); ?></button>
+							</div>
+						</div>
+						<small id="stationGridInputHelp" class="form-text text-muted"><?= sprintf(_pgettext("uses 'click here'", "Station gridsquare. For example: HM54AP. If you don't know your grid square then %s!"), "<a href='https://zone-check.eu/?m=loc' target='_blank'>".__("click here")."</a>"); ?></small><br>
+						<small id="stationGridInputHelp" class="form-text text-muted"><?= __("If you are located on a grid line, enter multiple grid squares separated with commas. For example: IO77,IO78,IO87,IO88."); ?></small>
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<!-- IOTA -->
+		<div class="col-md">
+			<div class="card">
+				<h5 class="card-header"><?= __("IOTA"); ?></h5>
+				<div class="card-body">
+					<div class="mb-3">
+						<label for="stationIOTAInput"><?= __("IOTA Reference"); ?></label>
+						<select class="form-select" name="iota" id="stationIOTAInput" aria-describedby="stationIOTAInputHelp" placeholder="EU-005">
+							<option value =""></option>
+							<?php
+								foreach($iota_list as $i){
+									echo '<option value='.$i->tag;
+									if(isset($iota) && $i->tag == $iota) { echo ' selected'; }
+									echo '>'.$i->tag.' - '.$i->name.'</option>';
+								}
+							?>
+						</select>
+						<small id="stationIOTAInputHelp" class="form-text text-muted"><?= __("Station IOTA reference. For example: EU-005"); ?></small>
+						<small id="stationIOTAInputHelp" class="form-text text-muted"><?= sprintf(__("You can look up IOTA references at the %s."), "<a target='_blank' href='https://www.iota-world.org/iota-directory/annex-f-short-title-iota-reference-number-list.html'>".__("IOTA World website")."</a>"); ?></small>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<div class="row">
+		<!-- SOTA -->
+		<div class="col-md">
+			<div class="card">
+				<h5 class="card-header"><?= __("SOTA"); ?></h5>
+				<div class="card-body">
+					<div class="mb-3">
+						<label for="stationSOTAInput"><?= __("SOTA Reference"); ?></label>
+						<input type="text" class="form-control uppercase" name="sota" id="stationSOTAInput" aria-describedby="stationSOTAInputHelp" value="<?php if(isset($sota)) { echo $sota; } ?>">
+						<small id="stationSOTAInputHelp" class="form-text text-muted"><?= sprintf(__("Station SOTA reference. You can look up SOTA references at the %s."), "<a target='_blank' href='https://www.sotamaps.org/'>".__("SOTA Maps website")."</a>"); ?></small>
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<!-- WWFF -->
+		<div class="col-md">
+			<div class="card">
+				<h5 class="card-header"><?= __("WWFF"); ?></h5>
+				<div class="card-body">
+					<div class="mb-3">
+						<label for="stationWWFFInput"><?= __("WWFF Reference"); ?></label>
+						<input type="text" class="form-control uppercase" name="wwff" id="stationWWFFInput" aria-describedby="stationWWFFInputHelp" value="<?php if(isset($wwff)) { echo $wwff; } ?>">
+						<small id="stationWWFFInputHelp" class="form-text text-muted"><?= sprintf(__("Station WWFF reference. You can look up WWFF references at the %s."), "<a target='_blank' href='https://www.cqgma.org/mvs/'>".__("GMA Map website")."</a>"); ?></small>
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<!-- POTA -->
+		<div class="col-md">
+			<div class="card">
+				<h5 class="card-header"><?= __("POTA"); ?></h5>
+				<div class="card-body">
+					<div class="mb-3">
+						<label for="stationPOTAInput"><?= __("POTA Reference(s)"); ?></label>
+						<input type="text" class="form-control uppercase" name="pota" id="stationPOTAInput" aria-describedby="stationPOTAInputHelp" value="<?php if(isset($pota)) { echo $pota; } ?>">
+						<small id="stationPOTAInputHelp" class="form-text text-muted"><?= sprintf(__("Station POTA reference(s). Multiple comma separated values allowed. You can look up POTA references at the %s."), "<a target='_blank' href='https://pota.app/#/map/'>".__("POTA Map website")."</a>"); ?></small>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<div class="row">
+		<!-- Special Interest Group -->
+		<div class="col-md">
+			<div class="card">
+				<h5 class="card-header"><?= __("Special Interest Group"); ?></h5>
+				<div class="card-body">
+					<div class="mb-3">
+						<label for="stationSigInput"><?= __("Special Interest Group Name"); ?></label>
+						<input type="text" class="form-control uppercase" name="sig" id="stationSigInput" aria-describedby="stationSigInputHelp" value="<?php if(isset($sig)) { echo $sig; } ?>">
+						<small id="stationSigInputHelp" class="form-text text-muted"><?= __("Station Special Interest Group Name (e.g. GMA)."); ?></small>
+					</div>
+					<div class="mb-3">
+						<label for="stationSigInfoInput"><?= __("Special Interest Group Information"); ?></label>
+						<input type="text" class="form-control uppercase" name="sig_info" id="stationSigInfoInput" aria-describedby="stationSigInfoInputHelp" value="<?php if(isset($sig_info)) { echo $sig_info; } ?>">
+						<small id="stationSigInfoInputHelp" class="form-text text-muted"><?= __("Station Special Interest Group Info (e.g. DA/NW-357)."); ?></small>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<div class="row">
+		<!-- eQSL -->
+		<div class="col-md">
+			<div class="card">
+				<h5 class="card-header"><?= __("eQSL"); ?> <span class="badge text-bg-warning"><?= sprintf(__("Trouble? Check the %swiki%s."), '<a href="https://github.com/wavelog/wavelog/wiki/eQSL#read-common-pitfalls-with-eqsl" target="_blank">', '</a>'); ?></span></h5>
+				<div class="card-body">
+					<div class="mb-3">
+						<label for="eqslNickname"><?php echo _pgettext("Probably no translation needed","eQSL QTH Nickname"); ?></label>
+						<input type="text" class="form-control" name="eqslnickname" id="eqslNickname" aria-describedby="eqslhelp" value="<?php if(isset($eqslnickname)) { echo $eqslnickname; } ?>">
+						<small id="eqslhelp" class="form-text text-muted"><?= __("The QTH Nickname which is configured in your eQSL Profile"); ?></small>
+					</div>
+					<div class="mb-3">
+						<label for="eqslDefaultQSLMsg"><?= __("Default QSLMSG"); ?></label>
+						<label class="position-absolute end-0 mb-2 me-3" for="eqslDefaultQSLMsg" id="charsLeft"> </label>
+						<textarea class="form-control" name="eqsl_default_qslmsg" id="eqslDefaultQSLMsg" aria-describedby="eqsldefaultqslmsghelp" maxlength="240" rows="2" style="width:100%;"><?php if (isset($eqsl_default_qslmsg) && $eqsl_default_qslmsg != "") { echo $eqsl_default_qslmsg; } ?></textarea>
+						<small id="eqsldefaultqslmsghelp" class="form-text text-muted"><?= __("Define a default message that will be populated and sent for each QSO for this station location."); ?></small>						
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<!-- QRZ.com -->
+		<div class="col-md">
+			<div class="card">
+				<h5 class="card-header">QRZ.com <span class="badge text-bg-warning"> <?= __("Subscription Required"); ?></span></h5> <!-- "QRZ.com" does not need Multilanguage Support -->
+				<div class="card-body">
+					<div class="mb-3">
+						<label for="qrzApiKey">QRZ.com Logbook API Key</label>
+						<div class="input-group">
+							<input type="text" class="form-control" name="qrzapikey" pattern="^([A-F0-9]{4}-){3}[A-F0-9]{4}$" id="qrzApiKey" aria-describedby="qrzApiKeyHelp" value="<?php if(isset($qrzapikey)) { echo $qrzapikey; } ?>">
+							<button class="btn btn-secondary" type="button" id="qrz_apitest_btn"><?= __("Test API-Key"); ?></button>
+						</div>
+						<div class="alert mt-3" style="display: none;" id="qrz_apitest_msg"></div>
+						<small id="qrzApiKeyHelp" class="form-text text-muted"><?= sprintf(_pgettext("the QRZ.com Logbook settings page", "Find your API key on %s"), "<a href='https://logbook.qrz.com/logbook' target='_blank'>".__("the QRZ.com Logbook settings page")."</a>"); ?></a></small>
+					</div>
+					<div class="mb-3">
+						<label for="qrzrealtime"><?= __("QRZ.com Logbook Upload"); ?></label>
+						<select class="form-select" id="qrzrealtime" name="qrzrealtime">
+							<option value="-1" <?php if (!isset($qrzrealtime) || ($qrzrealtime != 1 && $qrzrealtime != 0)) { echo ' selected'; } ?>><?= __("Disabled"); ?></option>
+							<option value="1" <?php if (isset($qrzrealtime) && $qrzrealtime == 1) { echo ' selected'; } ?>><?= __("Realtime"); ?></option>
+							<option value="0" <?php if (isset($qrzrealtime) && $qrzrealtime == 0) { echo ' selected'; } ?>><?= __("Enabled"); ?></option>
+						</select>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<div class="row">
+		<!-- Clublog -->
+		<div class="col-md">
+			<div class="card">
+				<h5 class="card-header"><?= __("Clublog"); ?></h5>
+				<div class="card-body">
+					<div class="mb-3">
+						<label for="clublogignore"><?= __("Ignore Clublog Upload"); ?></label>
+						<select class="form-select" id="clublogignore" name="clublogignore">
+							<option value="1" <?php if (isset($clublogignore) && $clublogignore == 1) { echo ' selected'; } ?>><?= __("Yes"); ?></option>
+							<option value="0" <?php if (!isset($clublogignore) || $clublogignore != 1) { echo ' selected'; } ?>><?= __("No"); ?></option>
+						</select>
+						<small class="form-text text-muted"><?= __("If enabled, the QSOs made from this location will not be uploaded to Clublog. If this is deactivated on it's own please check if the Call is properly configured at Clublog"); ?></small>
+					</div>
+					<div class="mb-3" id="clublogrealtimediv">
+						<label for="clublogrealtime"><?= __("ClubLog Realtime Upload"); ?></label>
+						<select class="form-select" id="clublogrealtime" name="clublogrealtime">
+							<option value="1" <?php if (isset($clublogrealtime) && $clublogrealtime == 1) { echo ' selected'; } ?>><?= __("Yes"); ?></option>
+							<option value="0" <?php if (!isset($clublogrealtime) || $clublogrealtime != 1) { echo ' selected'; } ?>><?= __("No"); ?></option>
+						</select>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<div class="row">
+		<!-- HRDLog.net -->
+		<div class="col-md">
+			<div class="card">
+				<h5 class="card-header">HRDLog.net</h5>
+				<div class="card-body">
+					<div class="mb-3">
+						<label for="hrdlog_username"><?= __("HRDLog.net Username"); ?></label>
+						<input type="text" class="form-control" name="hrdlog_username" id="hrdlog_username" aria-describedby="hrdlog_usernameHelp" value="<?php if(isset($hrdlog_username)) { echo $hrdlog_username; } ?>">
+						<small id="hrdlog_usernameHelp" class="form-text text-muted"><?= __("The username you are registered with at HRDlog.net (usually your callsign)."); ?></a></small>
+					</div>
+					<div class="mb-3">
+						<label for="hrdlog_code"><?= __("HRDLog.net API Key"); ?></label>
+						<input type="text" class="form-control" name="hrdlog_code" id="hrdlog_code" aria-describedby="hrdlog_codeHelp" value="<?php if(isset($hrdlog_code)) { echo $hrdlog_code; } ?>">
+						<small id="hrdlog_codeHelp" class="form-text text-muted"><?= sprintf(_pgettext("HRDLog.net Userprofile page", "Create your API Code on your %s"), "<a href='http://www.hrdlog.net/EditUser.aspx' target='_blank'>".__("HRDLog.net Userprofile page")."</a>"); ?></a></small>
+					</div>
+					<div class="mb-3">
+						<label for="hrdlogrealtime"><?= __("HRDLog.net Logbook Realtime Upload"); ?></label>
+						<select class="form-select" id="hrdlogrealtime" name="hrdlogrealtime">
+							<option value="1" <?php if (isset($hrdlogrealtime) && $hrdlogrealtime == 1) { echo ' selected'; } ?>><?= __("Yes"); ?></option>
+							<option value="0" <?php if (isset($hrdlogrealtime) && $hrdlogrealtime == 0) { echo ' selected'; } ?>><?= __("No"); ?></option>
+							<option value="-1" <?php if (!isset($hrdlogrealtime) || ($hrdlogrealtime != 1 && $hrdlogrealtime != 0)) { echo ' selected'; } ?>><?= __("Disabled"); ?></option>
+						</select>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<div class="row">
+		<!-- QO-100 Dx Club -->
+		<div class="col-md">
+			<div class="card">
+				<h5 class="card-header">QO-100 Dx Club</h5>
+				<div class="card-body">
+					<div class="mb-3">
+						<label for="webadifApiKey"><?php echo _pgettext("Probably no translation needed","QO-100 Dx Club API Key"); ?></label>
+						<input type="text" class="form-control" name="webadifapikey" id="webadifApiKey" aria-describedby="webadifApiKeyHelp" value="<?php if(isset($webadifapikey)) { echo $webadifapikey; } ?>">
+						<small id="webadifApiKeyHelp" class="form-text text-muted"><?= sprintf(_pgettext("QO-100 Dx Club's profile page", "Create your API key on your %s"), "<a href='https://qo100dx.club' target='_blank'>".__("QO-100 Dx Club's profile page")."</a>"); ?></a></small>
+					</div>
+					<div class="mb-3">
+						<label for="webadifrealtime"><?= __("QO-100 Dx Club Realtime Upload"); ?></label>
+						<select class="form-select" id="webadifrealtime" name="webadifrealtime">
+							<option value="1" <?php if (isset($webadifrealtime) && $webadifrealtime == 1) { echo ' selected'; } ?>><?= __("Yes"); ?></option>
+							<option value="0" <?php if (!isset($webadifrealtime) || $webadifrealtime != 1) { echo ' selected'; } ?>><?= __("No"); ?></option>
+						</select>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
 
 <?php if (!($this->config->item('disable_oqrs') ?? false)) { ?>
-			<div class="mb-3">
-				<label for="oqrs"><?= __("OQRS Enabled"); ?></label>
-				<select class="form-select" id="oqrs" name="oqrs">
-					<option value="0" <?php if (!isset($oqrs) || $oqrs != 1) { echo ' selected="selected"'; } ?>><?= __("No"); ?></option>
-					<option value="1" <?php if (isset($oqrs) && $oqrs == 1) { echo ' selected="selected"'; } ?>><?= __("Yes"); ?></option>
-				</select>
-			</div>
-			<div class="mb-3">
+	<div class="row">
+		<!-- OQRS -->
+		<div class="col-md">
+			<div class="card">
+				<h5 class="card-header">OQRS</h5>
+				<div class="card-body">
+					<div class="mb-3">
+						<label for="oqrs"><?= __("OQRS Enabled"); ?></label>
+						<select class="form-select" id="oqrs" name="oqrs">
+							<option value="0" <?php if (!isset($oqrs) || $oqrs != 1) { echo ' selected'; } ?>><?= __("No"); ?></option>
+							<option value="1" <?php if (isset($oqrs) && $oqrs == 1) { echo ' selected'; } ?>><?= __("Yes"); ?></option>
+						</select>
+					</div>
+					<div class="mb-3">
 						<label for="oqrs"><?= __("OQRS Email alert"); ?></label>
 						<select class="form-select" id="oqrsemail" name="oqrsemail">
-						<option value="0" <?php if (!isset($oqrsemail) || $oqrsemail != 1) { echo ' selected="selected"'; } ?>><?= __("No"); ?></option>
-						<option value="1" <?php if (isset($oqrsemail) && $oqrsemail == 1) { echo ' selected="selected"'; } ?>><?= __("Yes"); ?></option>
+							<option value="0" <?php if (!isset($oqrsemail) || $oqrsemail != 1) { echo ' selected'; } ?>><?= __("No"); ?></option>
+							<option value="1" <?php if (isset($oqrsemail) && $oqrsemail == 1) { echo ' selected'; } ?>><?= __("Yes"); ?></option>
 						</select>
 						<small id="oqrsemailHelp" class="form-text text-muted"><?= __("Make sure email is set up under admin and global options."); ?></small>
 					</div>
-			<div class="mb-3">
-				<label for="oqrstext"><?= __("OQRS Text"); ?></label>
-				<input type="text" class="form-control" name="oqrstext" id="oqrstext" aria-describedby="oqrstextHelp" value="<?php if(isset($oqrstext)) { echo $oqrstext; } ?>">
-				<small id="oqrstextHelp" class="form-text text-muted"><?= __("Some info you want to add regarding QSL'ing."); ?></small>
+					<div class="mb-3">
+						<label for="oqrstext"><?= __("OQRS Text"); ?></label>
+						<input type="text" class="form-control" name="oqrstext" id="oqrstext" aria-describedby="oqrstextHelp" value="<?php if(isset($oqrstext)) { echo $oqrstext; } ?>">
+						<small id="oqrstextHelp" class="form-text text-muted"><?= __("Some info you want to add regarding QSL'ing."); ?></small>
+					</div>
+				</div>
 			</div>
+		</div>
+	</div>
 <?php } ?>
 
-			<button type="submit" class="btn btn-primary"><i class="fas fa-plus-square"></i> <?= __("Create"); ?> <?= __("Station Location"); ?></button>
+	<button type="submit" class="btn btn-primary" style="margin-bottom: 30px;"><i class="fas fa-plus-square"></i> <?= __("Create"); ?> <?= __("Station Location"); ?></button>
 
-		</form>
-  </div>
-</div>
-
-<br>
+	</form>
 
 </div>
diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php
index b6659bef3..727edf32f 100644
--- a/application/views/station_profile/edit.php
+++ b/application/views/station_profile/edit.php
@@ -27,11 +27,11 @@ if ($dxcc_list->result() > 0) {
 
 <div class="container" id="create_station_profile">
 
-<br>
+	<br>
 	<?php if($this->session->flashdata('message')) { ?>
 		<!-- Display Message -->
 		<div class="alert-message error">
-		  <p><?php echo $this->session->flashdata('message'); ?></p>
+			<p><?php echo $this->session->flashdata('message'); ?></p>
 		</div>
 	<?php } ?>
 
@@ -43,11 +43,11 @@ if ($dxcc_list->result() > 0) {
 
 	<?php $this->load->helper('form'); ?>
 
-   <?php if(validation_errors()) { ?>
-      <div class="alert alert-danger">
-         <?php echo validation_errors(); ?>
-      </div>
-   <?php } ?>
+	<?php if(validation_errors()) { ?>
+		<div class="alert alert-danger">
+			<?php echo validation_errors(); ?>
+		</div>
+	<?php } ?>
 
 	<?php if($my_station_profile->station_id != NULL) {
 		$form_action = __("Update");
@@ -62,23 +62,21 @@ if ($dxcc_list->result() > 0) {
 	<?php } ?>
 
 	<div class="row">
+		<!-- Basic Station Info -->
 		<div class="col-md">
 			<div class="card">
-				<div class="card-header"><?php echo $page_title; ?> <?php echo "(" . __("Callsign") . ": "; ?> <?php echo $my_station_profile->station_callsign; ?>)</div>
+				<h5 class="card-header"><?php echo $page_title; ?> <?php echo "(" . __("Callsign") . ": "; ?> <?php echo $my_station_profile->station_callsign; ?>)</h5>
 				<div class="card-body">
-
 					<div class="mb-3">
 						<label for="stationNameInput"><?= __("Location Name"); ?></label>
 						<input type="text" class="form-control" name="station_profile_name" id="stationNameInput" aria-describedby="stationNameInputHelp" value="<?php if(set_value('station_profile_name') != "") { echo set_value('station_profile_name'); } else { echo $my_station_profile->station_profile_name; } ?>" required>
 						<small id="stationNameInputHelp" class="form-text text-muted"><?= sprintf(__("Shortname for the station location. For example: %s"), _pgettext("Station Location Setup", "Home QTH")); ?></small>
 					</div>
-
 					<div class="mb-3">
 						<label for="stationCallsignInput"><?= __("Station Callsign"); ?></label>
 						<input type="text" class="form-control uppercase" pattern="^\S+$" name="station_callsign" id="stationCallsignInput" aria-describedby="stationCallsignInputHelp" value="<?php if(set_value('station_callsign') != "") { echo set_value('station_callsign'); } else { echo $my_station_profile->station_callsign; } ?>" required>
 						<small id="stationCallsignInputHelp" class="form-text text-muted"><?= __("Station callsign. For example: 4W7EST/P"); ?></small>
 					</div>
-
 					<div class="mb-3">
 						<label for="stationPowerInput"><?= __("Station Power (W)"); ?></label>
 						<input type="number" class="form-control" name="station_power" step="1" id="stationPowerInput" aria-describedby="stationPowerInputHelp" value="<?php if(set_value('station_power') != "") { echo set_value('station_power'); } else { echo $my_station_profile->station_power; } ?>">
@@ -90,27 +88,26 @@ if ($dxcc_list->result() > 0) {
 	</div>
 
 	<div class="row">
-		<!-- Location Ends -->
+		<!-- Location -->
 		<div class="col-md">
 			<div class="card">
-				<div class="card-header"><?= __("Location"); ?></div>
+				<h5 class="card-header"><?= __("Location"); ?></h5>
 				<div class="card-body">
 					<!-- DXCC -->
 					<div class="mb-3">
-					    <label for="stationDXCCInput"><?= __("Station DXCC"); ?></label>
-					    <?php if ($dxcc_list->num_rows() > 0) { ?>
-					        <select class="form-control" id="dxcc_id" name="dxcc" aria-describedby="stationCallsignInputHelp" required>
-					            <option value="" <?php if($my_station_profile->station_dxcc ?? '' == "") { ?>selected<?php } ?>><?= __("Please select one"); ?></option>
-					            <?php foreach ($dxcc_list->result() as $dxcc) { ?>
-					                <?php $isDeleted = $dxcc->end !== NULL; ?>
-					                <option value="<?php echo $dxcc->adif; ?>" <?php if($my_station_profile->station_dxcc == $dxcc->adif) { ?>selected<?php } ?>>
-					                    <?php echo ucwords(strtolower($dxcc->name)) . ' - ' . $dxcc->prefix;
-					                    if ($isDeleted) {
-					                        echo ' (' . __("Deleted DXCC") . ')';
-					                    }
-					                    ?>
-					                </option>
-					            <?php } ?>
+						<label for="stationDXCCInput"><?= __("Station DXCC"); ?></label>
+						<?php if ($dxcc_list->num_rows() > 0) { ?>
+								<select class="form-control" id="dxcc_id" name="dxcc" aria-describedby="stationCallsignInputHelp" required>
+								<option value="" <?php if ($my_station_profile->station_dxcc ?? '' == "") { echo ' selected'; } ?>><?= __("Please select one"); ?></option>
+								<?php foreach ($dxcc_list->result() as $dxcc) { ?>
+									<?php $isDeleted = $dxcc->end !== NULL; ?>
+									<option value="<?php echo $dxcc->adif; ?>"<?php if($my_station_profile->station_dxcc == $dxcc->adif) { echo ' selected'; } ?>>
+										<?php
+											echo ucwords(strtolower($dxcc->name)) . ' - ' . $dxcc->prefix;
+											if ($isDeleted) { echo ' (' . __("Deleted DXCC") . ')'; }
+										?>
+									</option>
+								<?php } ?>
 					        </select>
 					        <?php } ?>
 					    <small id="stationDXCCInputHelp" class="form-text text-muted"><?= __("Station DXCC entity. For example: Bolivia"); ?></small>
@@ -121,8 +118,8 @@ if ($dxcc_list->result() > 0) {
 					<div class="mb-3">
 						<label for="stationCityInput"><?= __("Station City"); ?></label>
 						<input type="text" class="form-control" name="city" id="stationCityInput" aria-describedby="stationCityInputHelp" value="<?php if(set_value('city') != "") { echo set_value('city'); } else { echo $my_station_profile->station_city; } ?>">
-		    			<small id="stationCityInputHelp" class="form-text text-muted"><?= __("Station city. For example: Oslo"); ?></small>
-		  			</div>
+						<small id="stationCityInputHelp" class="form-text text-muted"><?= __("Station city. For example: Oslo"); ?></small>
+					</div>
 
 					<!-- State -->
 					<script>
@@ -145,12 +142,11 @@ if ($dxcc_list->result() > 0) {
 				</div>
 			</div>
 		</div>
-		<!-- Location Ends -->
 
 		<!-- Zones -->
 		<div class="col-md">
 			<div class="card">
-				<div class="card-header"><?= __("Zones"); ?></div>
+				<h5 class="card-header"><?= __("Zones"); ?></h5>
 				<div class="card-body">
 					<!-- CQ Zone -->
 					<div class="mb-3">
@@ -159,9 +155,7 @@ if ($dxcc_list->result() > 0) {
 							<?php
 							for ($i = 1; $i<=40; $i++) {
 								echo '<option value='. $i;
-								if ($my_station_profile->station_cq == $i) {
-									echo " selected=\"selected\"";
-								}
+								if ($my_station_profile->station_cq == $i) { echo ' selected'; }
 								echo '>'. $i .'</option>';
 							}
 							?>
@@ -171,77 +165,71 @@ if ($dxcc_list->result() > 0) {
 
 					<!-- ITU Zone -->
 					<div class="mb-3">
-                    	<label for="stationITUZoneInput"><?= __("ITU Zone"); ?></label>
-                    	<select class="form-select" id="stationITUZoneInput" name="station_itu" required>
+						<label for="stationITUZoneInput"><?= __("ITU Zone"); ?></label>
+						<select class="form-select" id="stationITUZoneInput" name="station_itu" required>
 							<?php
 							for ($i = 1; $i<=90; $i++) {
 								echo '<option value='. $i;
-								if ($my_station_profile->station_itu == $i) {
-									echo " selected=\"selected\"";
-								}
+								if ($my_station_profile->station_itu == $i) { echo ' selected'; }
 								echo '>'. $i .'</option>';
 							}
 							?>
-                    	</select>
-                    	<small id="stationITUInputHelp" class="form-text text-muted"><?= sprintf(_pgettext("uses 'click here'","If you don't know your ITU Zone then %s to find it!"),"<a href='https://zone-check.eu/?m=itu' target='_blank'>".__("click here")."</a> "); ?></small>
-                	</div>
-
+						</select>
+						<small id="stationITUInputHelp" class="form-text text-muted"><?= sprintf(_pgettext("uses 'click here'","If you don't know your ITU Zone then %s to find it!"),"<a href='https://zone-check.eu/?m=itu' target='_blank'>".__("click here")."</a> "); ?></small>
+					</div>
 				</div>
 			</div>
 		</div>
-		<!-- Zones End -->
 	</div>
 
 	<div class="row">
+		<!-- Gridsquare -->
 		<div class="col-md">
 			<div class="card">
 				<h5 class="card-header"><?= __("Station Gridsquare"); ?></h5>
 				<div class="card-body">
 					<div class="mb-3">
-		    			<label for="stationGridsquareInput"><?= __("Station Gridsquare"); ?></label>
-
+						<label for="stationGridsquareInput"><?= __("Station Gridsquare"); ?></label>
 						<div class="input-group mb-3">
-						<input type="text" class="form-control uppercase" name="gridsquare" id="stationGridsquareInput" aria-describedby="stationGridInputHelp" value="<?php if(set_value('gridsquare') != "") { echo set_value('gridsquare'); } else { echo $my_station_profile->station_gridsquare; } ?>" required>
+							<input type="text" class="form-control uppercase" name="gridsquare" id="stationGridsquareInput" aria-describedby="stationGridInputHelp" value="<?php if(set_value('gridsquare') != "") { echo set_value('gridsquare'); } else { echo $my_station_profile->station_gridsquare; } ?>" required>
 							<div class="input-group-append">
 								<button type="button" class="btn btn-outline-secondary" onclick="getLocation()"><i class="fas fa-compass"></i> <?= __("Get Gridsquare"); ?></button>
 							</div>
 						</div>
-
-		    <small id="stationGridInputHelp" class="form-text text-muted"><?= sprintf(_pgettext("uses 'click here'", "Station gridsquare. For example: HM54AP. If you don't know your grid square then %s!"), "<a href='https://zone-check.eu/?m=loc' target='_blank'>".__("click here")."</a>"); ?></small><br>
-		    			<small id="stationGridInputHelp" class="form-text text-muted"><?= __("If you are located on a grid line, enter multiple grid squares separated with commas. For example: IO77,IO78,IO87,IO88."); ?></small>
-		  			</div>
+						<small id="stationGridInputHelp" class="form-text text-muted"><?= sprintf(_pgettext("uses 'click here'", "Station gridsquare. For example: HM54AP. If you don't know your grid square then %s!"), "<a href='https://zone-check.eu/?m=loc' target='_blank'>".__("click here")."</a>"); ?></small><br>
+						<small id="stationGridInputHelp" class="form-text text-muted"><?= __("If you are located on a grid line, enter multiple grid squares separated with commas. For example: IO77,IO78,IO87,IO88."); ?></small>
+					</div>
 				</div>
 			</div>
 		</div>
 
+		<!-- IOTA -->
 		<div class="col-md">
 			<div class="card">
 				<h5 class="card-header"><?= __("IOTA"); ?></h5>
 				<div class="card-body">
 					<div class="mb-3">
-                		<label for="stationIOTAInput"><?= __("IOTA Reference"); ?></label>
-                		<select class="form-select" name="iota" id="stationIOTAInput" aria-describedby="stationIOTAInputHelp" placeholder="EU-005">
-                    		<option value =""></option>
-                    		<?php
-                    			foreach($iota_list as $i){
-                        		echo '<option value=' . $i->tag;
-		                        if ($my_station_profile->station_iota == $i->tag) {
-        		                    echo " selected =\"selected\"";
-                		        }
-                        		echo '>' . $i->tag . ' - ' . $i->name . '</option>';
-                    			}
-                    		?>
-                		</select>
-
+						<label for="stationIOTAInput"><?= __("IOTA Reference"); ?></label>
+						<select class="form-select" name="iota" id="stationIOTAInput" aria-describedby="stationIOTAInputHelp" placeholder="EU-005">
+							<option value =""></option>
+							<?php
+								foreach($iota_list as $i){
+									echo '<option value=' . $i->tag;
+									if ($my_station_profile->station_iota == $i->tag) { echo ' selected'; }
+									echo '>' . $i->tag . ' - ' . $i->name . '</option>';
+								}
+							?>
+						</select>
 						<small id="stationIOTAInputHelp" class="form-text text-muted"><?= __("Station IOTA reference. For example: EU-005"); ?></small>
-                		<small id="stationIOTAInputHelp" class="form-text text-muted"><?= sprintf(__("You can look up IOTA references at the %s."), "<a target='_blank' href='https://www.iota-world.org/iota-directory/annex-f-short-title-iota-reference-number-list.html'>".__("IOTA World website")."</a>"); ?></small>
-            		</div>
+						<small id="stationIOTAInputHelp" class="form-text text-muted"><?= sprintf(__("You can look up IOTA references at the %s."), "<a target='_blank' href='https://www.iota-world.org/iota-directory/annex-f-short-title-iota-reference-number-list.html'>".__("IOTA World website")."</a>"); ?></small>
+					</div>
 				</div>
 			</div>
 		</div>
 	</div>
 
 	<div class="row">
+		<!-- SOTA -->
 		<div class="col-md">
 			<div class="card">
 				<h5 class="card-header"><?= __("SOTA"); ?></h5>
@@ -249,12 +237,13 @@ if ($dxcc_list->result() > 0) {
 					<div class="mb-3">
 						<label for="stationSOTAInput"><?= __("SOTA Reference"); ?></label>
 						<input type="text" class="form-control uppercase" name="sota" id="stationSOTAInput" aria-describedby="stationSOTAInputHelp" value="<?php if(set_value('sota') != "") { echo set_value('sota'); } else { echo $my_station_profile->station_sota; } ?>">
-		    			<small id="stationSOTAInputHelp" class="form-text text-muted"><?= sprintf(__("Station SOTA reference. You can look up SOTA references at the %s."), "<a target='_blank' href='https://www.sotamaps.org/'>".__("SOTA Maps website")."</a>"); ?></small>
-		  			</div>
+						<small id="stationSOTAInputHelp" class="form-text text-muted"><?= sprintf(__("Station SOTA reference. You can look up SOTA references at the %s."), "<a target='_blank' href='https://www.sotamaps.org/'>".__("SOTA Maps website")."</a>"); ?></small>
+					</div>
 				</div>
 			</div>
 		</div>
 
+		<!-- WWFF -->
 		<div class="col-md">
 			<div class="card">
 				<h5 class="card-header"><?= __("WWFF"); ?></h5>
@@ -268,6 +257,7 @@ if ($dxcc_list->result() > 0) {
 			</div>
 		</div>
 
+		<!-- POTA -->
 		<div class="col-md">
 			<div class="card">
 				<h5 class="card-header"><?= __("POTA"); ?></h5>
@@ -283,6 +273,7 @@ if ($dxcc_list->result() > 0) {
 	</div>
 
 	<div class="row">
+		<!-- Special Interest Group -->
 		<div class="col-md">
 			<div class="card">
 				<h5 class="card-header"><?= __("Special Interest Group"); ?></h5>
@@ -290,9 +281,8 @@ if ($dxcc_list->result() > 0) {
 					<div class="mb-3">
 						<label for="stationSigInput"><?= __("Special Interest Group Name"); ?></label>
 						<input type="text" class="form-control uppercase" name="sig" id="stationSigInput" aria-describedby="stationSigInputHelp" value="<?php if(set_value('sig') != "") { echo set_value('sig'); } else { echo $my_station_profile->station_sig; } ?>">
-						<small id="stationSigInputHelp" class="form-text text-muted"><?= __("Station Special Interest Group Name (e.g. GMA).."); ?></small>
+						<small id="stationSigInputHelp" class="form-text text-muted"><?= __("Station Special Interest Group Name (e.g. GMA)."); ?></small>
 					</div>
-
 					<div class="mb-3">
 						<label for="stationSigInfoInput"><?= __("Special Interest Group Information"); ?></label>
 						<input type="text" class="form-control uppercase" name="sig_info" id="stationSigInfoInput" aria-describedby="stationSigInfoInputHelp" value="<?php if(set_value('sig_info') != "") { echo set_value('sig_info'); } else { echo $my_station_profile->station_sig_info; } ?>">
@@ -304,6 +294,7 @@ if ($dxcc_list->result() > 0) {
 	</div>
 
 	<div class="row">
+		<!-- eQSL -->
 		<div class="col-md">
 			<div class="card">
 				<h5 class="card-header"><?= __("eQSL"); ?> <span class="badge text-bg-warning"><?= sprintf(__("Trouble? Check the %swiki%s."), '<a href="https://github.com/wavelog/wavelog/wiki/eQSL#read-common-pitfalls-with-eqsl" target="_blank">', '</a>'); ?></span></h5>
@@ -312,17 +303,18 @@ if ($dxcc_list->result() > 0) {
 						<label for="eqslNickname"><?php echo _pgettext("Probably no translation needed","eQSL QTH Nickname"); ?></label> <!-- This does not need Multilanguage Support -->
 						<input type="text" class="form-control" name="eqslnickname" id="eqslNickname" aria-describedby="eqslhelp" value="<?php if(set_value('eqslnickname') != "") { echo set_value('eqslnickname'); } else { echo $my_station_profile->eqslqthnickname; } ?>">
 						<small id="eqslhelp" class="form-text text-muted"><?= __("The QTH Nickname which is configured in your eQSL Profile"); ?></small>
-		  			</div>
+					</div>
 					<div class="mb-3">
 						<label for="eqslDefaultQSLMsg"><?= __("Default QSLMSG"); ?></label>
 						<label class="position-absolute end-0 mb-2 me-3" for="eqslDefaultQSLMsg" id="charsLeft"> </label>
-		    			<textarea class="form-control" name="eqsl_default_qslmsg" id="eqslDefaultQSLMsg" aria-describedby="eqsldefaultqslmsghelp" maxlength="240" rows="2" style="width:100%;" value="<?php echo $my_station_profile->eqsl_default_qslmsg; ?>"><?php echo $my_station_profile->eqsl_default_qslmsg; ?></textarea>
-		    			<small id="eqsldefaultqslmsghelp" class="form-text text-muted"><?= __("Define a default message that will be populated and sent for each QSO for this station location."); ?></small>
-		  			</div>
+						<textarea class="form-control" name="eqsl_default_qslmsg" id="eqslDefaultQSLMsg" aria-describedby="eqsldefaultqslmsghelp" maxlength="240" rows="2" style="width:100%;" value="<?php echo $my_station_profile->eqsl_default_qslmsg; ?>"><?php echo $my_station_profile->eqsl_default_qslmsg; ?></textarea>
+						<small id="eqsldefaultqslmsghelp" class="form-text text-muted"><?= __("Define a default message that will be populated and sent for each QSO for this station location."); ?></small>
+					</div>
 				</div>
 			</div>
 		</div>
 
+		<!-- QRZ.com -->
 		<div class="col-md">
 			<div class="card">
 				<h5 class="card-header">QRZ.com <span class="badge text-bg-warning"> <?= __("Subscription Required"); ?></span></h5> <!-- "QRZ.com" does not need Multilanguage Support -->
@@ -331,27 +323,27 @@ if ($dxcc_list->result() > 0) {
 						<label for="qrzApiKey">QRZ.com Logbook API Key</label> <!-- This does not need Multilanguage Support -->
 						<div class="input-group">
 							<input type="password" class="form-control" name="qrzapikey" pattern="^([A-F0-9]{4}-){3}[A-F0-9]{4}$" id="qrzApiKey" aria-describedby="qrzApiKeyHelp" value="<?php if(set_value('qrzapikey') != "") { echo set_value('qrzapikey'); } else { echo $my_station_profile->qrzapikey; } ?>">
-						<span class="input-group-btn"><button class="btn btn-default btn-pwd-showhide" type="button"><i class="fa fa-eye-slash"></i></button></span>
+							<span class="input-group-btn"><button class="btn btn-default btn-pwd-showhide" type="button"><i class="fa fa-eye-slash"></i></button></span>
 							<button class="btn btn-secondary" type="button" id="qrz_apitest_btn">Test API-Key</button>
 						</div>
 						<div class="alert mt-3" style="display: none;" id="qrz_apitest_msg"></div>
 						<small id="qrzApiKeyHelp" class="form-text text-muted"><?= sprintf(_pgettext("the QRZ.com Logbook settings page", "Find your API key on %s"), "<a href='https://logbook.qrz.com/logbook' target='_blank'>".__("the QRZ.com Logbook settings page")."</a>"); ?></a></small>
 					</div>
-
 					<div class="mb-3">
 						<label for="qrzrealtime"><?= __("QRZ.com Logbook Upload"); ?></label>
 						<select class="form-select" id="qrzrealtime" name="qrzrealtime">
-							<option value="-1" <?php if ($my_station_profile->qrzrealtime == -1) { echo " selected =\"selected\""; } ?>><?= __("Disabled"); ?></option>
-							<option value="1" <?php if ($my_station_profile->qrzrealtime == 1) { echo " selected =\"selected\""; } ?>><?= __("Realtime"); ?></option>
-							<option value="0" <?php if ($my_station_profile->qrzrealtime == 0) { echo " selected =\"selected\""; } ?>><?= __("Enabled"); ?></option>
+							<option value="-1" <?php if ($my_station_profile->qrzrealtime == -1) { echo ' selected'; } ?>><?= __("Disabled"); ?></option>
+							<option value="1" <?php if ($my_station_profile->qrzrealtime == 1) { echo ' selected'; } ?>><?= __("Realtime"); ?></option>
+							<option value="0" <?php if ($my_station_profile->qrzrealtime == 0) { echo ' selected'; } ?>><?= __("Enabled"); ?></option>
 						</select>
 					</div>
 				</div>
 			</div>
 		</div>
-
 	</div>
+
 	<div class="row">
+		<!-- Clublog -->
 		<div class="col-md">
 			<div class="card">
 				<h5 class="card-header"><?= __("Clublog"); ?></h5> <!-- This does not need Multilanguage Support -->
@@ -359,34 +351,35 @@ if ($dxcc_list->result() > 0) {
 					<div class="mb-3">
 						<label for="clublogignore"><?= __("Ignore Clublog Upload"); ?></label>
 						<select class="form-select" id="clublogignore" name="clublogignore">
-							<option value="1" <?php if ($my_station_profile->clublogignore == 1) { echo " selected =\"selected\""; } ?>><?= __("Yes"); ?></option>
-							<option value="0" <?php if ($my_station_profile->clublogignore == 0) { echo " selected =\"selected\""; } ?>><?= __("No"); ?></option>
+							<option value="1" <?php if ($my_station_profile->clublogignore == 1) { echo ' selected'; } ?>><?= __("Yes"); ?></option>
+							<option value="0" <?php if ($my_station_profile->clublogignore == 0) { echo ' selected'; } ?>><?= __("No"); ?></option>
 						</select>
 						<small class="form-text text-muted"><?= __("If enabled, the QSOs made from this location will not be uploaded to Clublog. If this is deactivated on it's own please check if the Call is properly configured at Clublog"); ?></small>
 					</div>
 					<div class="mb-3" id="clublogrealtimediv">
 						<label for="clublogrealtime"><?= __("ClubLog Realtime Upload"); ?></label>
 						<select class="form-select" id="clublogrealtime" name="clublogrealtime">
-							<option value="1" <?php if ($my_station_profile->clublogrealtime == 1) { echo " selected =\"selected\""; } ?>><?= __("Yes"); ?></option>
-							<option value="0" <?php if ($my_station_profile->clublogrealtime == 0) { echo " selected =\"selected\""; } ?>><?= __("No"); ?></option>
+							<option value="1" <?php if ($my_station_profile->clublogrealtime == 1) { echo ' selected'; } ?>><?= __("Yes"); ?></option>
+							<option value="0" <?php if ($my_station_profile->clublogrealtime == 0) { echo ' selected'; } ?>><?= __("No"); ?></option>
 						</select>
 					</div>
 				</div>
 			</div>
 		</div>
 	</div>
-<div class="row">
+
+	<div class="row">
 		<div class="col-md">
 			<div class="card">
 				<h5 class="card-header">HRDLog.net</h5> <!-- This does not need Multilanguage Support -->
 				<div class="card-body">
 					<div class="mb-3">
-						<label for="webadifApiKey"><?= __("HRDLog.net Username"); ?></label>
+						<label for="hrdlog_username"><?= __("HRDLog.net Username"); ?></label>
 						<input type="text" class="form-control" name="hrdlog_username" id="hrdlog_username" aria-describedby="hrdlog_usernameHelp" value="<?php if(set_value('hrdlog_username') != "") { echo set_value('hrdlog_username'); } else { echo $my_station_profile->hrdlog_username; } ?>">
 						<small id="hrdlog_usernameHelp" class="form-text text-muted"><?= __("The username you are registered with at HRDlog.net (usually your callsign)."); ?></a></small>
 					</div>
 					<div class="mb-3">
-						<label for="webadifApiKey"><?= __("HRDLog.net API Key"); ?></label>
+						<label for="hrdlog_code"><?= __("HRDLog.net API Key"); ?></label>
 						<div class="input-group">
 							<input type="password" class="form-control" name="hrdlog_code" id="hrdlog_code" aria-describedby="hrdlog_codeHelp" value="<?php if(set_value('hrdlog_code') != "") { echo set_value('hrdlog_code'); } else { echo $my_station_profile->hrdlog_code; } ?>">
 							<span class="input-group-btn"><button class="btn btn-default btn-pwd-showhide" type="button"><i class="fa fa-eye-slash"></i></button></span>
@@ -396,16 +389,18 @@ if ($dxcc_list->result() > 0) {
 					<div class="mb-3">
 						<label for="hrdlogrealtime"><?= __("HRDLog.net Logbook Realtime Upload"); ?></label>
 						<select class="form-select" id="hrdlogrealtime" name="hrdlogrealtime">
-							<option value="1" <?php if ($my_station_profile->hrdlogrealtime == 1) { echo " selected =\"selected\""; } ?>><?= __("Yes"); ?></option>
-							<option value="0" <?php if ($my_station_profile->hrdlogrealtime == 0) { echo " selected =\"selected\""; } ?>><?= __("No"); ?></option>
-							<option value="-1" <?php if ($my_station_profile->hrdlogrealtime == -1) { echo " selected =\"selected\""; } ?>><?= __("Disabled"); ?></option>
+							<option value="1" <?php if ($my_station_profile->hrdlogrealtime == 1) { echo ' selected'; } ?>><?= __("Yes"); ?></option>
+							<option value="0" <?php if ($my_station_profile->hrdlogrealtime == 0) { echo ' selected'; } ?>><?= __("No"); ?></option>
+							<option value="-1" <?php if ($my_station_profile->hrdlogrealtime == -1) { echo ' selected'; } ?>><?= __("Disabled"); ?></option>
 						</select>
 					</div>
 				</div>
 			</div>
 		</div>
 	</div>
+
 	<div class="row">
+		<!-- QO-100 Dx Club -->
 		<div class="col-md">
 			<div class="card">
 				<h5 class="card-header">QO-100 Dx Club</h5> <!-- This does not need Multilanguage Support -->
@@ -421,8 +416,8 @@ if ($dxcc_list->result() > 0) {
 					<div class="mb-3">
 						<label for="webadifrealtime"><?= __("QO-100 Dx Club Realtime Upload"); ?></label>
 						<select class="form-select" id="webadifrealtime" name="webadifrealtime">
-							<option value="1" <?php if ($my_station_profile->webadifrealtime == 1) { echo " selected =\"selected\""; } ?>><?= __("Yes"); ?></option>
-							<option value="0" <?php if ($my_station_profile->webadifrealtime == 0) { echo " selected =\"selected\""; } ?>><?= __("No"); ?></option>
+							<option value="1" <?php if ($my_station_profile->webadifrealtime == 1) { echo ' selected'; } ?>><?= __("Yes"); ?></option>
+							<option value="0" <?php if ($my_station_profile->webadifrealtime == 0) { echo ' selected'; } ?>><?= __("No"); ?></option>
 						</select>
 					</div>
 				</div>
@@ -432,6 +427,7 @@ if ($dxcc_list->result() > 0) {
 
 <?php if (!($this->config->item('disable_oqrs') ?? false)) { ?>
 	<div class="row">
+		<!-- OQRS -->
 		<div class="col-md">
 			<div class="card">
 				<h5 class="card-header">OQRS</h5> <!-- This does not need Multilanguage Support -->
@@ -439,15 +435,15 @@ if ($dxcc_list->result() > 0) {
 					<div class="mb-3">
 						<label for="oqrs"><?= __("OQRS Enabled"); ?></label>
 						<select class="form-select" id="oqrs" name="oqrs">
-							<option value="1" <?php if ($my_station_profile->oqrs == 1) { echo " selected =\"selected\""; } ?>><?= __("Yes"); ?></option>
-							<option value="0" <?php if ($my_station_profile->oqrs == 0) { echo " selected =\"selected\""; } ?>><?= __("No"); ?></option>
+							<option value="0" <?php if ($my_station_profile->oqrs == 0) { echo ' selected'; } ?>><?= __("No"); ?></option>	
+							<option value="1" <?php if ($my_station_profile->oqrs == 1) { echo ' selected'; } ?>><?= __("Yes"); ?></option>
 						</select>
 					</div>
 					<div class="mb-3">
 						<label for="oqrs"><?= __("OQRS Email alert"); ?></label>
 						<select class="form-select" id="oqrsemail" name="oqrsemail">
-							<option value="1" <?php if ($my_station_profile->oqrs_email == 1) { echo " selected =\"selected\""; } ?>><?= __("Yes"); ?></option>
-							<option value="0" <?php if ($my_station_profile->oqrs_email == 0) { echo " selected =\"selected\""; } ?>><?= __("No"); ?></option>
+							<option value="0" <?php if ($my_station_profile->oqrs_email == 0) { echo ' selected'; } ?>><?= __("No"); ?></option>	
+							<option value="1" <?php if ($my_station_profile->oqrs_email == 1) { echo ' selected'; } ?>><?= __("Yes"); ?></option>
 						</select>
 						<small id="oqrsemailHelp" class="form-text text-muted"><?= __("Make sure email is set up under admin and global options."); ?></small>
 					</div>