Refactoring and removing vertical lines for first row in 'Budget' fixes #1