Budget improvements

Major improvements to the budget console. See the commit logs fore more info