Budget navigation fixes