diff --git a/src/route/stack.rs b/src/route/stack.rs
index 320c70e..870acab 100644
--- a/src/route/stack.rs
+++ b/src/route/stack.rs
@@ -30,7 +30,7 @@ struct ContainerInfo {
 impl From<ContainerSummary> for ContainerInfo {
     fn from(value: ContainerSummary) -> Self {
         ContainerInfo {
-            name: value.names.unwrap().join(","),
+            name: value.names.unwrap()[0].trim_start_matches('/').to_string(),
             state: value.state.unwrap(),
             image: value.image.unwrap(),
         }
diff --git a/templates/stack/get-one.html b/templates/stack/get-one.html
index b099859..8a447f3 100644
--- a/templates/stack/get-one.html
+++ b/templates/stack/get-one.html
@@ -17,7 +17,7 @@
 		<tbody>
 			{% for container in containers %}
 			<tr>
-				<td>{{container.name}}</td>
+				<td><a href="/container/{{container.name}}">{{container.name}}</a></td>
 				<td class="status {{container.state}}">{{container.state}}</td>
 				<td>{{container.image}}</td>
 			</tr>