Refactoring views to use helpers. Added navigation