diff --git a/application/controllers/dashboard.php b/application/controllers/dashboard.php
index 273c5886..d7c8c0ee 100644
--- a/application/controllers/dashboard.php
+++ b/application/controllers/dashboard.php
@@ -24,6 +24,18 @@ class Dashboard extends CI_Controller {
 			}
 		}
 		
+		// Calculate Lat/Lng from Locator to use on Maps
+		if($this->session->userdata('user_locator')) {
+				$this->load->library('qra');
+
+				$qra_position = $this->qra->qra2latlong($this->session->userdata('user_locator'));
+				$data['qra'] = "set";
+				$data['qra_lat'] = $qra_position[0];
+				$data['qra_lng'] = $qra_position[1];   
+		} else {
+				$data['qra'] = "none";
+		}
+		
 		// Store info
 		$data['todays_qsos'] = $this->logbook_model->todays_qsos();
 		$data['total_qsos'] = $this->logbook_model->total_qsos();
diff --git a/application/controllers/logbook.php b/application/controllers/logbook.php
index 98fbd1c0..68429e47 100644
--- a/application/controllers/logbook.php
+++ b/application/controllers/logbook.php
@@ -30,6 +30,18 @@ class Logbook extends CI_Controller {
     $this->load->model('logbook_model');
     $data['results'] = $this->logbook_model->get_qsos($config['per_page'],$this->uri->segment(3));
 
+    // Calculate Lat/Lng from Locator to use on Maps
+    if($this->session->userdata('user_locator')) {
+        $this->load->library('qra');
+        $qra_position = $this->qra->qra2latlong($this->session->userdata('user_locator'));
+        $data['qra'] = "set";
+        $data['qra_lat'] = $qra_position[0];
+        $data['qra_lng'] = $qra_position[1];   
+    } else {
+        $data['qra'] = "none";
+    }
+                
+  
   
     // load the view
     $data['page_title'] = "Logbook";
diff --git a/application/controllers/welcome.php b/application/controllers/welcome.php
index 7ad2da42..30623af2 100644
--- a/application/controllers/welcome.php
+++ b/application/controllers/welcome.php
@@ -5,11 +5,7 @@ class Welcome extends CI_Controller {
 
   public function index()
   {
-        $this->load->library('hamio');
-    
-        $callbook = $this->hamio->callsign('m3php');
-        
-        print_r($callbook);
+                
 
   }
 }
diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php
index d5e276a2..a57e0c1a 100644
--- a/application/views/dashboard/index.php
+++ b/application/views/dashboard/index.php
@@ -21,7 +21,13 @@
 	
 	<script type="text/javascript">
 	  function create_map() {
-	    var latlng = new google.maps.LatLng(40.313043, -32.695312);
+	  
+	  	<?php if($qra == "set") { ?>
+		var latlng = new google.maps.LatLng(<?php echo $qra_lat; ?>, <?php echo $qra_lng; ?>);	
+		<?php } else { ?>
+		var latlng = new google.maps.LatLng(40.313043, -32.695312);
+		<?php } ?>
+	  
 	    var myOptions = {
 	      zoom: 3,
 	      center: latlng,
diff --git a/application/views/view_log/index.php b/application/views/view_log/index.php
index fbd2fb44..b255fe7b 100644
--- a/application/views/view_log/index.php
+++ b/application/views/view_log/index.php
@@ -32,7 +32,11 @@
 	
 	<script type="text/javascript">
 	  function create_map() {
-	    var latlng = new google.maps.LatLng(40.313043, -32.695312);
+	    <?php if($qra == "set") { ?>
+		var latlng = new google.maps.LatLng(<?php echo $qra_lat; ?>, <?php echo $qra_lng; ?>);	
+		<?php } else { ?>
+		var latlng = new google.maps.LatLng(40.313043, -32.695312);
+		<?php } ?>
 	    var myOptions = {
 	      zoom: 3,
 	      center: latlng,