Added new views and and a TestModel interface to group models
Added new views, fixed some stuff