Budget management improvements & bug fixes