Fixed some minor issues with form design