Adams work

I reverted my changes to the person view (as per the conversation with Andrew) and had some trouble identifying the commit I should actually back out. Everything is up-to-date now, please pull this commit to continue work on the templates.