diff --git a/productMods/config/listViewConfig-authorInAuthorship.xml b/productMods/config/listViewConfig-authorInAuthorship.xml
index 874cf2dc..2d03b3f7 100644
--- a/productMods/config/listViewConfig-authorInAuthorship.xml
+++ b/productMods/config/listViewConfig-authorInAuthorship.xml
@@ -43,7 +43,7 @@
                           ?publisherObj rdfs:label ?publisher
                }
                OPTIONAL { ?infoResource core:relatedBy ?editorship .
-                          ?editorObj core:relatedBy ?editorship .
+                          ?editorship core:relates ?editorObj .
                           ?editorObj rdfs:label ?editor
                }
                OPTIONAL { ?infoResource core:partOf ?partOfObj .
diff --git a/productMods/config/listViewConfig-hasRole.xml b/productMods/config/listViewConfig-hasRole.xml
index e5c72fad..e9a631fa 100644
--- a/productMods/config/listViewConfig-hasRole.xml
+++ b/productMods/config/listViewConfig-hasRole.xml
@@ -49,7 +49,7 @@
                         ?activity vitro:mostSpecificType ?subclass   
                         </collated>
             }           
-            
+            <!-- for research activities where the activity involves a grant -->
             OPTIONAL {  ?role core:relatedBy ?activity .
                         LET (?activityName := afn:localname(?activity)) 
                         OPTIONAL { ?activity rdfs:label ?activityLabel }
diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl
index 76fa5053..4831b5f4 100644
--- a/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl
+++ b/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl
@@ -52,16 +52,17 @@
                     <@p.label individual editable labelCount localesCount/>
                 </h1>
                 <#--  Display preferredTitle if it exists; otherwise mostSpecificTypes -->
-                <#assign title = propertyGroups.pullProperty("${core}preferredTitle")!>
+                <#assign title = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#Title")!>
                 <#if title?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
-                    <@p.addLinkWithLabel title editable />
+                    <#if (title.statements?size < 1) >
+                        <@p.addLinkWithLabel title editable /> 
+                    <#else>
+                        <h2>${title.name?capitalize!}</h2>
+                        <@p.verboseDisplay title />
+                    </#if>
                     <#list title.statements as statement>
-                        <#if !editable >
-                            <div id="titleContainer"><span class="display-title-not-editable">${statement.value}</span></div>
-                        <#else>
-                            <span class="display-title-editable">${statement.value}</span>
-                            <@p.editingLinks "${title.name}" "" statement editable />
-                        </#if>
+                        <span class="display-title<#if editable>-editable</#if>">${statement.preferredTitle}</span>
+                        <@p.editingLinks "${title.localName}" "${title.name}" statement editable />
                     </#list>
                 </#if>
                 <#-- If preferredTitle is unpopulated, display mostSpecificTypes -->
@@ -101,7 +102,7 @@
                 <#include "individual-contactInfo-2column.ftl">
             </div> <!-- contactContainer -->
             <div id="webpagesContainer">
-                <#assign webpage = propertyGroups.pullProperty("${core}webpage")!>
+                <#assign webpage = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#URL")!>
                 <#if webpage?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
                     <h2 id="webpage" class="mainPropGroup">${i18n().websites} <@p.addLink webpage editable ""/></h2>
                     <@p.verboseDisplay webpage />
diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl
index 202a2097..010c2e75 100644
--- a/productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl
+++ b/productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl
@@ -35,7 +35,8 @@
      so set this variable now
 -->
 <#assign hasWebpage = false>
-<#assign web = individual.propertyList.getProperty("${core}webpage")!>
+<#assign web = individual.propertyList.getProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#URL")!>
+<#if web?? >
 <#if editable >
     <#if web.first()?? >
         <#assign hasWebpage = true>
@@ -49,7 +50,7 @@
         <#assign hasWebpage = false>
     </#if>
 </#if>
-
+</#if>
 <section id="individual-intro" class="vcard person" role="region">
     <section id="label-title" <#if editable>style="width:45%"</#if> >
         <header>
@@ -64,15 +65,20 @@
                     <@p.label individual editable labelCount localesCount/>
                 </h1>
                 <#--  Display preferredTitle if it exists; otherwise mostSpecificTypes -->
-                <#assign title = propertyGroups.pullProperty("${core}preferredTitle")!>
+                <#assign title = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#Title")!>
                 <#if title?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
-                    <@p.addLinkWithLabel title editable />
+                    <#if (title.statements?size < 1) >
+                        <@p.addLinkWithLabel title editable />
+                    <#else>
+                        <h2 id="preferredTitle">${title.name?capitalize!}</h2>
+                        <@p.verboseDisplay title />
+                    </#if>
                     <#list title.statements as statement>
                         <#if !editable >
-                            <div id="titleContainer"><span class="display-title-not-editable">${statement.value}</span></div>
+                            <div id="titleContainer"><span class="display-title-not-editable">${statement.preferredTitle}</span></div>
                         <#else>
-                            <span class="display-title-editable">${statement.value}</span>
-                            <@p.editingLinks "${title.name}" "" statement editable />
+                            <span class="display-title-editable">${statement.preferredTitle}</span>
+                            <@p.editingLinks "${title.localName}" "${title.name}" statement editable />
                         </#if>
                     </#list>
                 </#if>
@@ -107,7 +113,7 @@
         <section id="qv-share-contact" class="share-contact" role="region" <#if !editable>style="padding-top:12px"</#if>> 
             <img id="webpage-popout-top" src="${urls.images}/individual/webpage-popout-top.png"  alt="${i18n().background_top_image}"/>
             <div id="webpage-wrapper" >
-                <#assign webpage = propertyGroups.pullProperty("${core}webpage")!>            
+                <#assign webpage = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#URL")!>            
                 <#if webpage?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
                     <#if editable>
                         <h2 class="websites" >${i18n().websites} <@p.addLink webpage editable ""/></h2>
@@ -119,7 +125,7 @@
                     </ul>
                 </#if>
             </div>
-            <img id="webpage-popout-bottom" src="${urls.images}/individual/webpage-popout-bottom.png"  alt="${i18n().background_top_image}"  <#if editable>style="margin-top:16px"</#if>/>
+            <img id="webpage-popout-bottom" src="${urls.images}/individual/webpage-popout-bottom.png"  alt="${i18n().background_top_image}"  />
         </section> <!-- end share-contact -->
     </#if>
     <section id="individual-info" class="qv-individual-info" role="region" style=" <#if !editable>padding-top:12px;</#if><#if hasWebpage>width:53%<#else>width:100%;clear:left</#if>;">       
@@ -154,7 +160,7 @@
         <#-- If the individual does not have webpages and we're in edit mode, provide the opportunity to add webpages -->
         <#if editable && !hasWebpage >
             <!-- Webpages -->
-            <#assign webpage = propertyGroups.pullProperty("${core}webpage")!>            
+            <#assign webpage = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#URL")!>            
             <#if webpage?has_content>
                 <h2 id="webpage" class="mainPropGroup">${i18n().websites} <@p.addLink webpage editable ""/></h2>
                 <@p.verboseDisplay webpage />
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-visualizationQuickView.ftl b/productMods/templates/freemarker/body/partials/individual/individual-visualizationQuickView.ftl
index 2ece5263..7690af66 100644
--- a/productMods/templates/freemarker/body/partials/individual/individual-visualizationQuickView.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/individual-visualizationQuickView.ftl
@@ -3,12 +3,14 @@
 <#-- Template for sparkline visualization on individual profile page -->
 
 <#-- Determine whether this person is an author -->
-<#assign isAuthor = p.hasStatements(propertyGroups, "${core}authorInAuthorship") />
+<#assign isAuthor = p.hasVisualizationStatements(propertyGroups, "${core}relatedBy", "${core}Authorship") />
 
 <#-- Determine whether this person is involved in any grants -->
-<#assign isInvestigator = ( p.hasStatements(propertyGroups, "${core}hasInvestigatorRole") ||
-                            p.hasStatements(propertyGroups, "${core}hasPrincipalInvestigatorRole") || 
-                            p.hasStatements(propertyGroups, "${core}hasCo-PrincipalInvestigatorRole") ) >
+<#assign obo_RO53 = "http://purl.obolibrary.org/obo/RO_0000053">
+
+<#assign isInvestigator = ( p.hasVisualizationStatements(propertyGroups, "${obo_RO53}", "${core}InvestigatorRole") ||
+                            p.hasVisualizationStatements(propertyGroups, "${obo_RO53}", "${core}PrincipalInvestigatorRole") || 
+                            p.hasVisualizationStatements(propertyGroups, "${obo_RO53}", "${core}CoPrincipalInvestigatorRole") ) >
 
 <#if (isAuthor || isInvestigator)>
  
diff --git a/rdf/display/everytime/PropertyConfig.n3 b/rdf/display/everytime/PropertyConfig.n3
index 9656d172..7a9190f6 100644
--- a/rdf/display/everytime/PropertyConfig.n3
+++ b/rdf/display/everytime/PropertyConfig.n3
@@ -279,6 +279,8 @@ local:hasPresenterRoleContext a :ConfigContext ;
 local:hasPresenterRoleConfig a :ObjectPropertyDisplayConfig ;
     :listViewConfigFile "listViewConfig-hasPresenterRole.xml"^^xsd:string ;
     :displayName "presentations" ;
+    vitro:collateBySubclassAnnot
+              "true"^^xsd:boolean;
     vitro:displayRankAnnot 30;
     vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
     vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
@@ -339,6 +341,8 @@ local:advisorRoleContext a :ConfigContext ;
 local:advisorRoleConfig a :ObjectPropertyDisplayConfig ;
     :listViewConfigFile "listViewConfig-advisorIn.xml"^^xsd:string ;
     :displayName "advisees" ;
+    vitro:collateBySubclassAnnot
+              "true"^^xsd:boolean;
     vitro:displayRankAnnot 40;
     vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
     vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
diff --git a/themes/wilma/templates/individual--foaf-person.ftl b/themes/wilma/templates/individual--foaf-person.ftl
index 3b13188e..9d676b82 100644
--- a/themes/wilma/templates/individual--foaf-person.ftl
+++ b/themes/wilma/templates/individual--foaf-person.ftl
@@ -69,9 +69,14 @@
                     <#--  Display preferredTitle if it exists; otherwise mostSpecificTypes -->
                     <#assign title = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#Title")!>
                     <#if title?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
-                        <@p.addLinkWithLabel title editable />
+                        <#if (title.statements?size < 1) >
+                            <@p.addLinkWithLabel title editable /> 
+                        <#else>
+                            <h2>${title.name?capitalize!}</h2>
+                            <@p.verboseDisplay title />
+                        </#if>
                         <#list title.statements as statement>
-                            <span class="display-title">${statement.preferredTitle}</span>
+                            <span class="display-title<#if editable>-editable</#if>">${statement.preferredTitle}</span>
                             <@p.editingLinks "${title.localName}" "${title.name}" statement editable />
                         </#list>
                     </#if>