Templated out some more of the perons page
Merge branch 'person-page'