Fixed up the form view