Add some eye candy, fix most of the views