diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php
index 3c99ad7c6..61e06e588 100755
--- a/application/controllers/Logbook.php
+++ b/application/controllers/Logbook.php
@@ -556,7 +556,7 @@ class Logbook extends CI_Controller {
 		if ($query->num_rows() > 0)
 		{
 			$data['results'] = $query;
-			$this->load->view('view_log/partial/log.php', $data);
+			$this->load->view('view_log/partial/log_ajax.php', $data);
 		} else {
 			$this->load->model('search');
 
@@ -565,7 +565,7 @@ class Logbook extends CI_Controller {
 			if ($iota_search->num_rows() > 0)
 			{
 				$data['results'] = $iota_search;
-				$this->load->view('view_log/partial/log.php', $data);
+				$this->load->view('view_log/partial/log_ajax.php', $data);
 			} else {
 				if ($this->config->item('callbook') == "qrz" && $this->config->item('qrz_username') != null && $this->config->item('qrz_password') != null) {
 					// Lookup using QRZ
diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php
index 2cb622605..826bf3430 100644
--- a/application/views/dashboard/index.php
+++ b/application/views/dashboard/index.php
@@ -71,9 +71,7 @@
 					<?php } else { ?>
 					<?php } ?>
 					<td>
-						<a data-fancybox data-type="iframe" data-width="800" data-height="520" data-src="<?php echo site_url('logbook/view')."/".$row->COL_PRIMARY_KEY; ?>" href="javascript:;">
-							<?php echo str_replace("0","&Oslash;",strtoupper($row->COL_CALL)); ?>
-						</a>
+                        <a id="edit_qso" href="javascript:displayQso(<?php echo $row->COL_PRIMARY_KEY; ?>)"><?php echo str_replace("0","&Oslash;",strtoupper($row->COL_CALL)); ?></a>
 					</td>
 					<td><?php echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; ?></td>
 					<td class="d-none d-sm-table-cell"><?php echo $row->COL_RST_SENT; ?> <?php if ($row->COL_STX_STRING) { ?><span class="label"><?php echo $row->COL_STX_STRING;?></span><?php } ?></td>
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index 95fb1f64c..e6da3f47e 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -1431,7 +1431,7 @@ $(document).ready(function(){
                                 var lat = $("#lat").text();
                                 var long = $("#long").text();
                                 var callsign = $("#callsign").text();
-                                var mymap = L.map('map').setView([lat,long], 5);
+                                var mymap = L.map('mapqso').setView([lat,long], 5);
 
                                 L.tileLayer('https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token=pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4NXVycTA2emYycXBndHRqcmZ3N3gifQ.rJcFIG214AriISLbB6B5aw', {
                                     maxZoom: 18,
diff --git a/application/views/search/result_search.php b/application/views/search/result_search.php
index 07175e582..39cf56f96 100644
--- a/application/views/search/result_search.php
+++ b/application/views/search/result_search.php
@@ -33,7 +33,7 @@
 			<?php  echo '<tr class="tr'.($i & 1).'">'; ?>
 			<td><?php $timestamp = strtotime($row->COL_TIME_ON); echo date('d/m/y', $timestamp); ?></td>
 			<td><?php $timestamp = strtotime($row->COL_TIME_ON); echo date('H:i', $timestamp); ?></td>
-			<td><a data-fancybox data-type="iframe" data-width="750" data-height="520" data-src="<?php echo site_url('logbook/view')."/".$row->COL_PRIMARY_KEY; ?>" href="javascript:;"><?php echo str_replace("0","&Oslash;",strtoupper($row->COL_CALL)); ?></a></td>
+			<td><a id="edit_qso" href="javascript:displayQso(<?php echo $row->COL_PRIMARY_KEY; ?>)"><?php echo str_replace("0","&Oslash;",strtoupper($row->COL_CALL)); ?></a></td>
 			<td><?php echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; ?></td>
 			<td><?php echo $row->COL_RST_SENT; ?> <?php if ($row->COL_STX_STRING) { ?><span class="label"><?php echo $row->COL_STX_STRING;?></span><?php } ?></td>
 			<td><?php echo $row->COL_RST_RCVD; ?> <?php if ($row->COL_SRX_STRING) { ?><span class="label"><?php echo $row->COL_SRX_STRING;?></span><?php } ?></td>
diff --git a/application/views/view_log/index.php b/application/views/view_log/index.php
index abaa6a9dc..fbe51c86d 100644
--- a/application/views/view_log/index.php
+++ b/application/views/view_log/index.php
@@ -13,4 +13,4 @@
 	<div id="map" style="width: 100%; height: 350px"></div> 
 
 <div style="padding-top: 10px; margin-top: 0px;" class="container logbook">
-	<?php $this->load->view('view_log/partial/log') ?>
+	<?php $this->load->view('view_log/partial/log_ajax') ?>
diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php
index 76271e358..87df334b0 100644
--- a/application/views/view_log/qso.php
+++ b/application/views/view_log/qso.php
@@ -245,7 +245,7 @@
 		</div>
 		<div class="col">
 			
-			<div id="map" style="width: 340px; height: 250px"></div> 
+			<div id="mapqso" style="width: 340px; height: 250px"></div>
 			
 			<?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) { ?>
 				<br>