diff --git a/app/views/Application/Index.html b/app/views/Application/Index.html
index 11c4de2..d20729a 100644
--- a/app/views/Application/Index.html
+++ b/app/views/Application/Index.html
@@ -1,13 +1,16 @@
{{set "title" "Inbucket" .}}
{{template "header.html" .}}
+{{template "menu.html" .}}
-
Inbucket
+
+
Inbucket
-
+
+
{{template "footer.html" .}}
diff --git a/app/views/Mailbox/List.html b/app/views/Mailbox/List.html
index b5c59d2..4b4c438 100644
--- a/app/views/Mailbox/List.html
+++ b/app/views/Mailbox/List.html
@@ -1,22 +1,27 @@
{{template "header.html" .}}
-
-Your Index Is Ready
{{$name := .name}}
-{{.name}} inbox
+
+
-{{if .messages}}
-
- {{range .messages}}
- -
- {{.Subject}}
- from {{.From}}
- ({{.Date}})
-
- {{end}}
-
-{{else}}
-
No messages!
-{{end}}
+ {{range .messages}}
+
+
+
{{.From}}
+
{{.Date}}
+
+ {{else}}
+
+ No messages!
+
+ {{end}}
+
+
+
+
Select a message at left, or enter a different username into the box on upper right.
+
{{template "footer.html" .}}
diff --git a/app/views/footer.html b/app/views/footer.html
index b605728..ba7a67c 100644
--- a/app/views/footer.html
+++ b/app/views/footer.html
@@ -1,2 +1,8 @@
-