Updated paths hard coded into views to use helpers