Index: lams_tool_laqa/web/learning/CombinedAnswersContent.jsp
===================================================================
diff -u -r099554309e1f77769667c041fb6d0fa91a89ea03 -ra9b67b922680b37a512068cdd9865fcd444145a7
--- lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision 099554309e1f77769667c041fb6d0fa91a89ea03)
+++ lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision a9b67b922680b37a512068cdd9865fcd444145a7)
@@ -85,7 +85,7 @@
 	<div class="right-buttons">
 		<html:button property="btnCombined"
 			onclick="javascript:submitMethod('submitAnswersContent');"
-			styleClass="btn btn-primary pull-right voffset5">
+			styleClass="btn btn-default pull-right voffset5">
 			<fmt:message key="button.submitAllContent" />
 		</html:button>
 	</div>
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -r099554309e1f77769667c041fb6d0fa91a89ea03 -ra9b67b922680b37a512068cdd9865fcd444145a7
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 099554309e1f77769667c041fb6d0fa91a89ea03)
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision a9b67b922680b37a512068cdd9865fcd444145a7)
@@ -127,15 +127,15 @@
 
 			<div class="voffset10">
 				<c:if test="${!generalLearnerFlowDTO.noReeditAllowed}">
-					<html:button property="redoQuestions" styleClass="btn btn-primary pull-left"
+					<html:button property="redoQuestions" styleClass="btn btn-default pull-left"
 						onclick="submitMethod('redoQuestions');">
 						<fmt:message key="label.redo" />
 					</html:button>
 				</c:if>
 
 				<c:if test="${generalLearnerFlowDTO.showOtherAnswers == 'true'}">
 					<html:button property="viewAllResults" onclick="submitMethod('storeAllResults');"
-						styleClass="btn btn-primary pull-right">
+						styleClass="btn btn-default pull-right">
 						<fmt:message key="label.allResponses" />
 					</html:button>
 				</c:if>
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
diff -u -r49ba6994d9370d6dfbb8b72f4a687dd92e0eb354 -ra9b67b922680b37a512068cdd9865fcd444145a7
--- lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 49ba6994d9370d6dfbb8b72f4a687dd92e0eb354)
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision a9b67b922680b37a512068cdd9865fcd444145a7)
@@ -46,8 +46,8 @@
 	<script src="${lams}includes/javascript/rating.js" type="text/javascript"></script>
 	<script src="${lams}includes/javascript/bootstrap.min.js" type="text/javascript"></script>
 	<script src="${lams}includes/javascript/jquery.tablesorter-widgets.js" type="text/javascript"></script>
-	
 
+
 	<script type="text/javascript">
 		var AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
 		YOUR_RATING_LABEL = '<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
@@ -357,7 +357,9 @@
 								<%--Rating area---------------------------------------%>
 								<c:if test="${qaContent.allowRateAnswers}">
 									<div class="col-xs-12 col-sm-3 col-md-2 col-lg-2">
-									<h4 class="text-center"><fmt:message key="label.learning.rating" /></h4>
+										<h4 class="text-center">
+											<fmt:message key="label.learning.rating" />
+										</h4>
 										<lams:Rating itemRatingDto="${userResponse.itemRatingDto}" disabled="true" isItemAuthoredByUser="true"
 											maxRates="${qaContent.maximumRates}" />
 									</div>
@@ -392,7 +394,7 @@
 					</lams:Alert>
 				</c:if>
 
-				<lams:TSTable numColumns="1" dataId='data-question-uid="${question.uid}"'> 
+				<lams:TSTable numColumns="1" dataId='data-question-uid="${question.uid}"'>
 					<thead>
 						<tr>
 							<th title="<fmt:message key='label.sort.by.answer'/>"><fmt:message key="label.learning.answer" /></th>
@@ -441,38 +443,37 @@
 			<c:if test="${generalLearnerFlowDTO.requestLearningReportViewOnly != 'true' }">
 				<c:if test="${generalLearnerFlowDTO.teacherViewOnly != 'true' }">
 
-					<html:button property="refreshAnswers" styleClass="btn btn-default voffset5 roffset5 pull-left"
-						onclick="submitMethod('refreshAllResults');">
-						<fmt:message key="label.refresh" />
-					</html:button>
-
-					<c:if test="${(generalLearnerFlowDTO.lockWhenFinished != 'true') && hasEditRight}">
-						<html:button property="redoQuestions" styleClass="btn btn-primary voffset5  pull-left"
-							onclick="submitMethod('redoQuestions');">
-							<fmt:message key="label.redo" />
+					<div class="right-buttons voffset5" align="right" id="learner-submit">
+						<html:button property="refreshAnswers" styleClass="btn btn-default voffset5 roffset5 pull-left"
+							onclick="submitMethod('refreshAllResults');">
+							<fmt:message key="label.refresh" />
 						</html:button>
-					</c:if>
 
-					<div class="right-buttons voffset5" align="right" id="learner-submit">
+						<c:if test="${(generalLearnerFlowDTO.lockWhenFinished != 'true') && hasEditRight}">
+							<html:button property="redoQuestions" styleClass="btn btn-default voffset5  pull-left"
+								onclick="submitMethod('redoQuestions');">
+								<fmt:message key="label.redo" />
+							</html:button>
+						</c:if>
+
+
 						<c:if test="${(generalLearnerFlowDTO.reflection != 'true') || !hasEditRight}">
 							<html:link href="#nogo" property="endLearning" styleId="finishButton"
-								onclick="javascript:submitMethod('endLearning'); return false;" styleClass="btn btn-primary pull-right">
-								<div class="na">
-									<c:choose>
-										<c:when test="${sessionMap.activityPosition.last}">
-											<fmt:message key="button.submit" />
-										</c:when>
-										<c:otherwise>
-											<fmt:message key="button.endLearning" />
-										</c:otherwise>
-									</c:choose>
-								</div>
+								onclick="javascript:submitMethod('endLearning'); return false;" styleClass="btn btn-primary pull-right na">
+								<c:choose>
+									<c:when test="${sessionMap.activityPosition.last}">
+										<fmt:message key="button.submit" />
+									</c:when>
+									<c:otherwise>
+										<fmt:message key="button.endLearning" />
+									</c:otherwise>
+								</c:choose>
 							</html:link>
 						</c:if>
 
 						<c:if test="${(generalLearnerFlowDTO.reflection == 'true') && hasEditRight}">
 							<html:button property="forwardtoReflection" onclick="javascript:submitMethod('forwardtoReflection');"
-								styleClass="btn btn-primary">
+								styleClass="btn btn-default">
 								<fmt:message key="label.continue" />
 							</html:button>
 						</c:if>
@@ -486,8 +487,8 @@
 
 		<div id="footer"></div>
 
-		
 
+
 	</lams:Page>
 
 </body>
Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
===================================================================
diff -u -rd1d8f658b5b65ceb887ecb17d1883a17a5d5a1e3 -ra9b67b922680b37a512068cdd9865fcd444145a7
--- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision d1d8f658b5b65ceb887ecb17d1883a17a5d5a1e3)
+++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision a9b67b922680b37a512068cdd9865fcd444145a7)
@@ -36,7 +36,7 @@
 		COMMENT_TEXTAREA_TIP_LABEL = '<fmt:message key="label.comment.textarea.tip"/>',
 		WARN_COMMENTS_IS_BLANK_LABEL = '<fmt:message key="warning.comment.blank"/>',
 		WARN_MIN_NUMBER_WORDS_LABEL = "<fmt:message key="warning.minimum.number.words"><fmt:param value="${sessionMap.commentsMinWordsLimit}"/></fmt:message>";
-	</script>	
+	</script>
 	<script src="${lams}includes/javascript/jquery.js" type="text/javascript"></script>
 	<script src="${lams}includes/javascript/jquery.jRating.js" type="text/javascript"></script>
 	<script src="${lams}includes/javascript/jquery.tablesorter.js" type="text/javascript"></script>
@@ -45,7 +45,7 @@
 	<script src="${lams}includes/javascript/common.js" type="text/javascript"></script>
 	<script src="${lams}includes/javascript/rating.js" type="text/javascript"></script>
 	<script src="${lams}includes/javascript/jquery.tablesorter-widgets.js" type="text/javascript"></script>
-	
+
 	<script type="text/javascript">
 	
 		var AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
@@ -366,7 +366,7 @@
 
 		<c:if test="${generalLearnerFlowDTO.teacherViewOnly != 'true' }">
 			<c:if test="${(generalLearnerFlowDTO.lockWhenFinished != 'true') && hasEditRight}">
-				<html:button property="redoQuestions" styleClass="btn btn-default pull-right voffset5"
+				<html:button property="redoQuestions" styleClass="btn btn-default pull-left"
 					onclick="submitMethod('redoQuestions');">
 					<fmt:message key="label.redo" />
 				</html:button>
@@ -395,8 +395,22 @@
 						</fmt:message>
 					</div>
 				</c:if>
+				<c:set var="numColumns" value="1" />
 
-				<lams:TSTable numColumns="1" dataId='data-question-uid="${question.uid}"'> 
+				<c:choose>
+					<c:when test="${isCommentsEnabled and generalLearnerFlowDTO.allowRateAnswers}">
+						<c:set var="numColumns" value="3" />
+					</c:when>
+					<c:otherwise>
+						<c:set var="numColumns" value="2" />
+					</c:otherwise>
+				</c:choose>
+				
+				
+				
+				Columns: <c:out value="${numColumns}"></c:out>
+
+				<lams:TSTable numColumns="${numColumns}" dataId='data-question-uid="${question.uid}"'>
 					<thead>
 						<tr>
 							<th title="<fmt:message key='label.sort.by.answer'/>"><fmt:message key="label.learning.answer" /></th>
@@ -415,10 +429,11 @@
 			</c:forEach>
 		</c:if>
 
+		<!-- reflections -->
 		<c:if test="${generalLearnerFlowDTO.reflection == 'true' }">
 			<div class="row no-gutter">
 				<div class="col-xs-12">
-					<div class="panel panel-default">
+					<div class="panel panel-default voffset10">
 						<div class="panel-heading panel-title">
 							<fmt:message key="label.reflection" />
 						</div>
@@ -444,17 +459,22 @@
 
 
 		<c:if test="${generalLearnerFlowDTO.teacherViewOnly != 'true' }">
-			<html:button property="endLearning" styleId="finishButton" onclick="javascript:submitMethod('endLearning');"
-				styleClass="btn btn-primary pull-right na">
-				<c:choose>
-					<c:when test="${sessionMap.activityPosition.last}">
-						<fmt:message key="button.submit" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="button.endLearning" />
-					</c:otherwise>
-				</c:choose>
-			</html:button>
+			<div class="row no-gutter">
+				<div class="col-xs-12">
+					<html:button property="endLearning" styleId="finishButton" onclick="javascript:submitMethod('endLearning');"
+						styleClass="btn btn-primary pull-right na">
+						<c:choose>
+							<c:when test="${sessionMap.activityPosition.last}">
+								<fmt:message key="button.submit" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="button.endLearning" />
+							</c:otherwise>
+						</c:choose>
+					</html:button>
+
+				</div>
+			</div>
 		</c:if>
 
 		<html:form action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">