diff --git a/app/apollo_portal/settings/prod.py b/app/apollo_portal/settings/prod.py
index 0843daa..cf5a716 100644
--- a/app/apollo_portal/settings/prod.py
+++ b/app/apollo_portal/settings/prod.py
@@ -18,6 +18,8 @@
     for hostname in PRODUCTION_HOSTNAMES
 ]
 
+TIME_ZONE = 'Australia/Brisbane'
+
 # Use manifest to manage static file versions for cache busting:
 STATICFILES_STORAGE = ('django.contrib.staticfiles.storage'
                        '.ManifestStaticFilesStorage')
diff --git a/app/genomes/templates/genomes/snippets/genome-cards.html b/app/genomes/templates/genomes/snippets/genome-cards.html
index 7113f85..bd7af1e 100644
--- a/app/genomes/templates/genomes/snippets/genome-cards.html
+++ b/app/genomes/templates/genomes/snippets/genome-cards.html
@@ -433,24 +433,26 @@ <h3 class="text-center">{{ genomeDetails.name }}</h3>
 
         <div v-if="genomeDetails" class="modal-footer justify-content-center">
           <a
-            :href="genomeDetails.apollo_url"
+            :href="genomeDetails.apollo_url ? genomeDetails.apollo_url : ''"
+            :class="genomeDetails.apollo_url ? 'btn btn-primary' : 'btn btn-secondary disabled'"
             target="_blank"
-            class="btn btn-primary"
             data-toggle="tooltip"
             data-title="Jump to Apollo genome browser"
             data-placement="bottom"
           >
-            Apollo browser
+            <span v-if="genomeDetails.apollo_url">Apollo browser</span>
+            <span v-else style="white-space: nowrap;">No browser</span>
           </a>
           <a
-            v-if="genomeDetails.tracks_url"
-            :href="genomeDetails.tracks_url"
-            class="btn btn-primary"
+            :href="genomeDetails.tracks_url ? genomeDetails.tracks_url : ''"
+            :class="genomeDetails.tracks_url ? 'btn btn-primary' : 'btn btn-secondary disabled'"
+            target="_blank"
             data-toggle="tooltip"
             data-title="View available tracks for this genome"
             data-placement="bottom"
           >
-            View tracks
+            <span v-if="genomeDetails.apollo_url">View tracks</span>
+            <span v-else>No tracks</span>
           </a>
         </div>
       </div>
diff --git a/app/genomes/templates/genomes/snippets/tracks-table.html b/app/genomes/templates/genomes/snippets/tracks-table.html
index b78881b..f54e829 100644
--- a/app/genomes/templates/genomes/snippets/tracks-table.html
+++ b/app/genomes/templates/genomes/snippets/tracks-table.html
@@ -118,16 +118,16 @@
         <td>
           <a
             :href="track.apollo_url"
+            :href="track.apollo_url ? track.apollo_url : ''"
+            :class="track.apollo_url ? 'btn btn-primary' : 'btn btn-secondary disabled'"
             target="_blank"
+            class="btn btn-primary"
+            data-toggle="tooltip"
+            data-title="View genome track on Apollo"
+            data-placement="bottom"
           >
-            <button
-              class="btn btn-primary"
-              data-toggle="tooltip"
-              data-title="View genome track on Apollo"
-              data-placement="bottom"
-            >
-              Browser
-            </button>
+          <span v-if="track.apollo_url">Browser</span>
+          <small v-else style="white-space: nowrap;">No browser</small>
           </a>
         </td>
         <td>