Order form revamp