diff --git a/list.tmpl b/list.tmpl
index 621d2e6..f73c441 100644
--- a/list.tmpl
+++ b/list.tmpl
@@ -1,5 +1,5 @@
-<html>
-	<head><title>GNU Taler Dashboard</title></head>
+<!DOCTYPE html>
+	<head><title>GNU Taler Dashboard</title>
 <style>
 body {
 	margin-left:1%;
@@ -21,40 +21,39 @@ pre {
 	overflow: scroll;
 	text-overflow: wrap,ellipsis;
 }
-</style>
+</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)
 		{{ with .Lasterror }}, Last error: {{ . }} {{end}}
-
-		{{ $top := . }}
-		{{ $features := .Features }}
-		{{ $issues := .Issues }}
-		{{ $versions := .VersionsByDate }}
+		{{- $top := . }}
+		{{- $features := .Features }}
+		{{- $issues := .Issues }}
+		{{- $versions := .VersionsByDate }}
 		<!-- p>
-		{{ range $top.Tags }}
+		{{- range $top.Tags }}
 			<button>{{ . }}</button>
-		{{ end }}
+		{{ end -}}
 		</p -->
 
-		{{ range $cat := $top.Categories }}
+		{{- range $cat := $top.Categories }}
 			<h3>{{ . }}</h3>
 			<h4>Features</h4>
-			{{ range $features.ByCategory $cat  }}
+			{{- range $features.ByCategory $cat  }}
 				<details>
 					<summary><a href="https://bugs.gnunet.org/view.php?id={{.Id}}" target="_blank">{{.Id}}</a> {{.Summary}}</summary>
 				<pre>{{ .Description }}</pre>
 				</details>
-			{{ end }}
+			{{ end -}}
 			<h4>Issues</h4>
-			{{ range $issues.ByCategory $cat  }}
+			{{- range $issues.ByCategory $cat  }}
 				<details>
 					<summary><a href="https://bugs.gnunet.org/view.php?id={{.Id}}" target="_blank">{{.Id}}</a> {{.Summary}}</summary>
 				<pre>{{ .Description }}</pre>
 				</details>
-			{{ 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>
 	</body>
diff --git a/table.tmpl b/table.tmpl
index 75899d7..63fa082 100644
--- a/table.tmpl
+++ b/table.tmpl
@@ -1,5 +1,5 @@
-<html>
-	<head><title>GNU Taler Dashboard</title></head>
+<!DOCTYPE html>
+	<head><title>GNU Taler Dashboard</title>
 <style>
 body {
 	margin-left:1%;
@@ -47,66 +47,55 @@ details.version {
 	white-space: normal;
 	text-align: justify;
 }
-</style>
+</style></head>
 	<body>
 		<h1>GNU Taler Dashboard</h1>
 		<h2>Table view | <a href="/list">List View</a></h2>
 		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 }}
+		{{- with .Lasterror }}, Last error: {{ . }} {{end }}
+		{{- $top := . -}}
+		{{- $features := .Features -}}
+		{{- $issues := .Issues -}}
+		{{- $versions := .VersionsByDate -}}
 		<!--p>
-		{{ range $top.Tags }}
-			<button>{{ . }}</button>
-		{{ end }}
+		{{- range $top.Tags -}}<button>{{ . }}</button>{{- end -}}
 		</p-->
-
 		<table>
 			<tr>
 				<th class="side"></th>
-				{{ range $top.TargetVersions }}
+				{{- range $top.TargetVersions }}
 					<th>
 					  <details class="version">
-					    {{ $version := $versions.Get . }}
+					    {{- $version := $versions.Get . }}
 					    <summary><b>{{ . }}</b> ({{ $version.Timestamp.Format "02 Jan 06"}})</summary>
-					    <div>
-						    {{ $version.Description }}
-					    </div>
+					    <div>{{$version.Description }}</div>
 					  </details>
 					</th>
-				{{ end }}
+				{{- end}}
 			</tr>
-			{{ range $cat := $top.Categories }}
+			{{- range $cat := $top.Categories }}
 			<tr>
 				<th class="side">{{ . }}</th>
-				{{ range $tar := $top.TargetVersions }}
-				<td>
-					{{ with $features.ByCategoryAndTarget $cat $tar }}
+				{{- range $tar := $top.TargetVersions }}
+				<td>{{ with $features.ByCategoryAndTarget $cat $tar }}
 					<details class="feature">
-						<summary>{{ $l := len .}} {{ if lt 1 $l }} {{ $l }} features {{ else }} 1 feature {{ end }} </summary>
-						{{ range . }}
-							<a href="https://bugs.gnunet.org/view.php?id={{.Id}}" target="_blank">{{.Id}}</a> {{.Summary}}<br>
-						{{ end }}
+						<summary>{{ $l := len .}}{{ if lt 1 $l }}{{ $l }} features{{ else }}1 feature{{ end }}</summary>
+						{{- range . }}
+						<a href="https://bugs.gnunet.org/view.php?id={{.Id}}" target="_blank">{{.Id}}</a> {{.Summary}}<br>
+						{{- end}}
 					</details>
-					{{ end }}
-
-					{{ with $issues.ByCategoryAndTarget $cat $tar }}
+					{{- end }}
+					{{- with $issues.ByCategoryAndTarget $cat $tar }}
 					<details class="issue">
-						<summary>{{ $l := len .}} {{ if lt 1 $l }} {{ $l }} issues {{ else }} 1 issue {{ end }} </summary>
-						{{ range . }}
-							<a href="https://bugs.gnunet.org/view.php?id={{.Id}}" target="_blank">{{.Id}}</a> {{.Summary}}<br>
-						{{ end }}
+						<summary>{{ $l := len .}}{{ if lt 1 $l }}{{ $l }} issues{{ else }}1 issue{{ end }}</summary>
+						{{- range . }}
+						<a href="https://bugs.gnunet.org/view.php?id={{.Id}}" target="_blank">{{.Id}}</a> {{.Summary}}<br>{{end}}
 					</details>
-					{{ end }}
-				 </td>
-				{{ end }}
+				{{ end -}}
+				</td>{{ end }}
 			</tr>
-			{{ end }}
+			{{- end}}
 		</table>
-
 		<p>
 		<i>taler-dashboard - version: {{.Commit}} - <a href="https://git.kesim.org/taler/taler-dashboard">https://git.kesim.org/taler/taler-dashboard</a> </i>
 	</body>
