Updated view to use specific viewmodels