diff --git a/public/css/addon.css b/public/css/addon.css
index 237081e..7847dac 100644
--- a/public/css/addon.css
+++ b/public/css/addon.css
@@ -2,6 +2,24 @@ body {
   background: #fff;
 }
 
+section + section {
+  margin-top: 9px;
+}
+
+.section-manage {
+  margin-left: 17px;
+}
+
+.container {
+  display: inline-block;
+}
+
+.container + .container::before {
+  content: ',';
+  display: inline-block;
+  padding-right: 4px;
+}
+
 .icon-status {
   margin-left: 2px;
   margin-right: 6px;
@@ -13,5 +31,4 @@ body {
 
 .link {
   display: inline-block;
-  margin-top: 9px;
 }
diff --git a/views/web-panel.hbs b/views/web-panel.hbs
index 9721dd6..afdc922 100644
--- a/views/web-panel.hbs
+++ b/views/web-panel.hbs
@@ -1,28 +1,29 @@
 {{!< layout}}
 {{#if instance}}
-  {{#if isTestingOnly}}
-    <div>Tests {{{testResults}}} <img src="https://s3-us-west-1.amazonaws.com/runnable-design/status-{{{testColor}}}.svg" title="{{{testResults}}}" width="9" height="9" class="icon-status">{{{repoName}}}/{{{instanceName}}}.</div>
-    <div><a href=http://{{{url}}} target="_blank" class="link">View on Runnable</a></div>
-  {{else}}
-    {{#if status}}
-    {{!--
-      possible status colors:
-        "green"
-        "orange"
-        "red"
-        "gray"
-    --}}
-    <div>{{{ state }}} <img src="https://s3-us-west-1.amazonaws.com/runnable-design/status-{{{statusColor}}}.svg" title="{{{status}}}" width="9" height="9" class="icon-status">{{{repoName}}}/{{{instanceName}}}.</div>
-      <div><a href="{{{environmentUrl}}}" target="_blank" class="link">View output</a></div>
-      <div><a href=http://{{{url}}} target="_blank" class="link">Manage on Runnable</a></div>
-    {{else}}
-    {{!-- if no status (between building and running) --}}
-    <div>{{{ state }}} <img src="https://s3-us-west-1.amazonaws.com/runnable-design/status-{{{statusColor}}}.svg" title="{{{status}}}" width="9" height="9" class="icon-status">{{{repoName}}}/{{{instanceName}}}</div>
-      <div><a href="{{{environmentUrl}}}" target="_blank" class="link">View output</a></div>
-      <div><a href=http://{{{url}}} target="_blank" class="link">Manage on Runnable</a></div>
-    {{/if}}
+  {{!-- staging containers --}}
+  <section>
+    {{#each container}}
+    <div class="container">
+      <img src="https://s3-us-west-1.amazonaws.com/runnable-design/status-{{{statusColor}}}.svg" title="{{{status}}}" width="9" height="9" class="icon-status">
+      <a href="{{{environmentUrl}}}" target="_blank" class="link">{{{instanceName}}}</a>
+    </div>
+    {{/each}}
+  </section>
+
+  {{!-- conditionally show test results --}}
+  {{#if testResults}}
+  <section>
+    <img src="https://s3-us-west-1.amazonaws.com/runnable-design/status-{{{testColor}}}.svg" title="{{{testResults}}}" width="9" height="9" class="icon-status">
+    <a href="testUrl" class="link" target="_blank">{{{testResults}}}</a>
+  </section>
   {{/if}}
+
+  {{!-- manage on runnable url --}}
+  <section class="section-manage">
+    <a href=http://{{{url}}} target="_blank" class="link">Manage on Runnable</a>
+  </section>
 {{/if}}
+
 {{#unless instance}}
   <div><span class="emoji">🔭</span> {{{text}}}</div>
   <div><a href="//runnable.com/" class="link" target="_blank">Go to Runnable</a></div>