Refactoring view to use helpers and adding navigation