Fix income radio button getting stuck
Merge branch 'payment_calculator' into dryad-dev