diff --git a/php/templates/components/container-state.twig b/php/templates/components/container-state.twig
index a79db31e..8bc8c559 100644
--- a/php/templates/components/container-state.twig
+++ b/php/templates/components/container-state.twig
@@ -1,15 +1,19 @@
 {# @var c \App\Containers\Container #}
 <li>
-  {% if c.GetStartingState().value == 'starting' %}
-    <span class="status running"></span>
-  {% elseif c.GetRunningState().value == 'running' %}
-    <span class="status success"></span>
-  {% else %}
-    <span class="status error"></span>
-  {% endif %}
   <span>
-    {{ c.GetDisplayName() }}
-    (<a href="/api/docker/logs?id={{ c.GetIdentifier() }}" target="_blank">Stopped</a>)
+    {% if c.GetRunningState().value == 'running' %}
+      <span class="status success"></span>
+      {{ c.GetDisplayName() }}
+      (<a href="/api/docker/logs?id={{ c.GetIdentifier() }}" target="_blank">Running</a>)
+    {% elseif c.GetStartingState().value == 'starting' %}
+      <span class="status running"></span>
+      {{ c.GetDisplayName() }}
+      (<a href="/api/docker/logs?id={{ c.GetIdentifier() }}" target="_blank">Starting</a>)
+    {% else %}
+      <span class="status error"></span>
+      {{ c.GetDisplayName() }}
+      (<a href="/api/docker/logs?id={{ c.GetIdentifier() }}" target="_blank">Stopped</a>)
+    {% endif %}
     {% if c.GetDocumentation() != '' %}
       (<a target="_blank" href="{{ c.GetDocumentation() }}">docs</a>)
     {% endif %}
@@ -17,7 +21,7 @@
   {% if c.GetUiSecret() != '' %}
     <details>
       <summary>Show password for {{ c.GetDisplayName() }}</summary>
-      <p>{{ c.GetUiSecret() }}</p>
+      <input type="text" value="{{ c.GetUiSecret() }}" readonly>
     </details>
   {% endif %}
 </li>
\ No newline at end of file