Update #25

Formatted portfolio tables and forms