Fixed up form presentation