Fix and simplify currency choices