Product page price display fix

Modal and inline page now display pricing correctly.
Inline page uses similar but slightly different method.