Work on portals + reformat