Order form improvements