diff --git a/index.html b/index.html
index 50baa79..ce5394a 100644
--- a/index.html
+++ b/index.html
@@ -185,41 +185,41 @@
 					</div>
 					<div class="row">
 						<div class="col">
-							<div class="mb-3">
+							<div class="mb-3 col-mb3">
 								<label for="wavelog_radioname">Radio Name</label>
-								<input type="text" class="form-control form-control-sm" name="wavelog_radioname" id="wavelog_radioname" value="" />
+								<input type="text" class="form-control form-control-sm" name="wavelog_radioname"
+									id="wavelog_radioname" value="" />
 							</div>
 						</div>
 						<div class="col">
-							<div class="mb-3">
-								<label for="flrig_host">Rig Host</label>
-								<input type="text" class="form-control form-control-sm" name="flrig_host" id="flrig_host" value="" />
-							</div>
+							<div class="mb-2 col-mb-2"></div>
 						</div>
 						<div class="col">
-							<div class="mb-3">
-								<label for="flrig_port">Rig Port</label>
-								<input type="number" class="form-control form-control-sm" name="flrig_port" id="flrig_port" value="" />
+							<div class="mb-1 col-mb-1">
+								<label for="wavelog_pmode" class="text-center">Set MODE via FLRig</label>
+								<input type="checkbox" value="1" class="form-control form-control-sm" name="wavelog_pmode" id="wavelog_pmode" title="Try to set Mode automatically" value="" />
 							</div>
 						</div>
 					</div>
 					<div class="row">
 						<div class="col">
-							<div class="mb-3">
-								<label for="flrig_ena" style="text-align: center">FLRig<br>Enabled</label>
-								<input type="checkbox" value="1" class="form-control form-control-sm" name="flrig_ena" id="flrig_ena" />
+							<div class="mb-3 col-mb-3">
+								<label for="flrig_host">FLRig Host</label>
+								<input type="text" class="form-control form-control-sm" name="flrig_host"
+									id="flrig_host" value="" />
 							</div>
 						</div>
 						<div class="col">
-							<div class="mb-3">
-								<label for="hamlib_ena" style="text-align: center">Hamlib Enabled</label>
-								<input type="checkbox" value="1" class="form-control form-control-sm" name="hamlib_ena" id="hamlib_ena" />
+							<div class="mb-2 col-mb-2">
+								<label for="flrig_port">FLRig Port</label>
+								<input type="number" class="form-control form-control-sm" name="flrig_port"
+									id="flrig_port" value="" />
 							</div>
 						</div>
 						<div class="col">
-							<div class="mb-3">
-								<label for="wavelog_pmode" style="text-align: center">Set MODE via FLRig</label>
-								<input type="checkbox" value="1" class="form-control form-control-sm" name="wavelog_pmode" id="wavelog_pmode" title="Try to set Mode automatically" />
+							<div class="mb-1 col-mb-1">
+								<label for="flrig_ena">FLRig Enabled</label>
+								<input type="checkbox" value="1" class="form-control form-control-sm" name="flrig_ena" id="flrig_ena" value="" />
 							</div>
 						</div>
 					</div>
diff --git a/renderer.js b/renderer.js
index 0a353de..3bdc055 100644
--- a/renderer.js
+++ b/renderer.js
@@ -197,13 +197,8 @@ async function getInfo(which) {
 	if (cfg.hamlib_ena) {
 		var commands = {"rig.get_vfo": "f", "rig.get_mode": "m", "rig.get_ptt": 0, "rig.get_power": 0, "rig.get_split": 0, "rig.get_vfoB": 0, "rig.get_modeB": 0};
 
-<<<<<<< HEAD
 		const host = cfg.hamlib_host;
 		const port = parseInt(cfg.hamlib_port, 10);
-=======
-		const host = $("#flrig_host").val();
-		const port = parseInt($("#flrig_port").val(), 10);
->>>>>>> 91e56b49cbd4df4dbaca9a018270e49ce6eed908
 
 		return new Promise((resolve, reject) => {
 			if (commands[which]) {
@@ -227,11 +222,7 @@ async function getInfo(which) {
 }
 
 async function getsettrx() {
-<<<<<<< HEAD
 	if ($("#flrig_ena").is(':checked') || cfg.hamlib_ena) {
-=======
-	if ($("#flrig_ena").is(':checked') || $("#hamlib_ena").is(':checked')) {
->>>>>>> 91e56b49cbd4df4dbaca9a018270e49ce6eed908
 		x=await get_trx();
 		setTimeout(() => {
 			getsettrx();