Refactor views to use helpers and add navigation