diff --git a/web/src/main/resources/static/css/modifications.css b/web/src/main/resources/static/css/modifications.css
index e9c0458ef90fe74fcf4f355374cc0def8550ffbe..44e2480eb03e0c7a6aa4352f3965dbc3284cf8d8 100644
--- a/web/src/main/resources/static/css/modifications.css
+++ b/web/src/main/resources/static/css/modifications.css
@@ -60,7 +60,7 @@ html *{
     animation: progress-bar-stripes 1s linear infinite;
 }
 
-#progress-bar-content .btn, #my-services-content .btn {
+#progress-bar-content .btn, #my-services-content .btn, #unavailable-k8s-content .btn {
     display: inline-block;
     font-weight: 400;
     text-align: center;
@@ -81,13 +81,13 @@ html *{
     transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
 }
 
-#progress-bar-content .btn-lg, #my-services-content .btn-lg, .btn-group-lg > .btn {
+#progress-bar-content .btn-lg, #my-services-content .btn-lg, #unavailable-k8s-content .btn-lg, .btn-group-lg > .btn {
     font-size: 1.171875rem;
     line-height: 1.5;
     border-radius: 0.3rem;
 }
 
-#progress-bar-content .btn-lg {
+#progress-bar-content .btn-lg, #unavailable-k8s-content .btn-lg {
     padding: 0.5rem 1rem;
 }
 
@@ -96,7 +96,7 @@ html *{
     height: 2.4rem;
 }
 
-#progress-bar-content .btn-primary, #my-services-content .btn-primary {
+#progress-bar-content .btn-primary, #my-services-content .btn-primary, #unavailable-k8s-content .btn-primary {
     color: #fff;
     background-color: #2C3E50;
     border: none;
@@ -106,7 +106,7 @@ html *{
     display: none;
 }
 
-#progress-bar-content #buttons, #my-services-content #buttons {
+#progress-bar-content #buttons, #my-services-content #buttons, #unavailable-k8s-content #buttons {
     margin: 20px 0;
     height: 47px;
 }
@@ -543,6 +543,25 @@ input[type=number].no-arrows {
     border: 1px solid black;
 }
 
+/* init state */
 #search-btn-export-loader {
     display: none;
-}
\ No newline at end of file
+}
+
+/* fix login (my-services) button vanishing while reloading or resizing page */
+.menu-header-secondary__item {
+    display: block !important;
+}
+
+#unavailable-k8s-btn-retry-btn {
+    width: 9rem;
+}
+
+/* init state */
+#unavailable-k8s-btn-retry-loader {
+    display: none;
+}
+
+.has-toggle .menu-primary__wrap {
+    padding-right: 0 !important;
+}
diff --git a/web/src/main/resources/templates/search.html b/web/src/main/resources/templates/search.html
index c54fafa8d89d8c5db86319e7948eba53ad2fa29f..4ea1a740eddf009cc3ae93911b6524432caec9ab 100644
--- a/web/src/main/resources/templates/search.html
+++ b/web/src/main/resources/templates/search.html
@@ -68,13 +68,10 @@
     <script type="text/javascript">
         // show loader after click to export button
         function btnExport(facetString) {
-            var serverUrl = "https://" + location.hostname + "/data";
-            //var serverUrl = "http://localhost:8080/data";
-
             document.getElementById('search-btn-export-btn').onclick = null;
             document.getElementById('search-btn-export-label').style.display = "none";
             document.getElementById('search-btn-export-loader').style.display = "block";
-            window.location.href = serverUrl + facetString;
+            window.location.href = '/data' + facetString;
         }
     </script>
 
diff --git a/web/src/main/resources/templates/unavailable-k8s.html b/web/src/main/resources/templates/unavailable-k8s.html
index ce5a90421727036abc1da7625e9d4329d2bcb017..0d579967b4e512a8d0175811713473c5b76edc7b 100644
--- a/web/src/main/resources/templates/unavailable-k8s.html
+++ b/web/src/main/resources/templates/unavailable-k8s.html
@@ -53,15 +53,25 @@
 
     <style type="text/css">.bg-img1{background-position:50% 50%}.bg-img1{background-image:url('https://cdn.muni.cz/media/3143889/home_page_purple_thing.png?mode=crop&center=0.5,0.5&rnd=132042127430000000&width=1920&heightratio=0.13955');}@media(max-width: 1600px){.bg-img1{background-image:url('https://cdn.muni.cz/media/3143889/home_page_purple_thing.png?mode=crop&center=0.5,0.5&rnd=132042127430000000&width=1600&heightratio=0.16746');}}@media(max-width: 1239px){.bg-img1{background-image:url('https://cdn.muni.cz/media/3143889/home_page_purple_thing.png?mode=crop&center=0.5,0.5&rnd=132042127430000000&width=1240&heightratio=0.13955');}}@media(max-width: 1023px){.bg-img1{background-image:url('https://cdn.muni.cz/media/3143889/home_page_purple_thing.png?mode=crop&center=0.5,0.5&rnd=132042127430000000&width=1024&heightratio=0.25515');}}@media(max-width: 767px){.bg-img1{background-image:url('https://cdn.muni.cz/media/3143889/home_page_purple_thing.png?mode=crop&center=0.5,0.5&rnd=132042127430000000&width=768&heightratio=0.58');}}@media(max-width: 479px){.bg-img1{background-image:url('https://cdn.muni.cz/media/3143889/home_page_purple_thing.png?mode=crop&center=0.5,0.5&rnd=132042127430000000&width=480&heightratio=0.63');}}</style>
 
-    <link rel="stylesheet" th:href="@{/css/modifications.css}"/>
     <link rel="stylesheet" th:href="@{/css/loader.css}"/>
     <link rel="stylesheet" th:href="@{/css/style.0373a0d584ab4678ef5f.css}" type="text/css"/>
+    <link rel="stylesheet" th:href="@{/css/modifications.css}"/>
 
     <!--SERVICE STUFF-->
 
     <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.4/angular.js"></script>
     <script th:src="@{/js/date.js}"></script>
 
+    <script type="text/javascript">
+        // show loader after click to export button
+        function btnRetry(retryLink) {
+            document.getElementById('unavailable-k8s-btn-retry-btn').onclick = null;
+            document.getElementById('unavailable-k8s-btn-retry-label').style.display = "none";
+            document.getElementById('unavailable-k8s-btn-retry-loader').style.display = "block";
+            window.location.href = retryLink;
+        }
+    </script>
+
     <!--END-->
 </head>
 
@@ -88,11 +98,17 @@
 
                                     <p>cBioPortal runtime environment is currently unavailable. Please try again later.</p>
                                     <p th:if="${retryHide} != 'true'">To retry export with current filter, click to Export again.</p>
-                                    <p>We apologize for the inconvenience.</p>
+                                    <p>We apologize for any inconvenience.</p>
 
-                                    <div th:if="${retryHide} != 'true'" id="buttons">
+                                    <div id="buttons" th:if="${retryHide} != 'true'">
                                         <!--<button type="button" class="btn btn-lg btn-primary" onclick="location.href='/'">Home page</button>-->
-                                        <button type="button" class="btn btn-lg btn-primary" th:onclick="|location.href='${retryLink}'|">Export again</button>
+                                        <button class="btn btn-lg btn-primary" id="unavailable-k8s-btn-retry-btn"
+                                                th:onclick="|btnRetry('${retryLink}')|"
+                                                type="button">
+                                            <div id="unavailable-k8s-btn-retry-label">Export again</div>
+                                            <div class="loader-button"
+                                                  id="unavailable-k8s-btn-retry-loader"></div>
+                                        </button>
                                     </div>
                                 </div>
                             </div>