Added portfolio layout and tweaked portfolio roll