Multi-currency design pass

more polishing