Tidying up to the views to be more consistent with the rest of the app