diff --git a/application/controllers/Search.php b/application/controllers/Search.php
index bbbed4b7..ae69767f 100644
--- a/application/controllers/Search.php
+++ b/application/controllers/Search.php
@@ -17,8 +17,8 @@ class Search extends CI_Controller {
 	
 		$data['page_title'] = "Search";
 
-        $this->load->view('layout/header', $data);
+        $this->load->view('interface_assets/header', $data);
 		$this->load->view('search/main');
-		$this->load->view('layout/footer');
+        $this->load->view('interface_assets/footer');
 	}
 }
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index c8f40486..acece818 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -66,5 +66,26 @@ $(document).ready(function() {
 </script>
 <?php } ?>
 
+
+<?php if ($this->uri->segment(1) == "search") { ?>
+<script type="text/javascript">
+i=0;
+$(document).ready(function(){
+
+    $('#partial_view').load("logbook/search_result/<?php echo $this->input->post('callsign'); ?>", function() {
+    });
+
+  $("#callsign").keyup(function(){
+    if ($(this).val()) {
+
+        $('#partial_view').load("logbook/search_result/" + $(this).val(), function() {
+        });
+    }
+
+  });
+});
+</script>
+<?php } ?>
+
   </body>
 </html>
\ No newline at end of file
diff --git a/application/views/search/main.php b/application/views/search/main.php
index ebee83f6..91b8130e 100644
--- a/application/views/search/main.php
+++ b/application/views/search/main.php
@@ -1,73 +1,16 @@
-<div id="container">
+<div class="container search">
 
-<h2>Search</h2>
+	<h2>Search</h2>
 
-<form method="post" action="" id="search_box" name="test">
-	Callsign: <input type="text" id="callsign" name="callsign" value="" />
-</form>
+	<form method="post" action="" id="search_box" name="test">
+	  <div class="form-group row">
+	    <label for="callsign" class="col-sm-2 col-form-label">Callsign</label>
+	    <div class="col-sm-10">
+	      <input type="text" class="form-control" id="callsign" value="">
+	    </div>
+	  </div>
+	</form>
 
-<div id="partial_view"></div>
+	<div id="partial_view"></div>
 
 </div>
-
-
-<script type="text/javascript">
-i=0;
-$(document).ready(function(){
-
-	$('#partial_view').load("logbook/search_result/<?php echo $this->input->post('callsign'); ?>", function() {
-	      // after load trigger your fancybox 
-			$(".qsobox").fancybox({
-				'autoDimensions'	: false,
-				'width'         	: 700,
-				'height'        	: 300,
-				'transitionIn'		: 'fade',
-				'transitionOut'		: 'fade',
-				'type'				: 'iframe'
-			});
-
-	      	$(".editbox").fancybox({
-				'autoDimensions'	: false,
-				'width'         	: 450,
-				'height'        	: 550,
-				'transitionIn'		: 'fade',
-				'transitionOut'		: 'fade',
-				'type'				: 'iframe',
-			});
-	});
-
-  $("#callsign").keyup(function(){
-	if ($(this).val()) {
-
-		$('#partial_view').load("logbook/search_result/" + $(this).val(), function() {
-				$(".qsobox").fancybox({
-					'autoDimensions'	: false,
-					'width'         	: 700,
-					'height'        	: 300,
-					'transitionIn'		: 'fade',
-					'transitionOut'		: 'fade',
-					'type'				: 'iframe'
-				});
-	 
-		      // after load trigger your fancybox 
-		      	$(".editbox").fancybox({
-					'autoDimensions'	: false,
-					'width'         	: 450,
-					'height'        	: 550,
-					'transitionIn'		: 'fade',
-					'transitionOut'		: 'fade',
-					'type'				: 'iframe',
-				});
-		});
-	}
-
-  });
-});
-</script>
-
-	<script type="text/javascript" src="<?php echo base_url() ;?>/fancybox/jquery.mousewheel-3.0.4.pack.js"></script>
-
-	<script type="text/javascript" src="<?php echo base_url() ;?>/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
-
-	<link rel="stylesheet" type="text/css" href="<?php echo base_url() ;?>/fancybox/jquery.fancybox-1.3.4.css" media="screen" />
-	
diff --git a/application/views/search/result_search.php b/application/views/search/result_search.php
index 84f60c71..7816cc19 100644
--- a/application/views/search/result_search.php
+++ b/application/views/search/result_search.php
@@ -1,4 +1,6 @@
-	<table width="100%">
+
+	<div class="table-responsive">
+	<table class="table table-striped table-hover">
 		<tr class="titles">
 			<td>Date</td>
 			<td>Time</td>
@@ -82,6 +84,7 @@
 		<?php $i++; } ?>
 		
 	</table>
+</div>
 <style>
 TD.qsl{
     width: 20px;
diff --git a/application/views/view_log/partial/log.php b/application/views/view_log/partial/log.php
index fe1423a8..d97248de 100644
--- a/application/views/view_log/partial/log.php
+++ b/application/views/view_log/partial/log.php
@@ -1,4 +1,5 @@
-	<table class="zebra-striped" width="100%">
+<div class="table-responsive">
+	<table class="table table-striped table-hover">
 		<tr class="titles">
 			<td>Date</td>
 			<td>Time</td>
@@ -24,7 +25,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 class="qsobox" href="<?php echo site_url('logbook/view')."/".$row->COL_PRIMARY_KEY; ?>"><?php echo strtoupper($row->COL_CALL); ?></a></td>
+			<td><a data-fancybox data-type="iframe" data-src="<?php echo site_url('logbook/view')."/".$row->COL_PRIMARY_KEY; ?>" href="javascript:;"><?php echo strtoupper($row->COL_CALL); ?></a></td>
 			<td><?php echo $row->COL_MODE; ?></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>
@@ -73,8 +74,7 @@
 			</td>
 			<?php } ?>
 
-			<td><a class="editbox" href="<?php echo site_url('qso/edit'); ?>/<?php echo $row->COL_PRIMARY_KEY; ?>" ><img src="<?php echo base_url(); ?>/images/application_edit.png" width="16" height="16" alt="Edit" />
-			</a></td>
+			<td><a class="btn btn-primary" role="button" data-fancybox data-type="iframe" data-src="<?php echo site_url('qso/edit'); ?>/<?php echo $row->COL_PRIMARY_KEY; ?>" href="javascript:;"><i class="fas fa-edit"></i> Edit</a></td>
 			<?php if($this->config->item('callsign_tags') == true) { ?>
 				<?php if($row->COL_STATION_CALLSIGN	 != null) { ?>
 				<td><span class="label notice"><?php echo $row->COL_STATION_CALLSIGN; ?></span></td>
@@ -95,6 +95,7 @@
 	<?php } ?>
 
 </div>
+</div>
 
 <style>
 TD.qsl{
diff --git a/assets/css/general.css b/assets/css/general.css
index 35846dff..1b746d8e 100644
--- a/assets/css/general.css
+++ b/assets/css/general.css
@@ -24,4 +24,8 @@
 
 .notes {
 	padding-top: 15px;
+}
+
+.search {
+	padding-top: 15px;
 }
\ No newline at end of file