Added some view models & views
Removed some old views