diff --git a/application/language/english/general_words_lang.php b/application/language/english/general_words_lang.php
index 22543e08..885b655d 100644
--- a/application/language/english/general_words_lang.php
+++ b/application/language/english/general_words_lang.php
@@ -20,6 +20,7 @@ $lang['general_word_satellite'] = 'Satellite';
 $lang['general_word_satellite_short'] = 'Sat';
 $lang['general_word_notes'] = 'Notes';
 $lang['general_word_comment'] = 'Comment';
+$lang['general_word_country'] = 'Country';
 
 $lang['general_word_total'] = 'Total';
 $lang['general_word_year'] = 'Year';
@@ -41,6 +42,11 @@ $lang['general_word_qslcard_direct'] = 'Direct';
 $lang['general_word_qslcard_bureau'] = 'Bureau';
 $lang['general_word_qslcard_via'] = 'Via';
 
+$lang['general_edit_qso'] = 'Edit QSO';
+$lang['general_mark_qsl_rx_bureau'] = 'Mark QSL Received (Bureau)';
+$lang['general_mark_qsl_rx_direct'] = 'Mark QSL Received (Direct)';
+
+$lang['general_delete_qso'] = 'Delete QSO';
 
 // Cloudlog Terms
 $lang['cloudlog_station_profile'] = 'Station Profile';
diff --git a/application/views/view_log/partial/log.php b/application/views/view_log/partial/log.php
index 4f07e76e..b04e0363 100644
--- a/application/views/view_log/partial/log.php
+++ b/application/views/view_log/partial/log.php
@@ -1,28 +1,29 @@
 <div class="table-responsive">
 	<table class="table table-sm table-striped table-hover">
 		<tr class="titles">
-			<td>Date</td>
-			<?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?>
-			<td>Time</td>
-			<?php } ?>
-			<td>Call</td>
-			<td>Mode</td>
-			<td>Sent</td>
-			<td>Recv'd</td>
-			<td>Band</td>
-			<td>Country</td>
-			<?php if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
-			<td>QSL</td>
-			<?php if($this->session->userdata('user_eqsl_name') != "") { ?>
-			<td>eQSL</td>
-			<?php } ?>
-			<?php if($this->session->userdata('user_lotw_name') != "") { ?>
-			<td>LoTW</td>
-			<?php } ?>
-			<td>Station</td>
-			<td></td>
-			<?php } ?>
-		</tr>
+            <td><?php echo $this->lang->line('general_word_date'); ?></td>
+            <?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?>
+            <td><?php echo $this->lang->line('general_word_time'); ?></td>
+            <?php } ?>
+            <td><?php echo $this->lang->line('gen_hamradio_call'); ?></td>
+            <td><?php echo $this->lang->line('gen_hamradio_mode'); ?></td>
+            <td><?php echo $this->lang->line('general_word_sent'); ?></td>
+            <td><?php echo $this->lang->line('general_word_received'); ?></td>
+            <td><?php echo $this->lang->line('gen_hamradio_band'); ?></td>
+            <td><?php echo $this->lang->line('general_word_country'); ?></td>
+            <?php if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
+                <td>QSL</td>
+                <?php if($this->session->userdata('user_eqsl_name') != "") { ?>
+                    <td>eQSL</td>
+                <?php } ?>
+                <?php if($this->session->userdata('user_lotw_name') != "") { ?>
+                    <td>LoTW</td>
+                <?php } ?>
+                <td><?php echo $this->lang->line('gen_hamradio_station'); ?></td>
+                <td></td>
+            <?php } ?>
+        </tr>
+
 		
 		<?php  $i = 0;  foreach ($results->result() as $row) { ?>
 			<?php 
@@ -123,25 +124,25 @@
 
 			<td>
 				<div class="dropdown">
-				  <a class="btn btn-secondary dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-				    <i class="fas fa-cog"></i>
-				  </a>
+                    <a class="btn btn-secondary dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    <i class="fas fa-cog"></i>
+                    </a>
 
-				  <div class="dropdown-menu" aria-labelledby="dropdownMenuLink">
-				  	<a class="dropdown-item" id="edit_qso" data-fancybox data-type="iframe" data-src="<?php echo site_url('qso/edit'); ?>/<?php echo $row->COL_PRIMARY_KEY; ?>" data-width="600" data-height="600" href="javascript:;"><i class="fas fa-edit"></i> Edit QSO</a>
-				  	
-				  	<div class="dropdown-divider"></div>	
+                        <div class="dropdown-menu" aria-labelledby="dropdownMenuLink">
+                            <a class="dropdown-item" id="edit_qso" href="javascript:qso_edit(<?php echo $row->COL_PRIMARY_KEY; ?>)"><i class="fas fa-edit"></i> <?php echo $this->lang->line('general_edit_qso'); ?></a>
+                            <div class="qsl_<?php echo $row->COL_PRIMARY_KEY; ?>">
+                            <div class="dropdown-divider"></div>
 
-				  	<?php if($row->COL_QSL_RCVD !='Y') { ?> 
-				    <a class="dropdown-item" href="<?php echo site_url('qso/qsl_rcvd'); ?>/<?php echo $row->COL_PRIMARY_KEY; ?>/B" ><i class="fas fa-envelope"></i> Mark QSL Received (Bureau)</a>
-				    <a class="dropdown-item" href="<?php echo site_url('qso/qsl_rcvd'); ?>/<?php echo $row->COL_PRIMARY_KEY; ?>/D" ><i class="fas fa-envelope"></i> Mark QSL Received (Direct)</a>
-					<?php } ?>
+                            <?php if($row->COL_QSL_RCVD !='Y') { ?>
+                                <a class="dropdown-item" href="javascript:qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'B')" ><i class="fas fa-envelope"></i> <?php echo $this->lang->line('general_mark_qsl_rx_bureau'); ?></a>
+                                <a class="dropdown-item" href="javascript:qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i> <?php echo $this->lang->line('general_mark_qsl_rx_direct'); ?></a>
+                            <?php } ?>
 
-					<div class="dropdown-divider"></div>	
-
-					<a class="dropdown-item" href="<?php echo site_url('qso/delete'); ?>/<?php echo $row->COL_PRIMARY_KEY; ?>" onclick="return confirm('Are you sure you want delete QSO <?php echo $row->COL_CALL; ?>?');"><i class="fas fa-trash-alt"></i> Delete QSO</a>
-				  </div>
-				</div>
+                            <div class="dropdown-divider"></div>
+                            </div>
+                            <a class="dropdown-item" href="javascript:qso_delete(<?php echo $row->COL_PRIMARY_KEY; ?>, '<?php echo $row->COL_CALL; ?>')"><i class="fas fa-trash-alt"></i> <?php echo $this->lang->line('general_delete_qso'); ?></a>
+                        </div>
+                    </div>
 			</td>
 			<?php } ?>
 		</tr>
diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php
index e8dca3b7..7bb8f523 100644
--- a/application/views/view_log/partial/log_ajax.php
+++ b/application/views/view_log/partial/log_ajax.php
@@ -1,16 +1,16 @@
 <div class="table-responsive">
     <table class="table table-striped table-hover">
         <tr class="titles">
-            <td>Date</td>
+            <td><?php echo $this->lang->line('general_word_date'); ?></td>
             <?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?>
-                <td>Time</td>
+            <td><?php echo $this->lang->line('general_word_time'); ?></td>
             <?php } ?>
-            <td>Call</td>
-            <td>Mode</td>
-            <td>Sent</td>
-            <td>Recv'd</td>
-            <td>Band</td>
-            <td>Country</td>
+            <td><?php echo $this->lang->line('gen_hamradio_call'); ?></td>
+            <td><?php echo $this->lang->line('gen_hamradio_mode'); ?></td>
+            <td><?php echo $this->lang->line('general_word_sent'); ?></td>
+            <td><?php echo $this->lang->line('general_word_received'); ?></td>
+            <td><?php echo $this->lang->line('gen_hamradio_band'); ?></td>
+            <td><?php echo $this->lang->line('general_word_country'); ?></td>
             <?php if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
                 <td>QSL</td>
                 <?php if($this->session->userdata('user_eqsl_name') != "") { ?>
@@ -19,7 +19,7 @@
                 <?php if($this->session->userdata('user_lotw_name') != "") { ?>
                     <td>LoTW</td>
                 <?php } ?>
-                <td>Station</td>
+                <td><?php echo $this->lang->line('gen_hamradio_station'); ?></td>
                 <td></td>
             <?php } ?>
         </tr>
@@ -129,18 +129,18 @@
                         </a>
 
                         <div class="dropdown-menu" aria-labelledby="dropdownMenuLink">
-                            <a class="dropdown-item" id="edit_qso" href="javascript:qso_edit(<?php echo $row->COL_PRIMARY_KEY; ?>)"><i class="fas fa-edit"></i> Edit QSO</a>
+                            <a class="dropdown-item" id="edit_qso" href="javascript:qso_edit(<?php echo $row->COL_PRIMARY_KEY; ?>)"><i class="fas fa-edit"></i> <?php echo $this->lang->line('general_edit_qso'); ?></a>
                             <div class="qsl_<?php echo $row->COL_PRIMARY_KEY; ?>">
                             <div class="dropdown-divider"></div>
 
                             <?php if($row->COL_QSL_RCVD !='Y') { ?>
-                                <a class="dropdown-item" href="javascript:qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'B')" ><i class="fas fa-envelope"></i> Mark QSL Received (Bureau)</a>
-                                <a class="dropdown-item" href="javascript:qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i> Mark QSL Received (Direct)</a>
+                                <a class="dropdown-item" href="javascript:qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'B')" ><i class="fas fa-envelope"></i> <?php echo $this->lang->line('general_mark_qsl_rx_bureau'); ?></a>
+                                <a class="dropdown-item" href="javascript:qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i> <?php echo $this->lang->line('general_mark_qsl_rx_direct'); ?></a>
                             <?php } ?>
 
                             <div class="dropdown-divider"></div>
                             </div>
-                            <a class="dropdown-item" href="javascript:qso_delete(<?php echo $row->COL_PRIMARY_KEY; ?>, '<?php echo $row->COL_CALL; ?>')"><i class="fas fa-trash-alt"></i> Delete QSO</a>
+                            <a class="dropdown-item" href="javascript:qso_delete(<?php echo $row->COL_PRIMARY_KEY; ?>, '<?php echo $row->COL_CALL; ?>')"><i class="fas fa-trash-alt"></i> <?php echo $this->lang->line('general_delete_qso'); ?></a>
                         </div>
                     </div>
                 </td>