UI changes, budget, total
merged