I tidied up the views a bit