Templated out some more of the perons page