Added viewmodels, rewritten test view