More form improvments