Redone viewModels to handle multiple pages
Merge remote-tracking branch 'origin/master'