Fix: income and household fixes
Remove: some income fields
Add: expenses page
Add: charts and results page