Index: lams_central/src/java/org/lamsfoundation/lams/web/RatingServlet.java
===================================================================
diff -u -rf026a3ceb687c0f4072980a88f37480a503c1199 -r0cf0678d1f9a5cda177b0521808cfe0dfa8e5307
--- lams_central/src/java/org/lamsfoundation/lams/web/RatingServlet.java	(.../RatingServlet.java)	(revision f026a3ceb687c0f4072980a88f37480a503c1199)
+++ lams_central/src/java/org/lamsfoundation/lams/web/RatingServlet.java	(.../RatingServlet.java)	(revision 0cf0678d1f9a5cda177b0521808cfe0dfa8e5307)
@@ -79,7 +79,6 @@
 		String comment = WebUtil.readStrParam(request, "comment");
 		ratingService.commentItem(criteria, userId, itemId, comment);
 		JSONObject.put("comment", StringEscapeUtils.escapeJavaScript(comment));
-		JSONObject.put("userName", user.getFirstName() + " " + user.getLastName());
 
 	    } else {
 		float rating = Float.parseFloat((String) request.getParameter("rate"));
Index: lams_central/web/css/jquery.jRating.css
===================================================================
diff -u -rf026a3ceb687c0f4072980a88f37480a503c1199 -r0cf0678d1f9a5cda177b0521808cfe0dfa8e5307
--- lams_central/web/css/jquery.jRating.css	(.../jquery.jRating.css)	(revision f026a3ceb687c0f4072980a88f37480a503c1199)
+++ lams_central/web/css/jquery.jRating.css	(.../jquery.jRating.css)	(revision 0cf0678d1f9a5cda177b0521808cfe0dfa8e5307)
@@ -58,6 +58,11 @@
 	float: right;
 	margin-top: 20px;
 }
+.rating-comment{
+	background: url("../images/css/greyfade_bg.jpg") repeat-x scroll 0px 0px transparent;
+	padding: 15px;
+	margin: 10px 0;
+}
 
 /** Remove the following once we move all tools to use Rating.tag.  **/
 .rating-stars-div {float:right; padding-right: 10px; margin-top: -8px; min-height: 45px;}
Index: lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r7e041091dcd309d4be6c4475d01b188f1cb5c06e -r0cf0678d1f9a5cda177b0521808cfe0dfa8e5307
--- lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 7e041091dcd309d4be6c4475d01b188f1cb5c06e)
+++ lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 0cf0678d1f9a5cda177b0521808cfe0dfa8e5307)
@@ -170,7 +170,7 @@
 
 label.rating.criterias  =Rating criterias
 label.add.criteria  =Add Criteria
-label.your.rating  =Your rating {0}, average rating {1}/{2} votes
+label.your.rating  =Your rating is {0}<br> Avg rating {1} out of {2} votes
 label.average.rating  =Average rating {0}/{1} votes
 
 label.rate.limits.reminder  =Rating limitation: Minimum {0} and Maximum {1}.
Index: lams_tool_images/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r7e041091dcd309d4be6c4475d01b188f1cb5c06e -r0cf0678d1f9a5cda177b0521808cfe0dfa8e5307
--- lams_tool_images/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 7e041091dcd309d4be6c4475d01b188f1cb5c06e)
+++ lams_tool_images/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 0cf0678d1f9a5cda177b0521808cfe0dfa8e5307)
@@ -23,8 +23,6 @@
 <%@ attribute name="countRatedImages" required="false" rtexprvalue="true" %>
 <%@ attribute name="yourRatingLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
-<%@ attribute name="byLabel" required="false" rtexprvalue="true" %>
-<%@ attribute name="instructorLabel" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty disabled}">
@@ -48,12 +46,6 @@
 <c:if test="${empty averageRatingLabel}">
 	<c:set var="averageRatingLabel" value="label.average.rating" scope="request"/>
 </c:if>
-<c:if test="${empty byLabel}">
-	<c:set var="byLabel" value="label.learning.by" scope="request"/>
-</c:if>
-<c:if test="${empty instructorLabel}">
-	<c:set var="instructorLabel" value="label.default.user.name" scope="request"/>
-</c:if>
 
 <%--Find commentsRatingDto--%>
 <c:forEach var="ratingDto" items="${ratingDtos}" varStatus="status">
@@ -99,13 +91,10 @@
 	    		success: function(data, itemId) {
 	    				
 	    			//add comment to HTML
-	    			jQuery('<div/>').append(jQuery('<table/>', {
-	    				'cellspacing': '0',
-	    				'class': "forum",
-	    			    html: '<tr><th><fmt:message key="${byLabel}"/> ' + data.userName + '</th></tr>' 
-	    			    	+ '<tr><td class="posted-by"></td></tr>'
-	    			    	+ '<tr><td>' + data.comment + '</td></tr>'
-	    			})).appendTo('#comments-area');
+	    			jQuery('<div/>', {
+	    				'class': "rating-comment",
+	    			    html: data.comment
+	    			}).appendTo('#comments-area');
 	    				
 	    			//hide comments textarea and button
 	    			$("#add-comment-area").hide();
@@ -200,8 +189,17 @@
 			<h4>
 				${ratingDto.ratingCriteria.title}
 			</h4>
+			
+			<c:choose>
+				<c:when test='${isItemAuthoredByUser || not isCriteriaNotRatedByUser}'>
+					<c:set var="ratingDataAverage" value="${ratingDto.averageRating}"/>
+				</c:when>
+				<c:otherwise>
+					<c:set var="ratingDataAverage" value="0"/>
+				</c:otherwise>
+			</c:choose>
 		
-			<div class="${ratingStarsClass} rating-stars-new" data-average="${ratingDto.averageRating}" data-id="${objectId}">
+			<div class="${ratingStarsClass} rating-stars-new" data-average="${ratingDataAverage}" data-id="${objectId}">
 			</div>
 				
 			<div class="rating-stars-caption" id="rating-stars-caption-${objectId}"
@@ -249,48 +247,29 @@
 	<c:if test="${isCommentsEnabled}">
 	
 		<c:set var="userId"><lams:user property="userID" /></c:set>
-		<c:set var="isCommentedByUser" value="false"/>
 		<c:forEach var="comment" items="${commentsRatingDto.ratingComments}">
 			<c:if test="${comment.learner.userId == userId}">
-				<c:set var="isCommentedByUser" value="true"/>
+				<c:set var="commentLeftByUser" value="${comment}"/>
 			</c:if>
 		</c:forEach>
 		
-		<c:forEach var="comment" items="${commentsRatingDto.ratingComments}">
-		
-			<div>
-				<table cellspacing="0" class="forum">
-					<tr>
-						<th>
-							<c:set var="author" value="${comment.learner.firstName} ${comment.learner.lastName}" />
-							<c:if test="${empty author}">
-								<c:set var="author">
-									<fmt:message key="${instructorLabel}" />
-								</c:set>
-							</c:if>
-						
-							<fmt:message key="${byLabel}" />
-							<c:out value="${author}" escapeXml="true" />
-						</th>
-					</tr>
+		<c:choose>
+			<c:when test='${isItemAuthoredByUser}'>
+				<c:forEach var="comment" items="${commentsRatingDto.ratingComments}">
+					<div class="rating-comment">
+						<c:out value="${comment.comment}" escapeXml="false" />
+					</div>
+				</c:forEach>
+			</c:when>
+			
+			<c:when test='${not empty commentLeftByUser}'>
+				<div class="rating-comment">
+					<c:out value="${commentLeftByUser.comment}" escapeXml="false" />
+				</div>
+			</c:when>
+		</c:choose>
 
-					<tr>
-						<td class="posted-by">
-						</td>
-					</tr>
-
-					<tr>
-						<td>
-							<c:out value="${comment.comment}" escapeXml="false" />
-						</td>
-					</tr>
-
-				</table>
-			</div>
-
-		</c:forEach>
-
-		<c:if test="${not disabled && not isCommentedByUser && not isItemAuthoredByUser}">
+		<c:if test="${not disabled && empty commentLeftByUser && not isItemAuthoredByUser}">
 			<div id="add-comment-area">
 				<textarea name="comment" rows="2" id="comment-textarea" onfocus="if(this.value==this.defaultValue)this.value='';" onblur="if(this.value=='')this.value=this.defaultValue;">Please, provide some comment here...</textarea>