Changes to form layout and copy