Cleanup and make UI accessible for budget