refactoring views, used helpers, added navigation