Rework pricing display and restore discount calculations