Cleaning up form layout