diff --git a/application/models/Stationsetup_model.php b/application/models/Stationsetup_model.php
index d2d3ce5c9..239dc2070 100644
--- a/application/models/Stationsetup_model.php
+++ b/application/models/Stationsetup_model.php
@@ -234,7 +234,7 @@ class Stationsetup_model extends CI_Model {
 	}
 
 	function list_all_locations() {
-		$sql = "select station_profile_name, station_gridsquare, station_city, station_iota, station_sota, station_callsign, station_power, station_dxcc, dxcc_entities.name as dxccname, dxcc_entities.prefix as dxccprefix, station_cnty, station_cq, station_itu, station_active, eqslqthnickname, state, county, station_sig, station_sig_info, qrzrealtime, station_wwff, station_pota, oqrs, oqrs_text, oqrs_email, webadifrealtime, clublogrealtime, clublogignore, hrdlogrealtime, creation_date, last_modified
+		$sql = "select station_profile.station_id, station_profile_name, station_gridsquare, station_city, station_iota, station_sota, station_callsign, station_power, station_dxcc, dxcc_entities.name as dxccname, dxcc_entities.prefix as dxccprefix, station_cnty, station_cq, station_itu, station_active, eqslqthnickname, state, county, station_sig, station_sig_info, qrzrealtime, station_wwff, station_pota, oqrs, oqrs_text, oqrs_email, webadifrealtime, clublogrealtime, clublogignore, hrdlogrealtime, creation_date, last_modified
 	 from station_profile
 	 join dxcc_entities on station_profile.station_dxcc = dxcc_entities.adif
 	 where user_id = ?";
diff --git a/application/views/stationsetup/locationlist.php b/application/views/stationsetup/locationlist.php
index 89a3ae4e6..171379344 100644
--- a/application/views/stationsetup/locationlist.php
+++ b/application/views/stationsetup/locationlist.php
@@ -5,23 +5,23 @@
 			<table style="width:100%" class="table-sm table table-bordered table-hover table-striped table-condensed text-center">
                 <thead class="table-primary">
                     <tr>
+                        <th>Active</th>
                         <th>Name</th>
+                        <th>Callsign</th>
                         <th>Grid</th>
                         <th>City</th>
+                        <th>DXCC</th>
                         <th>IOTA</th>
                         <th>SOTA</th>
-                        <th>Callsign</th>
                         <th>Power</th>
-                        <th>DXCC</th>
                         <th>County</th>
                         <th>CQ Zone</th>
                         <th>ITU Zone</th>
-                        <th>Active</th>
-                        <th>eQSL Nick</th>
                         <th>State</th>
                         <th>County</th>
                         <th>SIG</th>
                         <th>SIG Info</th>
+                        <th>eQSL Nick</th>
                         <th>QRZ Live</th>
                         <th>WWFF</th>
                         <th>POTA</th>
@@ -39,23 +39,23 @@
                 <tbody>
                     <?php foreach ($locations as $loc): ?>
                         <tr>
-                            <td><?php echo $loc->station_profile_name; ?></td>
+                            <td><?php echo $loc->station_active ? 'Yes' : 'No' ?></td>
+                            <td><a href="http://localhost/wavelog/station/edit/<?php echo $loc->station_id; ?>"><?php echo $loc->station_profile_name; ?></a></td>
+                            <td><?php echo $loc->station_callsign; ?></td>
                             <td><?php echo $loc->station_gridsquare; ?></td>
                             <td><?php echo $loc->station_city; ?></td>
+                            <td><?php echo ucwords(strtolower($loc->dxccname), "- (/") . ' (' . $loc->dxccprefix . ') '; ?></td>
                             <td><?php echo $loc->station_iota; ?></td>
                             <td><?php echo $loc->station_sota; ?></td>
-                            <td><?php echo $loc->station_callsign; ?></td>
                             <td><?php echo $loc->station_power; ?></td>
-                            <td><?php echo $loc->dxccname . ' (' . $loc->dxccprefix . ') '; ?></td>
                             <td><?php echo $loc->station_cnty; ?></td>
                             <td><?php echo $loc->station_cq; ?></td>
                             <td><?php echo $loc->station_itu; ?></td>
-                            <td><?php echo $loc->station_active ? 'Yes' : 'No' ?></td>
-                            <td><?php echo $loc->eqslqthnickname; ?></td>
                             <td><?php echo $loc->state; ?></td>
                             <td><?php echo $loc->county; ?></td>
                             <td><?php echo $loc->station_sig; ?></td>
                             <td><?php echo $loc->station_sig_info; ?></td>
+                            <td><?php echo $loc->eqslqthnickname; ?></td>
                             <td><?php echo $loc->qrzrealtime ? 'Yes' : 'No'; ?></td>
                             <td><?php echo ($loc->station_wwff); ?></td>
                             <td><?php echo ($loc->station_pota); ?></td>