Refractoring views to use helpers and adding navigation