changed to use display_price whenever possible to allow extension and to simplify code

Fixes #3822