Update order of functions in our ViewModels

Adds more comments