Split out the views to make them nicer