Re-write controllers to use new view components/functions
Add navigation