Enhancing the Order form