Fixed up the forms