refactored views to use helpers, added some navigation