portfolio and template fixes