A few more things tidying up the UI