diff --git a/application/controllers/Hamsat.php b/application/controllers/Hamsat.php
index 7ea016140..b26f051d6 100644
--- a/application/controllers/Hamsat.php
+++ b/application/controllers/Hamsat.php
@@ -24,6 +24,12 @@ class Hamsat extends CI_Controller {
 		} else {
 			$data['user_hamsat_workable_only'] = 0;
 		}
+		$hkey_opt=$this->user_options_model->get_options('hamsat',array('option_name'=>'hamsat_key','option_key'=>'api'))->result();
+		if (count($hkey_opt)>0) {
+			$data['user_hamsat_key'] = $hkey_opt[0]->option_value;
+		} else {
+			$data['user_hamsat_key']='';
+		}
 
 		// Load public view
 		$data['page_title'] = "Hamsat - Satellite Roving";
@@ -108,7 +114,6 @@ class Hamsat extends CI_Controller {
 			$workable_end_at = strtotime($decoded_json->data[$i]->workable_end_at);
 			$decoded_json->data[$i]->workable_from_to = date("H:i", $workable_start_at).' - '.date("H:i", $workable_end_at);
 
-			$decoded_json->data[$i]->sked = 'TEST';
 			if (strtoupper($decoded_json->data[$i]->satellite->name) == 'GREENCUBE') {
 				$decoded_json->data[$i]->sat_export_name = 'IO-117';
 			} else {
diff --git a/application/views/hamsat/index.php b/application/views/hamsat/index.php
index d6a36add5..c38b8be6a 100644
--- a/application/views/hamsat/index.php
+++ b/application/views/hamsat/index.php
@@ -2,21 +2,22 @@
     <br>
     <h2>Hamsat - Satellite Rovers</h2>
     <p>This data is from <a target="_blank" href="https://hams.at/">https://hams.at/</a>.
+    <span id="workable_hint">
     <?php if ($user_hamsat_workable_only) {
     echo " Only workable passes shown.";
     } else {
     echo " All passes shown.";
     }?>
+    </span>
+       <button id="toggle_workable" value="<?php echo $user_hamsat_workable_only ? '0' : '1'; ?>" type="button" onclick="loadHamsAt(this);" class="btn btn-info btn-sm"><?php echo $user_hamsat_workable_only ? 'Show all passes' : 'Show workable passes only'; ?></button>
     </p>
-    <button type="button" onclick="loadHamsAt();" class="btn btn-info btn-sm">Show All Passes</button>
     <p>
     <?php if ($user_hamsat_workable_only && $user_hamsat_key == '') { ?>
     <div class="alert alert-warning" role="warning">
        Private feed key empty. Please set the feed key in your profile.
     </div>
     <?php } else { ?>
-<!-- <table style="width:100%" class="table-sm table table-hover table-striped table-condensed text-center" id="activationsList">-->
-<table style="width:100%" class="table table-hover table-striped table-condensed text-center" id="activationsList">
+    <table style="width:100%" class="table table-hover table-striped" id="activationsList">
     <thead>
         <tr>
             <th>Date</th>