tidying up the UI