diff --git a/Dockerfile.web b/Dockerfile.web
index 8eeb171ef..1fdd7dbed 100644
--- a/Dockerfile.web
+++ b/Dockerfile.web
@@ -1,4 +1,4 @@
-FROM jeroenwillemsen/wrongsecrets:ctfd-safe-2-no-vault
+FROM jeroenwillemsen/wrongsecrets:ctfd-safe-3-no-vault
 
 ARG argBasedVersion="1.5.0"
 ARG CANARY_URLS="http://canarytokens.com/terms/about/s7cfbdakys13246ewd8ivuvku/post.jsp,http://canarytokens.com/terms/about/y0all60b627gzp19ahqh7rl6j/post.jsp"
diff --git a/src/main/resources/templates/welcome.html b/src/main/resources/templates/welcome.html
index f5f0a0b9d..25e717245 100644
--- a/src/main/resources/templates/welcome.html
+++ b/src/main/resources/templates/welcome.html
@@ -22,7 +22,8 @@
                     <tr>
                         <th scope="col">&nbsp;Challenge&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
                         <th scope="col">Focus&nbsp;&nbsp;&nbsp;</th>
-                        <th scope="col" th:text="'Runs on environment (current: '+${environment}+')'"></th>
+                        <th scope="col" class="d-sm-none" th:text="'Runs on environment (current: '+${#strings.replace(environment,'_',' _')}+')'"></th>
+                        <th scope="col" class="d-none d-sm-table-cell" th:text="'Runs on environment (current: '+${environment}+')'"></th>
                         <th scope="col" class="d-none d-md-table-cell">Difficulty</th>
                     </tr>
                     </thead>
diff --git a/src/test/java/org/owasp/wrongsecrets/ChallengesControllerCTFModeWithPresetK8sValuesTest.java b/src/test/java/org/owasp/wrongsecrets/ChallengesControllerCTFModeWithPresetK8sValuesTest.java
index 495e43168..0adfe69cb 100644
--- a/src/test/java/org/owasp/wrongsecrets/ChallengesControllerCTFModeWithPresetK8sValuesTest.java
+++ b/src/test/java/org/owasp/wrongsecrets/ChallengesControllerCTFModeWithPresetK8sValuesTest.java
@@ -79,9 +79,9 @@ void shouldShowFlagWhenRespondingWithSuccessInCTFModeChallenge7() throws Excepti
     void shouldEnableK8sExercises() throws Exception{
         mvc.perform(get("/"))
             .andExpect(status().isOk())
-            .andExpect(content().string(containsString("<td><a href=\"/challenge/5\">Challenge 5</a></td>")))
-            .andExpect(content().string(containsString("<td><a href=\"/challenge/6\">Challenge 6</a></td>")))
-            .andExpect(content().string(containsString("<td><a href=\"/challenge/7\">Challenge 7</a></td>")));
+            .andExpect(content().string(containsString("<td>&nbsp;<a href=\"/challenge/5\">Challenge 5</a></td>")))
+            .andExpect(content().string(containsString("<td>&nbsp;<a href=\"/challenge/6\">Challenge 6</a></td>")))
+            .andExpect(content().string(containsString("<td>&nbsp;<a href=\"/challenge/7\">Challenge 7</a></td>")));
     }
 
 }