diff --git a/list.tmpl b/list.tmpl
index 90b6fe0..7e7e643 100644
--- a/list.tmpl
+++ b/list.tmpl
@@ -7,32 +7,64 @@ body {
   font-family:sans-serif;
 }
 h3 { 
+ margin: 0em;
+ margin-top: 1em;
   color: brown;
 }
 h4 {
-  margin-left: 5%;
+	margin: 0;
+  margin-top:  1em;
+  margin-left: 1%;
+}
+h5 {
+	margin: 0;
+  margin-top: 0.5em;
+  margin-left: 2%;
 }
 details {
-  margin-left: 5%;
-  margin-right: 5%;
+  margin-left: 4em;
+  margin-right: 3%;
 }
 pre {
   max-width: 100%;
   overflow: scroll;
   text-overflow: wrap,ellipsis;
 }
+.small {
+	font-size:8px;
+	font-weight: normal;
+}
+.category {
+  padding-left:5px;
+  width:62%;
+}
+.version {
+  padding-left:5px;
+  width:61%;
+}
+.features {
+  padding-left:5px;
+  background: powderblue;
+  width:8em;
+}
+.issues {
+  padding-left:5px;
+  background: navajowhite;
+  width:8em;
+}
 {{template "severity.tmpl"}}
 </style></head>
   <body>
     <h1>GNU Taler Dashboard</h1>
     <h2><a href="/">Table view</a> | List View </h2>
-    Data from {{ .Timestamp.Format "02 Jan 06 15:04 MST"}}, updateting every {{ .Freq }} (no auto-refresh)
+    Data from {{ .Timestamp.Format "02 Jan 06 15:04 MST"}}, updateting every {{ .Freq }} (no auto-refresh).
     {{ with .Lasterror }}, Last error: {{ . }} {{end}}
     {{- $top := . }}
     {{- $features := .Features }}
     {{- $issues := .Issues }}
     {{- $versions := .VersionsByDate }}
     {{- $sorter :=  OrderedBy "Severity" "Handler" "Id" -}}
+    Total: {{ len $features }} features and {{ len $issues }} issues.
     <!-- p>
     {{- range $top.Tags }}
       <button>{{ . }}</button>
@@ -40,29 +72,49 @@ pre {
     </p -->
 
     {{- range $cat := $top.Categories }}
-      <h3>{{ . }}</h3>
-      <h4>Features</h4>
-      {{- range $sorter.Sort ($features.ByCategory $cat) }}
-        <details>
-          <summary>
-            {{ if .IsHandled }}<span title="assigned to {{.Handler.Name}}">🥷</span>{{else}}<span title="unassigned">❓</span>{{end}}
-              <a href="https://bugs.gnunet.org/view.php?id={{.Id}}" target="_blank">{{.Id}}</a>
-              <span class="severity-{{.Severity.Name}}">{{.Summary}}</span><br>
-          </summary>
-          <pre>{{ .Description }}</pre>
-        </details>
-      {{ end -}}
-      <h4>Issues</h4>
-      {{- range $sorter.Sort ($issues.ByCategory $cat) }}
-        <details>
-          <summary>
-            {{ if .IsHandled }}<span title="assigned to {{.Handler.Name}}">🥷</span>{{else}}<span title="unassigned">❓</span>{{end}}
-              <a href="https://bugs.gnunet.org/view.php?id={{.Id}}" target="_blank">{{.Id}}</a>
-              <span class="severity-{{.Severity.Name}}" title="severity {{.Severity.Name}}">{{.Summary}}</span><br>
-          </summary>
-          <pre>{{ .Description }}</pre>
-        </details>
-      {{ end -}}
+      <h3 class="category">{{ $cat }}</h3>
+        {{- range $tar := $top.TargetVersions }}
+        {{- with $version := $versions.Get . }}
+		{{ $hasentries  := false }}
+		{{ $hasfeatures := false }}
+		{{ $hasissues   := false }}
+		{{ with $features.ByCategoryAndTarget $cat $tar }}
+			{{ $hasfeatures = true }}
+			{{ $hasentries = true }}
+		{{ end }}
+		{{ with $issues.ByCategoryAndTarget $cat $tar }}
+			{{ $hasissues = true }}
+			{{ $hasentries = true }}
+		{{ end }}
+		{{ if $hasentries }}<h4 class="version">{{ $tar }} <span class="small">({{$version.Timestamp.Format "02 Jan 06"}})</span></h4> {{ end }}
+		{{ if $hasfeatures }}
+		<h5 class="features">Features</h5>
+		{{- range $sorter.Sort ($features.ByCategory $cat) }}
+		  <details>
+		    <summary>
+		      {{ if .IsHandled }}<span title="assigned to {{.Handler.Name}}">🥷</span>{{else}}<span title="unassigned">❓</span>{{end}}
+		        <a href="https://bugs.gnunet.org/view.php?id={{.Id}}" target="_blank">{{.Id}}</a>
+		        <span class="severity-{{.Severity.Name}}">{{.Summary}}</span><br>
+		    </summary>
+		    <pre>{{ .Description }}</pre>
+		  </details>
+		{{ end -}}
+		{{ end }}
+		{{ if $hasissues }}
+	        <h5 class="issues">Issues</h5>
+	        {{- range $sorter.Sort ($issues.ByCategory $cat) }}
+		<details>
+		  <summary>
+		    {{ if .IsHandled }}<span title="assigned to {{.Handler.Name}}">🥷</span>{{else}}<span title="unassigned">❓</span>{{end}}
+		      <a href="https://bugs.gnunet.org/view.php?id={{.Id}}" target="_blank">{{.Id}}</a>
+		      <span class="severity-{{.Severity.Name}}" title="severity {{.Severity.Name}}">{{.Summary}}</span><br>
+		  </summary>
+		  <pre>{{ .Description }}</pre>
+		</details>
+	        {{ end -}}
+        {{ end -}}
+	{{end}}
+	{{end}}
     {{ end -}}
     <p>
     <i>taler-dashboard - version: {{.Commit}} - <a href="https://git.kesim.org/taler/taler-dashboard">https://git.kesim.org/taler/taler-dashboard</a> </i>
