Prep for currency release

In order to prepare for the change in the currency helper, adding some
extra facet calls and taking the $ out of the markup.