tidying up and alignment of forms etc