- Added empty checking on portfolio view