IST-109, default to dollars and change to radio buttons
Merge branch 'master' into beta