Fixing stuff
Fixing and merging
Resolve merge conflict
Create project dashboard page. Remove balance from expenses page.