Refactoring views to use helpers and addding navigation