Refactoring views to user helpers and adding navigation