Small issues #436 Portal Improvements