Add popovers and cleanup of portfolio view
Add popovers and cleanup of portfolio view 2
merged popover changes