updated bunch of stuff on VIEW controller and views