Fixed up form design a bit