diff --git a/functions/date.go b/functions/date.go
index ab0d84b..b4a8ff2 100644
--- a/functions/date.go
+++ b/functions/date.go
@@ -13,6 +13,14 @@ type Weekday struct {
 	No    int
 }
 
+func (m Month) String() string {
+	return m.Full
+}
+
+func (w Weekday) String() string {
+	return w.Full
+}
+
 var TRANSLM = []Month{
 	{"NotAvailable", "NA", "0", 0},
 	{"Januar", "Jan", "1", 1},
diff --git a/views/routes/body.gohtml b/views/routes/body.gohtml
index 9da9831..0cd2b0f 100644
--- a/views/routes/body.gohtml
+++ b/views/routes/body.gohtml
@@ -5,21 +5,21 @@
 {{ range $index, $month := .model.Issues }}
 	<!-- Month Header -->
 	{{ $first := index $month 0 }}
-	<h2>{{ MonthNameShort $first.Month }}</h2>
+	<h2>{{ (MonthName $first.Datum.When.Month).Short }}</h2>
 
 	<!-- Issues -->
 	{{ range $issue := $month }}
-		{{ $date := GetDate $issue.Datum.When.String }}
+		{{ $date := $issue.Datum.When }}
 		<a href="/{{ $y }}/{{ $issue.Number.No }}">
 			<div>
 				{{ $issue.Number.No }}
 			</div>
 
 			<div>
-				{{ $date.Wd }}
+				{{ (WeekdayName $date.Weekday).Short }}
 			</div>
 
-			<div>{{ $date.DayNo }}.{{ index $date.MonthNo }}.</div>
+			<div>{{ $date.Day }}.{{ index $date.Month }}.</div>
 		</a>
 	{{ end }}
 {{ end }}