tidying up ui