diff --git a/application/libraries/Frequency.php b/application/libraries/Frequency.php
index 2bd4b5e7..e346d7f4 100644
--- a/application/libraries/Frequency.php
+++ b/application/libraries/Frequency.php
@@ -49,11 +49,13 @@ class Frequency {
 	'2m'=>array(
   		'SSB'=>"144300000",
   		'DATA'=>"144370000",
-  		'CW'=>"144.050000"),
+  		'CW'=>"144050000"),
+  		'FM'=>"144500000"),
 	'70cm'=>array(
   		'SSB'=>"432200000",
   		'DATA'=>"432088000",
   		'CW'=>"432050000"),
+  		'FM'=>"433500000"),
 	'23cm'=>array(
   		'SSB'=>"1296000000",
   		'DATA'=>"1296138000",
diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index e25f48f4..ebf33e0e 100644
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -1,33 +1,38 @@
 <!-- JS -->
 
-	<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>
-	<script type="text/javascript" src="<?php echo base_url() ;?>/js/jquery.jclock.js"></script>
-	<script type="text/javascript" src="<?php echo base_url() ;?>/js/radiohelpers.js"></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>
+  <script type="text/javascript" src="<?php echo base_url() ;?>/js/jquery.jclock.js"></script>
+  <script type="text/javascript" src="<?php echo base_url() ;?>/js/radiohelpers.js"></script>
 
-	<link rel="stylesheet" type="text/css" href="<?php echo base_url() ;?>/fancybox/jquery.fancybox-1.3.4.css" media="screen" />
+  <link rel="stylesheet" type="text/css" href="<?php echo base_url() ;?>/fancybox/jquery.fancybox-1.3.4.css" media="screen" />
 
-	<script type="text/javascript">
+  <script type="text/javascript">
 
-		$(document).ready(function() {
-			$(".qsobox").fancybox({
-				'autoDimensions'	: false,
-				'width'         	: 700,
-				'height'        	: 300,
-				'transitionIn'		: 'fade',
-				'transitionOut'		: 'fade',
-				'type'				: 'iframe'
-			});
+    var manual = <?php echo $_GET['manual']; ?>;
 
-			$(function($) {
-		      var options = {
-		        utc: true
-		      }
-		      $('.input_time').jclock(options);
-		    });
-		});
+    $(document).ready(function() {
+      $(".qsobox").fancybox({
+        'autoDimensions'  : false,
+        'width'           : 700,
+        'height'          : 300,
+        'transitionIn'    : 'fade',
+        'transitionOut'   : 'fade',
+        'type'            : 'iframe'
+      });
 
-	</script>
+      if ( ! manual ) {
+        $(function($) {
+          var options = {
+            utc: true,
+            format: '%H:%M'
+          }
+          $('.input_time').jclock(options);
+        });
+      }
+    });
+
+  </script>
 
 <div id="container">
 
@@ -45,451 +50,481 @@
 </div>
 <?php } ?>
 
-	<div class="row show-grid">
-	  <div class="span6">
-	 
-	  	<h2>Add QSO</h2>
-		
-		<form id="qso_input" method="post" action="<?php echo site_url('qso'); ?>" name="qsos">
-			<input type="hidden" id="dxcc_id" name="dxcc_id" value=""/>
-			<input type="hidden" id="cqz" name="cqz" value="" />
+  <div class="row show-grid">
+    <div class="span6">
+   
+    <h2>Add QSO <?php echo ($_GET['manual'] == 1 ? "(post entry)" : "") ?></h2>
+    
+    <form id="qso_input" method="post" action="<?php echo site_url('qso') . "?manual=" . $_GET['manual']; ?>" name="qsos">
+      <input type="hidden" id="dxcc_id" name="dxcc_id" value=""/>
+      <input type="hidden" id="cqz" name="cqz" value=""/>
 
-		<table style="margin-bottom: 0px;">
+    <table style="margin-bottom: 0px;">
 
-			<tr>
-				<td class="title">Date</td>
-				<td><input class="input_date" type="text" name="start_date" value="<?php echo date('d-m-Y'); ?>" size="10" /> <input class="input_time" type="text" name="start_time" value="" size="7" /></td>
-			</tr>
+      <tr>
+        <td class="title">Date</td>
+        <td>
+          <input class="input_date" type="text" name="start_date" value="<?php echo date('d-m-Y'); ?>" size="10" <?php echo ($_GET['manual'] == 0 ? "disabled" : "");  ?> /> 
+          <input class="input_time" type="text" id="start_date" name="start_time" value="<?php echo date('H:i'); ?>" size="7" <?php echo ($_GET['manual'] == 0 ? "disabled" : "");  ?> />
 
-			<tr>
-				<td class="title">Callsign</td>
-				<td><input size="10" id="callsign" type="text" name="callsign" value="" /></td>
-			</tr>	
+          <?php if ( $_GET['manual'] == 0 ) { ?>
+            <input class="input_time" type="hidden" id="start_time"  name="start_time"value="<?php echo date('H:i'); ?>" />
+            <input class="input_date" type="hidden" id="start_date" name="start_date" value="<?php echo date('d-m-Y'); ?>" />
+          <?php } ?>
 
-			<tr>
-				<td class="title">Mode</td>
-				<td><select name="mode" class="mode">
-				<option value="SSB" <?php if($this->session->userdata('mode') == "" || $this->session->userdata('mode') == "SSB") { echo "selected=\"selected\""; } ?>>SSB</option>
-				<option value="AM" <?php if($this->session->userdata('mode') == "AM") { echo "selected=\"selected\""; } ?>>AM</option>
-				<option value="FM" <?php if($this->session->userdata('mode') == "FM") { echo "selected=\"selected\""; } ?>>FM</option>
-				<option value="CW" <?php if($this->session->userdata('mode') == "CW") { echo "selected=\"selected\""; } ?>>CW</option>
-				<option value="RTTY" <?php if($this->session->userdata('mode') == "RTTY") { echo "selected=\"selected\""; } ?>>RTTY</option>
-				<option value="PSK31" <?php if($this->session->userdata('mode') == "PSK31") { echo "selected=\"selected\""; } ?>>PSK31</option>
-				<option value="PSK63" <?php if($this->session->userdata('mode') == "PSK63") { echo "selected=\"selected\""; } ?>>PSK63</option>
-				<option value="JT65" <?php if($this->session->userdata('mode') == "JT65") { echo "selected=\"selected\""; } ?>>JT65</option>
-				<option value="JT65B" <?php if($this->session->userdata('mode') == "JT65B") { echo "selected=\"selected\""; } ?>>JT65B</option>
-				<option value="JT6C" <?php if($this->session->userdata('mode') == "JT6C") { echo "selected=\"selected\""; } ?>>JT6C</option>
-				<option value="JT6M" <?php if($this->session->userdata('mode') == "JT6M") { echo "selected=\"selected\""; } ?>>JT6M</option>
-				<option value="JT9-1" <?php if($this->session->userdata('mode') == "JT9-1") { echo "selected=\"selected\""; } ?>>JT9-1</option>
-				<option value="FSK441" <?php if($this->session->userdata('mode') == "FSK441") { echo "selected=\"selected\""; } ?>>FSK441</option>
-				<option value="JTMS" <?php if($this->session->userdata('mode') == "JTMS") { echo "selected=\"selected\""; } ?>>JTMS</option>
-				<option value="ISCAT" <?php if($this->session->userdata('mode') == "ISCAT") { echo "selected=\"selected\""; } ?>>ISCAT</option>
-				<option value="MSK144" <?php if($this->session->userdata('mode') == "MSK144") { echo "selected=\"selected\""; } ?>>MSK144</option>
-				<option value="JTMSK" <?php if($this->session->userdata('mode') == "JTMSK") { echo "selected=\"selected\""; } ?>>JTMSK</option>
-				<option value="QRA64" <?php if($this->session->userdata('mode') == "QRA64") { echo "selected=\"selected\""; } ?>>QRA64</option>
-				<option value="PKT" <?php if($this->session->userdata('mode') == "PKT") { echo "selected=\"selected\""; } ?>>PKT</option>
-				<option value="FT8" <?php if($this->session->userdata('mode') == "FT8") { echo "selected=\"selected\""; } ?>>FT8</option>
-				<option value="SSTV" <?php if($this->session->userdata('mode') == "SSTV") { echo "selected=\"selected\""; } ?>>SSTV</option>
-				<option value="HELL" <?php if($this->session->userdata('mode') == "HELL") { echo "selected=\"selected\""; } ?>>HELL</option>
-				<option value="HELL80" <?php if($this->session->userdata('mode') == "HELL80") { echo "selected=\"selected\""; } ?>>HELL80</option>
-				<option value="DSTAR" <?php if($this->session->userdata('mode') == "DSTAR") { echo "selected=\"selected\""; } ?>>DSTAR</option>
-				<option value="DIGITALVOICE" <?php if($this->session->userdata('mode') == "DIGITALVOICE") { echo "selected=\"selected\""; } ?>>DIGITALVOICE</option>
-				</select>
+        </td>
+      </tr>
 
-				<span class="title">Band</span>
-				<select name="band" class="band">
-				<option value="160m" <?php if($this->session->userdata('band') == "160m") { echo "selected=\"selected\""; } ?>>160m</option>
-				<option value="80m" <?php if($this->session->userdata('band') == "80m") { echo "selected=\"selected\""; } ?>>80m</option>
-				<option value="60m" <?php if($this->session->userdata('band') == "60m") { echo "selected=\"selected\""; } ?>>60m</option>
-				<option value="40m" <?php if($this->session->userdata('band') == "40m") { echo "selected=\"selected\""; } ?>>40m</option>
-				<option value="30m" <?php if($this->session->userdata('band') == "30m") { echo "selected=\"selected\""; } ?>>30m</option>
-				<option value="20m" <?php if($this->session->userdata('band') == "20m") { echo "selected=\"selected\""; } ?>>20m</option>
-				<option value="17m" <?php if($this->session->userdata('band') == "17m") { echo "selected=\"selected\""; } ?>>17m</option>
-				<option value="15m" <?php if($this->session->userdata('band') == "15m") { echo "selected=\"selected\""; } ?>>15m</option>
-				<option value="12m" <?php if($this->session->userdata('band') == "12m") { echo "selected=\"selected\""; } ?>>12m</option>
-				<option value="10m" <?php if($this->session->userdata('band') == "10m") { echo "selected=\"selected\""; } ?>>10m</option>
-				<option value="6m" <?php if($this->session->userdata('band') == "6m") { echo "selected=\"selected\""; } ?>>6m</option>
-				<option value="4m" <?php if($this->session->userdata('band') == "4m") { echo "selected=\"selected\""; } ?>>4m</option>
-				<option value="2m" <?php if($this->session->userdata('band') == "2m") { echo "selected=\"selected\""; } ?>>2m</option>
-				<option value="70cm" <?php if($this->session->userdata('band') == "70cm") { echo "selected=\"selected\""; } ?>>70cm</option>
-				<option value="23cm" <?php if($this->session->userdata('band') == "23cm") { echo "selected=\"selected\""; } ?>>23cm</option>
-				<option value="13cm" <?php if($this->session->userdata('band') == "14cm") { echo "selected=\"selected\""; } ?>>13cm</option>
-				<option value="9cm" <?php if($this->session->userdata('band') == "9cm") { echo "selected=\"selected\""; } ?>>9cm</option>
-				<option value="3cm" <?php if($this->session->userdata('band') == "3cm") { echo "selected=\"selected\""; } ?>>3cm</option>
-				</select></td>
-			</tr>
+      <tr>
+        <td class="title">Callsign</td>
+        <td><input size="10" id="callsign" type="text" name="callsign" value="" /></td>
+      </tr>  
 
-			<tr>
-				<td class="title">RST (S)</td>
-				<td><input id="rst_sent" class="rst" name="rst_sent" type="text" size="3" value="59"> <span class="title">RST (R)</span> <input id="rst_recv" class="rst" name="rst_recv" type="text"  size="3"  value="59"></td>
-			</tr>
+      <tr>
+        <td class="title">Mode</td>
+        <td><select name="mode" class="mode">
+        <option value="SSB" <?php if($this->session->userdata('mode') == "" || $this->session->userdata('mode') == "SSB") { echo "selected=\"selected\""; } ?>>SSB</option>
+        <option value="AM" <?php if($this->session->userdata('mode') == "AM") { echo "selected=\"selected\""; } ?>>AM</option>
+        <option value="FM" <?php if($this->session->userdata('mode') == "FM") { echo "selected=\"selected\""; } ?>>FM</option>
+        <option value="CW" <?php if($this->session->userdata('mode') == "CW") { echo "selected=\"selected\""; } ?>>CW</option>
+        <option value="RTTY" <?php if($this->session->userdata('mode') == "RTTY") { echo "selected=\"selected\""; } ?>>RTTY</option>
+        <option value="PSK31" <?php if($this->session->userdata('mode') == "PSK31") { echo "selected=\"selected\""; } ?>>PSK31</option>
+        <option value="PSK63" <?php if($this->session->userdata('mode') == "PSK63") { echo "selected=\"selected\""; } ?>>PSK63</option>
+        <option value="JT65" <?php if($this->session->userdata('mode') == "JT65") { echo "selected=\"selected\""; } ?>>JT65</option>
+        <option value="JT65B" <?php if($this->session->userdata('mode') == "JT65B") { echo "selected=\"selected\""; } ?>>JT65B</option>
+        <option value="JT6C" <?php if($this->session->userdata('mode') == "JT6C") { echo "selected=\"selected\""; } ?>>JT6C</option>
+        <option value="JT6M" <?php if($this->session->userdata('mode') == "JT6M") { echo "selected=\"selected\""; } ?>>JT6M</option>
+        <option value="JT9-1" <?php if($this->session->userdata('mode') == "JT9-1") { echo "selected=\"selected\""; } ?>>JT9-1</option>
+        <option value="FSK441" <?php if($this->session->userdata('mode') == "FSK441") { echo "selected=\"selected\""; } ?>>FSK441</option>
+        <option value="JTMS" <?php if($this->session->userdata('mode') == "JTMS") { echo "selected=\"selected\""; } ?>>JTMS</option>
+        <option value="ISCAT" <?php if($this->session->userdata('mode') == "ISCAT") { echo "selected=\"selected\""; } ?>>ISCAT</option>
+        <option value="MSK144" <?php if($this->session->userdata('mode') == "MSK144") { echo "selected=\"selected\""; } ?>>MSK144</option>
+        <option value="JTMSK" <?php if($this->session->userdata('mode') == "JTMSK") { echo "selected=\"selected\""; } ?>>JTMSK</option>
+        <option value="QRA64" <?php if($this->session->userdata('mode') == "QRA64") { echo "selected=\"selected\""; } ?>>QRA64</option>
+        <option value="PKT" <?php if($this->session->userdata('mode') == "PKT") { echo "selected=\"selected\""; } ?>>PKT</option>
+        <option value="FT8" <?php if($this->session->userdata('mode') == "FT8") { echo "selected=\"selected\""; } ?>>FT8</option>
+        <option value="SSTV" <?php if($this->session->userdata('mode') == "SSTV") { echo "selected=\"selected\""; } ?>>SSTV</option>
+        <option value="HELL" <?php if($this->session->userdata('mode') == "HELL") { echo "selected=\"selected\""; } ?>>HELL</option>
+        <option value="HELL80" <?php if($this->session->userdata('mode') == "HELL80") { echo "selected=\"selected\""; } ?>>HELL80</option>
+        <option value="DSTAR" <?php if($this->session->userdata('mode') == "DSTAR") { echo "selected=\"selected\""; } ?>>DSTAR</option>
+        <option value="DIGITALVOICE" <?php if($this->session->userdata('mode') == "DIGITALVOICE") { echo "selected=\"selected\""; } ?>>DIGITALVOICE</option>
+        </select>
 
-			<tr>
-				<td class="title">Name</td>
-				<td><input id="name" type="text" name="name" value="" /></td>
-			</tr>	
+        <span class="title">Band</span>
+        <select name="band" class="band">
+        <option value="160m" <?php if($this->session->userdata('band') == "160m") { echo "selected=\"selected\""; } ?>>160m</option>
+        <option value="80m" <?php if($this->session->userdata('band') == "80m") { echo "selected=\"selected\""; } ?>>80m</option>
+        <option value="60m" <?php if($this->session->userdata('band') == "60m") { echo "selected=\"selected\""; } ?>>60m</option>
+        <option value="40m" <?php if($this->session->userdata('band') == "40m") { echo "selected=\"selected\""; } ?>>40m</option>
+        <option value="30m" <?php if($this->session->userdata('band') == "30m") { echo "selected=\"selected\""; } ?>>30m</option>
+        <option value="20m" <?php if($this->session->userdata('band') == "20m") { echo "selected=\"selected\""; } ?>>20m</option>
+        <option value="17m" <?php if($this->session->userdata('band') == "17m") { echo "selected=\"selected\""; } ?>>17m</option>
+        <option value="15m" <?php if($this->session->userdata('band') == "15m") { echo "selected=\"selected\""; } ?>>15m</option>
+        <option value="12m" <?php if($this->session->userdata('band') == "12m") { echo "selected=\"selected\""; } ?>>12m</option>
+        <option value="10m" <?php if($this->session->userdata('band') == "10m") { echo "selected=\"selected\""; } ?>>10m</option>
+        <option value="6m" <?php if($this->session->userdata('band') == "6m") { echo "selected=\"selected\""; } ?>>6m</option>
+        <option value="4m" <?php if($this->session->userdata('band') == "4m") { echo "selected=\"selected\""; } ?>>4m</option>
+        <option value="2m" <?php if($this->session->userdata('band') == "2m") { echo "selected=\"selected\""; } ?>>2m</option>
+        <option value="70cm" <?php if($this->session->userdata('band') == "70cm") { echo "selected=\"selected\""; } ?>>70cm</option>
+        <option value="23cm" <?php if($this->session->userdata('band') == "23cm") { echo "selected=\"selected\""; } ?>>23cm</option>
+        <option value="13cm" <?php if($this->session->userdata('band') == "14cm") { echo "selected=\"selected\""; } ?>>13cm</option>
+        <option value="9cm" <?php if($this->session->userdata('band') == "9cm") { echo "selected=\"selected\""; } ?>>9cm</option>
+        <option value="3cm" <?php if($this->session->userdata('band') == "3cm") { echo "selected=\"selected\""; } ?>>3cm</option>
+        </select></td>
+      </tr>
 
-			<tr>
-				<td class="title">Location</td>
-				<td><input id="qth" type="text" name="qth" value="" /></td>
-			</tr>
+      <tr>
+        <td class="title">RST (S)</td>
+        <td><input id="rst_sent" class="rst" name="rst_sent" type="text" size="3" value="59"> <span class="title">RST (R)</span> <input id="rst_recv" class="rst" name="rst_recv" type="text"  size="3"  value="59"></td>
+      </tr>
 
-			<tr>
-				<td class="title">Locator</td>
-				<td><input id="locator" type="text" name="locator" value="" size="7" /></td>
-			</tr>
+      <tr>
+        <td class="title">Name</td>
+        <td><input id="name" type="text" name="name" value="" /></td>
+      </tr>  
 
-			<tr>
-				<td class="title">Comment</td>
-				<td><input id="comment" type="text" name="comment" value="" /></td>
-			</tr>
-		</table>
+      <tr>
+        <td class="title">Location</td>
+        <td><input id="qth" type="text" name="qth" value="" /></td>
+      </tr>
+
+      <tr>
+        <td class="title">Locator</td>
+        <td><input id="locator" type="text" name="locator" value="" size="7" /></td>
+      </tr>
+
+      <tr>
+        <td class="title">Comment</td>
+        <td><input id="comment" type="text" name="comment" value="" /></td>
+      </tr>
+    </table>
 
 
-		<div class="info">
-			<input style="border: none; -webkit-box-shadow: none;" size="20" id="country" type="text" name="country" value="" /> <span id="locator_info"></span>
-		</div>
+    <div class="info">
+      <input style="border: none; -webkit-box-shadow: none;" size="20" id="country" type="text" name="country" value="" /> <span id="locator_info"></span>
+    </div>
 
-		<ul class="tabs">
-		  <li class="active"><a href="#home">Home</a></li>
-		  <li><a href="#station">Station</a></li>
-		  <li><a href="#satellite">Satellite</a></li>
-		  <li><a href="#qsl">QSL</a></li>
-		</ul>
-		 
-		<div class="pill-content">
-		  <div class="active" id="home">
-				<table>
-					<tr>
-						<td>Propagation Mode</td>
-						<td>
-							<select name="prop_mode">
-								<option value="" selected="selected"></option>
-								<option value="AUR">Aurora</option>
-								<option value="AUE">Aurora-E</option>
-								<option value="BS">Back scatter</option>
-								<option value="ECH">EchoLink</option>
-								<option value="EME">Earth-Moon-Earth</option>
-								<option value="ES">Sporadic E</option>
-								<option value="FAI">Field Aligned Irregularities</option>
-								<option value="F2">F2 Reflection</option>
-								<option value="INTERNET">Internet-assisted</option>
-								<option value="ION">Ionoscatter</option>
-								<option value="IRL">IRLP</option>
-								<option value="MS">Meteor scatter</option>
-								<option value="RPT">Terrestrial or atmospheric repeater or transponder</option>
-								<option value="RS">Rain scatter</option>
-								<option value="SAT">Satellite</option>
-								<option value="TEP">Trans-equatorial</option>
-								<option value="TR">Tropospheric ducting</option>
-							</select>
-						</td>
-					</tr>
-					<tr>
-						<td>IOTA</td>
-						<td><input id="iota_ref" type="text" name="iota_ref" value="" /> e.g: EU-005</td>
-					</tr>
-				</table>
-		  </div>
-		  <div id="station">
-				<table>
-					<tr>
-						<td>Radio</td>
-						<td>
-							<select class="radios" name="radio">
-							<option value="0" selected="selected">None</option>
-							<?php foreach ($radios->result() as $row) { ?>
-							<option value="<?php echo $row->id; ?>" <?php if($this->session->userdata('radio') == $row->id) { echo "selected=\"selected\""; } ?>><?php echo $row->radio; ?></option>
-							<?php } ?>
-							</select>
-						</td>
-					</tr>
-					<tr>
-						<td>Frequency</td>
-						<td><input type="text" id="frequency" name="freq_display" value="" /></td>
-					</tr>
-				</table>
-		  </div>
-		  <div id="satellite">
-				<table>
-					<tr>
-						<td>Sat Name</td>
-						<td><input id="sat_name" type="text" name="sat_name" class="sat_name" value="<?php echo $this->session->userdata('sat_name'); ?>" /></td>
-					</tr>
-	
-					<tr>
-						<td>Sat Mode</td>
-						<td><input id="sat_mode" type="text" name="sat_mode" class="sat_mode" value="<?php echo $this->session->userdata('sat_mode'); ?>" /></td>
-					</tr>
-				</table>
-		  </div>
-		  <div id="qsl">
-				<table>
-					<tr>
-						<td>Sent</td>
-						<td><select name="qsl_sent">
-							<option value="N" selected="selected">No</option>
-							<option value="Y">Yes</option>
-							<option value="R">Requested</option>
-						</select></td>
-					<tr>
-						<td>Method</td>
-						<td><select name="qsl_sent_method">
-							<option value="" selected="selected">Method</option>
-							<option value="D">Direct</option>
-							<option value="B">Bureau</option>
-						</select></td>
-					</tr>
-					
-					<tr>
-						<td>Via</td>
-						<td><input type="text" name="qsl_via" value="" /></td>
-					</tr>
-				</table>
-		  </div>
-		</div>
+    <ul class="tabs">
+      <li class="active"><a href="#home">Home</a></li>
+      <li><a href="#station">Station</a></li>
+      <li><a href="#satellite">Satellite</a></li>
+      <li><a href="#qsl">QSL</a></li>
+    </ul>
+     
+    <div class="pill-content">
+      <div class="active" id="home">
+        <table>
+          <tr>
+            <td>Propagation Mode</td>
+            <td>
+              <select name="prop_mode">
+                <option value="" selected="selected"></option>
+                <option value="AUR">Aurora</option>
+                <option value="AUE">Aurora-E</option>
+                <option value="BS">Back scatter</option>
+                <option value="ECH">EchoLink</option>
+                <option value="EME">Earth-Moon-Earth</option>
+                <option value="ES">Sporadic E</option>
+                <option value="FAI">Field Aligned Irregularities</option>
+                <option value="F2">F2 Reflection</option>
+                <option value="INTERNET">Internet-assisted</option>
+                <option value="ION">Ionoscatter</option>
+                <option value="IRL">IRLP</option>
+                <option value="MS">Meteor scatter</option>
+                <option value="RPT">Terrestrial or atmospheric repeater or transponder</option>
+                <option value="RS">Rain scatter</option>
+                <option value="SAT">Satellite</option>
+                <option value="TEP">Trans-equatorial</option>
+                <option value="TR">Tropospheric ducting</option>
+              </select>
+            </td>
+          </tr>
+          <tr>
+            <td>IOTA</td>
+            <td><input id="iota_ref" type="text" name="iota_ref" value="" /> e.g: EU-005</td>
+          </tr>
+        </table>
+      </div>
+      <div id="station">
+        <table>
+          <tr>
+            <td>Radio</td>
+            <td>
+              <select class="radios" name="radio">
+              <option value="0" selected="selected">None</option>
+              <?php foreach ($radios->result() as $row) { ?>
+              <option value="<?php echo $row->id; ?>" <?php if($this->session->userdata('radio') == $row->id) { echo "selected=\"selected\""; } ?>><?php echo $row->radio; ?></option>
+              <?php } ?>
+              </select>
+            </td>
+          </tr>
+          <tr>
+            <td>Frequency</td>
+            <td><input type="text" id="frequency" name="freq_display" value="" /></td>
+          </tr>
+        </table>
+      </div>
+      <div id="satellite">
+        <table>
+          <tr>
+            <td>Sat Name</td>
+            <td><input id="sat_name" type="text" name="sat_name" class="sat_name" value="<?php echo $this->session->userdata('sat_name'); ?>" /></td>
+          </tr>
+  
+          <tr>
+            <td>Sat Mode</td>
+            <td><input id="sat_mode" type="text" name="sat_mode" class="sat_mode" value="<?php echo $this->session->userdata('sat_mode'); ?>" /></td>
+          </tr>
+        </table>
+      </div>
+      <div id="qsl">
+        <table>
+          <tr>
+            <td>Sent</td>
+            <td><select name="qsl_sent">
+              <option value="N" selected="selected">No</option>
+              <option value="Y">Yes</option>
+              <option value="R">Requested</option>
+            </select></td>
+          <tr>
+            <td>Method</td>
+            <td><select name="qsl_sent_method">
+              <option value="" selected="selected">Method</option>
+              <option value="D">Direct</option>
+              <option value="B">Bureau</option>
+            </select></td>
+          </tr>
+          
+          <tr>
+            <td>Via</td>
+            <td><input type="text" name="qsl_via" value="" /></td>
+          </tr>
+        </table>
+      </div>
+    </div>
 
-		<div class="actions"><input class="btn primary" type="submit" value="Add QSO" /> <input type="reset" value="Reset" class="btn" /></div>
-		
+    <div class="actions"><input class="btn primary" type="submit" value="Add QSO" /> <input type="reset" value="Reset" class="btn" /></div>
+    
 
-		</form>
-	  </div>
-	  <div class="span9 offset1">
+    </form>
+    </div>
+    <div class="span9 offset1">
 
-		 <div id="partial_view">
-		 	<h2>Last 16 QSOs</h2>
+     <div id="partial_view">
+       <h2>Last 16 QSOs</h2>
 
-		 	<table class="zebra-striped" width="100%">
-				<tr class="log_title titles">
-					<td>Date</td>
-					<td>Time</td>
-					<td>Call</td>
-					<td>Mode</td>
-					<td>Sent</td>
-					<td>Recv</td>
-					<td>Band</td>
-				</tr>
+       <table class="zebra-striped" width="100%">
+        <tr class="log_title titles">
+          <td>Date/Time</td>
+          <td>Call</td>
+          <td>Mode</td>
+          <td>Sent</td>
+          <td>Recv</td>
+          <td>Band</td>
+        </tr>
 
-				<?php $i = 0; 
-			 foreach ($query->result() as $row) { ?>
-					<?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><?php echo $row->COL_MODE; ?></td>
-					<td><?php echo $row->COL_RST_SENT; ?></td>
-					<td><?php echo $row->COL_RST_RCVD; ?></td>
-					<?php if($row->COL_SAT_NAME != null) { ?>
-					<td><?php echo $row->COL_SAT_NAME; ?></td>
-					<?php } else { ?>
-					<td><?php echo $row->COL_BAND; ?></td>
-					<?php } ?>
-				</tr>
-				<?php $i++; } ?>
+        <?php $i = 0; 
+       foreach ($query->result() as $row) { ?>
+          <?php  echo '<tr class="tr'.($i & 1).'">'; ?>
+          <td><?php echo $row->COL_TIME_ON; ?></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><?php echo $row->COL_MODE; ?></td>
+          <td><?php echo $row->COL_RST_SENT; ?></td>
+          <td><?php echo $row->COL_RST_RCVD; ?></td>
+          <?php if($row->COL_SAT_NAME != null) { ?>
+          <td><?php echo $row->COL_SAT_NAME; ?></td>
+          <?php } else { ?>
+          <td><?php echo $row->COL_BAND; ?></td>
+          <?php } ?>
+        </tr>
+        <?php $i++; } ?>
 
-			</table></div>
+      </table></div>
 
-	  </div>
-	</div>
+    </div>
+  </div>
 
 </div>
 
 
 
 <script type="text/javascript">
-	i=0;
-	$(document).ready(function(){
 
-	// Set the focus input to the callsign field
-	$("#callsign").focus();
-	/* Javascript for controlling rig frequency. */
+  function delay(callback, ms) {
+    var timer = 0;
+    return function() {
+      var context = this, args = arguments;
+      clearTimeout(timer);
+      timer = setTimeout(function () {
+        callback.apply(context, args);
+      }, ms || 0);
+    };
+  }
 
-	var updateFromCAT = function() {
-		if($('select.radios option:selected').val() != '0') {
-			// Get frequency
-			$.get('radio/frequency/' + $('select.radios option:selected').val(), function(result) {
+  i=0;
+  typeDelay=1000;
 
-				if(result == "0") {
-				} else {
-					$('#frequency').val(result);
-					$(".band").val(frequencyToBand(result));
-				}
-			});
-			
-			// Get Mode
-			$.get('radio/mode/' + $('select.radios option:selected').val(), function(result) {
-				if (result == "LSB" || result == "USB" || result == "SSB") {
-					$(".mode").val('SSB');
-				} else {
-					$(".mode").val(result);	
-				}
-			});
+  $(document).ready(function(){
 
-				// Get SAT_Name
-			$.get('radio/satname/' + $('select.radios option:selected').val(), function(result) {
-				$(".sat_name").val(result);	
-			});
+  // Set the focus input to the callsign field
+  $("#callsign").focus();
+  /* Javascript for controlling rig frequency. */
 
-				// Get SAT_Name
-			$.get('radio/satmode/' + $('select.radios option:selected').val(), function(result) {
-				$(".sat_mode").val(result);	
-			});
+  var updateFromCAT = function() {
+    if($('select.radios option:selected').val() != '0') {
+      // Get frequency
+      $.get('radio/frequency/' + $('select.radios option:selected').val(), function(result) {
 
-		}
-	};
+        if(result == "0") {
+        } else {
+          $('#frequency').val(result);
+          $(".band").val(frequencyToBand(result));
+        }
+      });
+      
+      // Get Mode
+      $.get('radio/mode/' + $('select.radios option:selected').val(), function(result) {
+        if (result == "LSB" || result == "USB" || result == "SSB") {
+          $(".mode").val('SSB');
+        } else {
+          $(".mode").val(result);  
+        }
+      });
 
-	// Update frequency every second
-	setInterval(updateFromCAT, 1000);
+        // Get SAT_Name
+      $.get('radio/satname/' + $('select.radios option:selected').val(), function(result) {
+        $(".sat_name").val(result);  
+      });
 
-	// If a radios selected from drop down select radio update.
-	$('.radios').change(updateFromCAT);
+        // Get SAT_Name
+      $.get('radio/satmode/' + $('select.radios option:selected').val(), function(result) {
+        $(".sat_mode").val(result);  
+      });
 
-	// If radio isn't SatPC32 clear sat_name and sat_mode
-	$( ".radios" ).change(function() {
-	  	if ($("#yourdropdownid option:selected").text() != "SatPC32") {
-	  		$(".sat_name").val("");	
-	  		$(".sat_mode").val("");	
-	  	}
-	});
+    }
+  };
 
-		/* On Page Load */
-		var catcher = function() {
-		  var changed = false;
-		  $('form').each(function() {
-		    if ($(this).data('initialForm') != $(this).serialize()) {
-		      changed = true;
-		      $(this).addClass('changed');
-		    } else {
-		      $(this).removeClass('changed');
-		    }
-		  });
-		  if (changed) {
-		    return 'Unsaved QSO!';
-		  }
-		};
+  // Update frequency every second
+  setInterval(updateFromCAT, 1000);
 
-		$(function() {
-		  $('form').each(function() {
-		    $(this).data('initialForm', $(this).serialize());
-		  }).submit(function(e) {
-		    var formEl = this;
-		    var changed = false;
-		    $('form').each(function() {
-		      if (this != formEl && $(this).data('initialForm') != $(this).serialize()) {
-		        changed = true;
-		        $(this).addClass('changed');
-		      } else {
-		        $(this).removeClass('changed');
-		      }
-		    });
-		    if (changed && !confirm('You have an unsaved QSO. Continue with QSO?')) {
-		      e.preventDefault();
-		    } else {
-		      $(window).unbind('beforeunload', catcher);
-		    }
-		  });
-		  $(window).bind('beforeunload', catcher);
-		});
-		
-		$.get('qso/band_to_freq/' + $('.band').val() + '/' + $('.mode').val(), function(result) {
-						$('#frequency').val(result);
-		});	
-	
-		/* Calculate Frequency */
-			/* on band change */
-			$('.band').change(function() {
-				$.get('qso/band_to_freq/' + $(this).val() + '/' + $('.mode').val(), function(result) {
-						$('#frequency').val(result);
-					});	
-			});
-			
-			/* on mode change */
-			$('.mode').change(function() {
-				$.get('qso/band_to_freq/' + $('.band').val() + '/' + $('.mode').val(), function(result) {
-						$('#frequency').val(result);
-					});	
-			});
-	
-		/* On Key up Calculate Bearing and Distance */
-		$("#locator").keyup(function(){
-			if ($(this).val()) {
-				$('#locator_info').load("logbook/bearing/" + $(this).val()).fadeIn("slow");
-			}
-		});
-	
-		/* On Callsign Change */
-		$("#callsign").focusout(function(){
-			if ($(this).val()) {
-				/* Find Callsign Matches */
-				$('#partial_view').load("logbook/partial/" + $(this).val()).fadeIn("slow");
-	
-				/* Find and populate DXCC */
-				$.get('logbook/find_dxcc/' + $(this).val(), function(result) {
-					//$('#country').val(result);
-					obj = JSON.parse(result);
-					$('#country').val(convert_case(obj.Name));
-					$('#dxcc_id').val(obj.DXCC);
-					$('#cqz').val(obj.CQZ);
+  // If a radios selected from drop down select radio update.
+  $('.radios').change(updateFromCAT);
 
-				});
-	
-				/* Find Locator if the field is empty */
-				if($('#locator').val() == "") {
-					$.get('logbook/callsign_qra/' + $(this).val(), function(result) {
-						$('#locator').val(result);
-						$('#locator_info').load("logbook/bearing/" + result).fadeIn("slow");
-					});
+  // If radio isn't SatPC32 clear sat_name and sat_mode
+  $( ".radios" ).change(function() {
+      if ($("#yourdropdownid option:selected").text() != "SatPC32") {
+        $(".sat_name").val("");  
+        $(".sat_mode").val("");  
+      }
+  });
 
-				}
-	
-				/* Find Operators Name */
-				if($('#name').val() == "") {
-					$.get('logbook/callsign_name/' + $(this).val(), function(result) {
-						$('#name').val(result);
-					});
-				}
+    /* On Page Load */
+    var catcher = function() {
+      var changed = false;
+      $('form').each(function() {
+        if ($(this).data('initialForm') != $(this).serialize()) {
+          changed = true;
+          $(this).addClass('changed');
+        } else {
+          $(this).removeClass('changed');
+        }
+      });
+      if (changed) {
+        return 'Unsaved QSO!';
+      }
+    };
 
-				if($('#qth').val() == "") {
-					$.get('logbook/callsign_qth/' + $(this).val(), function(result) {
-						$('#qth').val(result);
-					});
-				}
-		
-				if($('#qth').val() == "") {
-					$.get('logbook/callsign_iota/' + $(this).val(), function(result) {
-						$('#iota_ref').val(result);
-					});
-				}
+    $(function() {
+      $('form').each(function() {
+        $(this).data('initialForm', $(this).serialize());
+      }).submit(function(e) {
+        var formEl = this;
+        var changed = false;
+        $('form').each(function() {
+          if (this != formEl && $(this).data('initialForm') != $(this).serialize()) {
+            changed = true;
+            $(this).addClass('changed');
+          } else {
+            $(this).removeClass('changed');
+          }
+        });
+        if (changed && !confirm('You have an unsaved QSO. Continue with QSO?')) {
+          e.preventDefault();
+        } else {
+          $(window).unbind('beforeunload', catcher);
+        }
+      });
+      $(window).bind('beforeunload', catcher);
+    });
+    
+    $.get('qso/band_to_freq/' + $('.band').val() + '/' + $('.mode').val(), function(result) {
+            $('#frequency').val(result);
+    });  
+  
+    /* Calculate Frequency */
+      /* on band change */
+      $('.band').change(function() {
+        $.get('qso/band_to_freq/' + $(this).val() + '/' + $('.mode').val(), function(result) {
+            $('#frequency').val(result);
+          });  
+      });
+      
+      /* on mode change */
+      $('.mode').change(function() {
+        $.get('qso/band_to_freq/' + $('.band').val() + '/' + $('.mode').val(), function(result) {
+            $('#frequency').val(result);
+          });  
+      });
+  
+    /* On Key up Calculate Bearing and Distance */
+    $("#locator").keyup(function(){
+      if ($(this).val()) {
+        $('#locator_info').load("logbook/bearing/" + $(this).val()).fadeIn("slow");
+      }
+    });
+  
+    /* On Callsign Change */
+    $("#callsign").keyup(delay(function(){
+      if ($(this).val()) {
+        /* Find and populate DXCC */
+        $.get('logbook/find_dxcc/' + $(this).val(), function(result) {
+          //$('#country').val(result);
+          obj = JSON.parse(result);
+          $('#country').val(convert_case(obj.Name));
+          $('#dxcc_id').val(obj.DXCC);
+          $('#cqz').val(obj.CQZ);
 
-			}
-		});
-		
-		
-		// Change report based on mode
-		$('.mode').change(function(){
-		  if($(this).val() == 'JT65' || $(this).val() == 'JT65B' || $(this).val() == 'JT6C' || $(this).val() == 'JTMS' || $(this).val() == 'ISCAT' || $(this).val() == 'MSK144' || $(this).val() == 'JTMSK' || $(this).val() == 'QRA64'){
-			$('#rst_sent').val('-5');
-			$('#rst_recv').val('-5');
-		  } else if ($(this).val() == 'FSK441' || $(this).val() == 'JT6M') {
-		  	$('#rst_sent').val('26');
-			$('#rst_recv').val('26');
-		  } else if ($(this).val() == 'CW') {
-		  	$('#rst_sent').val('599');
-			$('#rst_recv').val('599');
-		  } else {
-		  	$('#rst_sent').val('59');
-			$('#rst_recv').val('59');
-		  }
-		});
-	});
+        });
+  
+        /* Find Locator if the field is empty */
+        if($('#locator').val() == "") {
+          $.get('logbook/callsign_qra/' + $(this).val(), function(result) {
+            $('#locator').val(result);
+            $('#locator_info').load("logbook/bearing/" + result).fadeIn("slow");
+          });
+
+        }
+  
+        /* Find Operators Name */
+        if($('#name').val() == "") {
+          $.get('logbook/callsign_name/' + $(this).val(), function(result) {
+            $('#name').val(result);
+          });
+        }
+
+        if($('#qth').val() == "") {
+          $.get('logbook/callsign_qth/' + $(this).val(), function(result) {
+            $('#qth').val(result);
+          });
+        }
+    
+        if($('#qth').val() == "") {
+          $.get('logbook/callsign_iota/' + $(this).val(), function(result) {
+            $('#iota_ref').val(result);
+          });
+        }
+
+        /* Find Callsign Matches */
+        $('#partial_view').load("logbook/partial/" + $(this).val()).fadeIn("slow");
+  
+      } else {
+        /* Reset fields ... */
+        $('#country').val("");
+        $('#dxcc_id').val("");
+        $('#cqz').val("");
+        $('#name').val("");
+        $('#qth').val("");
+        $('#iota_ref').val("");
+        $('#partial_view').load("logbook/partial/");
+      }
+    }, typeDelay));
+    
+    
+    // Change report based on mode
+    $('.mode').change(function(){
+      if($(this).val() == 'JT65' || $(this).val() == 'JT65B' || $(this).val() == 'JT6C' || $(this).val() == 'JTMS' || $(this).val() == 'ISCAT' || $(this).val() == 'MSK144' || $(this).val() == 'JTMSK' || $(this).val() == 'QRA64'){
+      $('#rst_sent').val('-5');
+      $('#rst_recv').val('-5');
+      } else if ($(this).val() == 'FSK441' || $(this).val() == 'JT6M') {
+        $('#rst_sent').val('26');
+      $('#rst_recv').val('26');
+      } else if ($(this).val() == 'CW') {
+        $('#rst_sent').val('599');
+      $('#rst_recv').val('599');
+      } else {
+        $('#rst_sent').val('59');
+      $('#rst_recv').val('59');
+      }
+    });
+  });
 
 
-	function convert_case(str) {
-	  var lower = str.toLowerCase();
-	  return lower.replace(/(^| )(\w)/g, function(x) {
-	    return x.toUpperCase();
-	  });
-	}
+  function convert_case(str) {
+    var lower = str.toLowerCase();
+    return lower.replace(/(^| )(\w)/g, function(x) {
+      return x.toUpperCase();
+    });
+  }
 
 
 </script>
\ No newline at end of file
diff --git a/application/views/view_log/partial/log.php b/application/views/view_log/partial/log.php
index 5141fdad..fe1423a8 100644
--- a/application/views/view_log/partial/log.php
+++ b/application/views/view_log/partial/log.php
@@ -1,4 +1,4 @@
-	<table width="100%">
+	<table class="zebra-striped" width="100%">
 		<tr class="titles">
 			<td>Date</td>
 			<td>Time</td>
diff --git a/css/global.css b/css/global.css
index ece97d24..7212ded5 100644
--- a/css/global.css
+++ b/css/global.css
@@ -69,7 +69,7 @@ td.item { padding-bottom: 5px; }
 .title { padding-top: 5px; padding-bottom: 5px; color: #0073EA; font-weight: bold; }
 #qso_input { border: 1px solid #dddddd; margin: 5px; padding: 2px; }
 .input_date { width: 70px; }
-.input_time { width: 54px; }
+.input_time { width: 32px; }
 #locator { width: 55px; text-transform: uppercase; }
 #country { border: none; }
 #locator_info { font-size: 13px; }
@@ -103,4 +103,4 @@ ul#user li { float: left; margin: 2px 2px 0 3px; height:43px; border-bottom: non
 .pager a:hover { background-color: azure; }
 
 /* Footer */
-#footer { margin: 0 auto; width: 780px; text-align: center; padding-top: 5px; padding-bottom: 5px; font-size: 12px; }
\ No newline at end of file
+#footer { margin: 0 auto; width: 780px; text-align: center; padding-top: 5px; padding-bottom: 5px; font-size: 12px; }
diff --git a/css/main.css b/css/main.css
index 3904ed6d..f7919a48 100644
--- a/css/main.css
+++ b/css/main.css
@@ -22,7 +22,7 @@ table .title { font-weight: bold; color: #439BF6; }
 /* Add QSO CSS */
 .rst { width: 50px !important; }
 .input_date { width: 70px !important; }
-.input_time { width: 55px !important; }
+.input_time { width: 32px !important; }
 .band { width: 80px; }
 .mode { width: 80px; }
 #callsign { text-transform: uppercase; }