6 files changed, 22 insertions, 8 deletions
diff --git a/templates/calendar.md b/templates/calendar.md
new file mode 100644
index 0000000..9660694
--- /dev/null
+++ b/templates/calendar.md
@@ -0,0 +1,12 @@
+# Calendars
+{{ $p := . }}
+{{ range $u, $v := .Users }}
+## Calendar for {{ $u }}
+{{range $y, $c := ($p.Calendars $u) }}
+```
+{{ $c -}}
+```
+{{ end }}
+{{ end }}
+
+
diff --git a/templates/calendar.t b/templates/calendar.t
deleted file mode 100644
index 8ab5075..0000000
--- a/templates/calendar.t
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calendars
-
-{{ range $y, $c := .Calendars }}
-{{ $c }}
-{{ end }}
-
diff --git a/templates/overview.t b/templates/overview.md
index caff0cb..caff0cb 100644
--- a/templates/overview.t
+++ b/templates/overview.md
diff --git a/templates/plan-template.t b/templates/plan-template.md
index a5e29e6..a5e29e6 100644
--- a/templates/plan-template.t
+++ b/templates/plan-template.md
diff --git a/templates/report.t b/templates/report.md
index b97c2d7..ad0c393 100644
--- a/templates/report.t
+++ b/templates/report.md
@@ -8,16 +8,24 @@ Beneficiary: {{.Beneficiary}}
 
 # Planning, as of {{.Today}}
 
+```
 Budgeted : {{ printf "%8s" $totals.Budgeted }}
  Planned : {{ printf "%8s" $totals.Planned }}{{with $totals.Unaccounted}}
  ! Open !: {{ printf "%8s" . }}{{end}}
     Done : {{ printf "%8s" $totals.Done }}{{ with $totals.Open }}
  ! Todo !: {{ printf "%8s" . }}
 Time left: {{ printf "%8s" ($p.AsDaysAmount (len $p.DaysRemaining)) }} * {{len $p.Users}}{{end}}
+```
 
-{{ range .ParallelWPTotals }}{{.}}
-{{ end }}
+## Overview of WP Status
+
+```
+{{- range .ParallelWPTotals }}
+{{.}}
+{{- end}}
+```
 
+## As List
 {{range $wp, $t := $totals.WP }}
 Total for {{ $wp }}:
  - Budgeted: {{ printf "%8s" $t.Budgeted.AsDay }}
diff --git a/templates/wp-total.t b/templates/wp-total.md
index c664634..c664634 100644
--- a/templates/wp-total.t
+++ b/templates/wp-total.md