Add currency selection
fix minor bug