Fixed up forms a bit