Portfolio

- Cleaned up portfolio view
- Fixed calculation bug in portfolio view