More form layout cleanup