Moving over the portfolio views for a single client.
Fixing merge conflict.