PS-10: Reworked to use portlets