Portlet rework