Slightly tidied up the views