Tidying the view to be inline with the data i've got