Some markup tidying around the forms