Working on #436 Portal Improvements
Fixed multipage issues in portal