Add quanitity field to options, and fix display errors