Version 2 of Portfolio Layout