change block personcontent to content more consistent with other templates and less need for if-statements