Budget improvements

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