Energy grants calculator - April 6 changes

Updated so uprating figure happens automatically.