Index: lams_admin/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b
--- lams_admin/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_admin/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b)
@@ -89,10 +89,17 @@
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
 					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
@@ -120,11 +127,8 @@
 					<div class="rating-stars-holder text-center center-block">
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
-					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
Index: lams_central/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r0d1ce55bbd22c5c87361b3a0a7d7476868e73a7e -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b
--- lams_central/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 0d1ce55bbd22c5c87361b3a0a7d7476868e73a7e)
+++ lams_central/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b)
@@ -89,10 +89,17 @@
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
 					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
@@ -120,11 +127,8 @@
 					<div class="rating-stars-holder text-center center-block">
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
-					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
Index: lams_gradebook/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r6e11b20353d23ae1ef9a153af2109ec0e5c4049f -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b
--- lams_gradebook/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 6e11b20353d23ae1ef9a153af2109ec0e5c4049f)
+++ lams_gradebook/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b)
@@ -89,10 +89,17 @@
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
 					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
@@ -120,11 +127,8 @@
 					<div class="rating-stars-holder text-center center-block">
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
-					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
Index: lams_learning/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd2f94d212eba580a02bd50de662a6a7a486bd885 -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b
--- lams_learning/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d2f94d212eba580a02bd50de662a6a7a486bd885)
+++ lams_learning/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b)
@@ -89,10 +89,17 @@
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
 					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
@@ -120,11 +127,8 @@
 					<div class="rating-stars-holder text-center center-block">
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
-					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
Index: lams_monitoring/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd2f94d212eba580a02bd50de662a6a7a486bd885 -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b
--- lams_monitoring/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d2f94d212eba580a02bd50de662a6a7a486bd885)
+++ lams_monitoring/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b)
@@ -89,10 +89,17 @@
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
 					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
@@ -120,11 +127,8 @@
 					<div class="rating-stars-holder text-center center-block">
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
-					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
Index: lams_tool_assessment/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b
--- lams_tool_assessment/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_assessment/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b)
@@ -89,10 +89,17 @@
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
 					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
@@ -120,11 +127,8 @@
 					<div class="rating-stars-holder text-center center-block">
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
-					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
Index: lams_tool_bbb/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b
--- lams_tool_bbb/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_bbb/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b)
@@ -89,10 +89,17 @@
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
 					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
@@ -120,11 +127,8 @@
 					<div class="rating-stars-holder text-center center-block">
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
-					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
Index: lams_tool_chat/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b
--- lams_tool_chat/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_chat/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b)
@@ -89,10 +89,17 @@
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
 					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
@@ -120,11 +127,8 @@
 					<div class="rating-stars-holder text-center center-block">
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
-					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
Index: lams_tool_daco/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b
--- lams_tool_daco/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_daco/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b)
@@ -89,10 +89,17 @@
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
 					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
@@ -120,11 +127,8 @@
 					<div class="rating-stars-holder text-center center-block">
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
-					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
Index: lams_tool_forum/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b
--- lams_tool_forum/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_forum/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b)
@@ -89,10 +89,17 @@
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
 					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
@@ -120,11 +127,8 @@
 					<div class="rating-stars-holder text-center center-block">
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
-					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
Index: lams_tool_gmap/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b
--- lams_tool_gmap/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_gmap/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b)
@@ -89,10 +89,17 @@
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
 					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
@@ -120,11 +127,8 @@
 					<div class="rating-stars-holder text-center center-block">
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
-					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
Index: lams_tool_images/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b
--- lams_tool_images/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_images/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b)
@@ -89,10 +89,17 @@
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
 					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
@@ -120,11 +127,8 @@
 					<div class="rating-stars-holder text-center center-block">
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
-					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
Index: lams_tool_imscc/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b
--- lams_tool_imscc/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_imscc/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b)
@@ -89,10 +89,17 @@
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
 					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
@@ -120,11 +127,8 @@
 					<div class="rating-stars-holder text-center center-block">
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
-					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
Index: lams_tool_kaltura/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b
--- lams_tool_kaltura/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_kaltura/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b)
@@ -89,10 +89,17 @@
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
 					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
@@ -120,11 +127,8 @@
 					<div class="rating-stars-holder text-center center-block">
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
-					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
Index: lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b
--- lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b)
@@ -89,10 +89,17 @@
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
 					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
@@ -120,11 +127,8 @@
 					<div class="rating-stars-holder text-center center-block">
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
-					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
Index: lams_tool_laqa/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b
--- lams_tool_laqa/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_laqa/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b)
@@ -89,10 +89,17 @@
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
 					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
@@ -120,11 +127,8 @@
 					<div class="rating-stars-holder text-center center-block">
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
-					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
Index: lams_tool_larsrc/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b
--- lams_tool_larsrc/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_larsrc/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b)
@@ -89,10 +89,17 @@
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
 					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
@@ -120,11 +127,8 @@
 					<div class="rating-stars-holder text-center center-block">
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
-					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
Index: lams_tool_leader/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b
--- lams_tool_leader/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_leader/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b)
@@ -89,10 +89,17 @@
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
 					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
@@ -120,11 +127,8 @@
 					<div class="rating-stars-holder text-center center-block">
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
-					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
Index: lams_tool_mindmap/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b
--- lams_tool_mindmap/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_mindmap/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b)
@@ -89,10 +89,17 @@
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
 					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
@@ -120,11 +127,8 @@
 					<div class="rating-stars-holder text-center center-block">
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
-					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
Index: lams_tool_nb/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b
--- lams_tool_nb/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_nb/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b)
@@ -89,10 +89,17 @@
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
 					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
@@ -120,11 +127,8 @@
 					<div class="rating-stars-holder text-center center-block">
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
-					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
Index: lams_tool_notebook/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b
--- lams_tool_notebook/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_notebook/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b)
@@ -89,10 +89,17 @@
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
 					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
@@ -120,11 +127,8 @@
 					<div class="rating-stars-holder text-center center-block">
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
-					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
Index: lams_tool_pixlr/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b
--- lams_tool_pixlr/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_pixlr/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b)
@@ -89,10 +89,17 @@
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
 					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
@@ -120,11 +127,8 @@
 					<div class="rating-stars-holder text-center center-block">
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
-					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
Index: lams_tool_sbmt/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b
--- lams_tool_sbmt/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_sbmt/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b)
@@ -89,10 +89,17 @@
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
 					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
@@ -120,11 +127,8 @@
 					<div class="rating-stars-holder text-center center-block">
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
-					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
Index: lams_tool_scratchie/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b
--- lams_tool_scratchie/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_scratchie/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b)
@@ -89,10 +89,17 @@
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
 					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
@@ -120,11 +127,8 @@
 					<div class="rating-stars-holder text-center center-block">
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
-					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
Index: lams_tool_scribe/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b
--- lams_tool_scribe/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_scribe/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b)
@@ -89,10 +89,17 @@
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
 					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
@@ -120,11 +127,8 @@
 					<div class="rating-stars-holder text-center center-block">
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
-					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b
--- lams_tool_spreadsheet/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b)
@@ -89,10 +89,17 @@
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
 					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
@@ -120,11 +127,8 @@
 					<div class="rating-stars-holder text-center center-block">
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
-					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
Index: lams_tool_survey/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b
--- lams_tool_survey/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_survey/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b)
@@ -89,10 +89,17 @@
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
 					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<c:choose>
+							<c:when test="${empty userRating}">
+								<fmt:message key="label.not.rated"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="label.you.gave.rating"><fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param></fmt:message>
+							</c:otherwise>
+						</c:choose>
+						<br/>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>
@@ -120,11 +127,8 @@
 					<div class="rating-stars-holder text-center center-block">
 					<c:set var="objectId">${criteriaRatings.ratingCriteria.ratingCriteriaId}-${rating.itemId}</c:set>
 					<div class="rating-stars-disabled rating-stars-new" data-average="${rating.averageRating}" data-id="${objectId}"></div>
-					<c:set var="userRating">${rating.userRating}</c:set>
-					<c:if test="${empty userRating}"><c:set var="userRating" value="-"/></c:if>
 					<div class="rating-stars-caption" id="rating-stars-caption-${objectId}">
-						<fmt:message key="label.your.rating">
-							<fmt:param><span id="user-rating-${objectId}">${userRating}</span></fmt:param>
+						<fmt:message key="label.avg.rating">
 							<fmt:param><span id="average-rating-${objectId}">${rating.averageRating}</span></fmt:param>
 							<fmt:param><span id="number-of-votes-${objectId}">${rating.numberOfVotes}</span></fmt:param>
 						</fmt:message>