Fix up whitespace
Add navigation