Updated views to use specific viewmodels