Refactored currency symbol and price display
Merge remote-tracking branch 'origin/master'