diff --git a/productMods/templates/entity/activityShortView.jsp b/productMods/templates/entity/activityShortView.jsp
index 2e9b7728..2e28e0a9 100644
--- a/productMods/templates/entity/activityShortView.jsp
+++ b/productMods/templates/entity/activityShortView.jsp
@@ -5,12 +5,11 @@
     SUBJECT - entity
     PREDICATE - predicateUri
     OBJECT - individual
-
-    Predicates:  on Person page: Person professionalServiceActivity ServiceActivity
-
+    
 --%>
 
-<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary"%>
+<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary" %>
+<%@ page import="edu.cornell.mannlib.vitro.webapp.utils.DisplayUtils" %>
 
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
@@ -29,45 +28,59 @@
                                           predicateUri == teachingActivityUri || 
                                           predicateUri == serviceActivityUri ||
                                           predicateUri == outreachActivityUri}" />
+
 <c:choose>
     <c:when test="${!empty individual}"><%-- individual is the OBJECT of the property referenced - in this case, the Activity object --%>
         <c:choose>  
             <c:when test="${!empty predicateUri}">
-                <%-- RY may need another branch in here; predicateIsActivity vs predicate is something else...
-                depends if this would display on something other than a person page. --%>
+                
                 <c:set var="activity" value="${individual}" />
-
                 <%-- Get the Activity label --%>
                 <c:set var="activityLabel" value=" ${activity.name}"/>
-                
-                <%-- Get the role of the person in the activity --%>
-                <c:set var="role" value=" ${activity.dataPropertyMap['http://vivoweb.org/ontology/core#role'].dataPropertyStatements[0].data}"/>
-                                               
-                <%-- Get the time span of the service activity --%>
-                <c:set var="startYearMonth" value="${activity.dataPropertyMap['http://vivoweb.org/ontology/core#startYearMonth'].dataPropertyStatements[0].data}"/>
-                <c:set var="endYearMonth" value="${activity.dataPropertyMap['http://vivoweb.org/ontology/core#endYearMonth'].dataPropertyStatements[0].data}"/>
-                <c:if test="${!empty startYearMonth}">
-                    <%-- RY Don't know whether we should display just the year, or month and year.
-                    Latter looks like too much info, but why collect it if we aren't going to display it?
-                    Needs reformatting, otherwise we get e.g., "2008-10 - 2009-12"
-                    <c:set var="startDate" value="${fn:substring(startYearMonth, 0, 4)}" /> --%>
-                    <c:set var="start" value="${fn:split(startYearMonth, '-')}" />
-                    <c:set var="startDate" value="${start[1]}/${start[0]}" />
-                    <c:set var="timeSpan" value=", ${startDate} - "/>
-                    <c:if test="${!empty endYearMonth}">
-                        <%-- <c:set var="endDate" value="${fn:substring(endYearMonth, 0, 4)}" /> --%>
-                        <c:set var="end" value="${fn:split(endYearMonth, '-')}" />
-                        <c:set var="endDate" value="${end[1]}/${end[0]}" />                        
-                        <c:set var="timeSpan" value="${timeSpan}${endDate}"/>
-                    </c:if>
-                </c:if>
-    
                 <%-- Create an html link element to the activity --%>
                 <c:url var="activityUrl" value="/individual"><c:param name="uri" value="${activity.URI}"/></c:url>
                 <c:set var="activityLink" ><a href='${activityUrl}'><p:process>${activityLabel}</p:process></a></c:set>
+                <c:if test="${!empty activityLink}" >
+                    <c:set var="activityLink" value="<strong>${activityLink}</strong> " />
+                </c:if> 
 
-                <%-- Final output --%>                        
-                <strong>${activityLink}</strong> <p:process>${role} ${timeSpan}</p:process>
+                               
+                <%-- Get the role of the person in the activity --%>
+                <c:set var="role" value="${activity.dataPropertyMap['http://vivoweb.org/ontology/core#role'].dataPropertyStatements[0].data}"/>
+                    
+                <%-- Get the time span of the service activity --%>
+                <c:set var="startYearMonth" value="${activity.dataPropertyMap['http://vivoweb.org/ontology/core#startYearMonth'].dataPropertyStatements[0].data}"/>
+                <c:set var="endYearMonth" value="${activity.dataPropertyMap['http://vivoweb.org/ontology/core#endYearMonth'].dataPropertyStatements[0].data}"/>
+                <c:set var="timeSpan" value="" />
+                <c:if test="${!empty startYearMonth || !empty endYearMonth}" >
+                    <c:if test="${!empty startYearMonth}" >
+                        <c:set var="start" value="${fn:split(startYearMonth, '-')}" />
+                        <c:set var="startDate" value="${start[1]}/${start[0]}" />  
+                        <c:set var="timeSpan" value="${startDate}" />                  
+                    </c:if>
+                    <c:set var="timeSpan" value="${timeSpan} - " />
+                    <c:if test="${!empty endYearMonth}">
+                        <c:set var="end" value="${fn:split(endYearMonth, '-')}" />
+                        <c:set var="endDate" value="${end[1]}/${end[0]}" /> 
+                        <c:set var="timeSpan" value="${timeSpan}${endDate}" />                       
+                    </c:if>
+                </c:if>
+
+                <%-- Construct the final output --%>   
+                <p:process>${activityLink} </p:process> 
+                
+                <%-- We need a join but we have to keep getting variables in and out of JSTL/EL/Java. Do this for now even though it's ugly. --%>
+                <c:choose>                
+                    <c:when test="${!empty role && !empty timeSpan}">
+                        <p:process>${role}, ${timeSpan}</p:process>
+                    </c:when>   
+                    <c:when test="${!empty role}">
+                        <p:process>${role}</p:process>
+                    </c:when>  
+                    <c:when test="${!empty timeSpan}">
+                        <p:process>${timeSpan}</p:process>
+                    </c:when>
+                </c:choose>         
             </c:when>
             
             <c:otherwise> <%-- no predicate --%>