more tidying up of graphics