Expense Planning Screen - Major changes to logic and style