Cleaner templating
Tidy up nav structure
Remove unused model data