Changed the views a bit