Minor fixes to the form design