Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/GeneralLearnerFlowDTO.java
===================================================================
diff -u -r70e7323be9b50d1e8c3902cde43cbe5039181541 -ra1e4f1c8cd378514548ca6efc7b8739910dafe91
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/GeneralLearnerFlowDTO.java	(.../GeneralLearnerFlowDTO.java)	(revision 70e7323be9b50d1e8c3902cde43cbe5039181541)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/GeneralLearnerFlowDTO.java	(.../GeneralLearnerFlowDTO.java)	(revision a1e4f1c8cd378514548ca6efc7b8739910dafe91)
@@ -80,7 +80,7 @@
 
     protected String userNameVisible;
 
-    protected String showOtherAnswers;
+    protected boolean showOtherAnswers;
 
     protected String requestLearningReport;
 
@@ -108,8 +108,6 @@
 
     protected String userUid;
 
-    protected String existMultipleUserResponses;
-
     protected String usernameVisible;
 
     protected String allowRichEditor;
@@ -660,15 +658,15 @@
     /**
      * @return Returns the showOtherAnswers.
      */
-    public String getShowOtherAnswers() {
+    public boolean getShowOtherAnswers() {
 	return showOtherAnswers;
     }
 
     /**
      * @param showOtherAnswers
      *            The showOtherAnswers to set.
      */
-    public void setShowOtherAnswers(String showOtherAnswers) {
+    public void setShowOtherAnswers(boolean showOtherAnswers) {
 	this.showOtherAnswers = showOtherAnswers;
     }
 
@@ -687,21 +685,6 @@
 	this.userUid = userUid;
     }
 
-    /**
-     * @return Returns the existMultipleUserResponses.
-     */
-    public String getExistMultipleUserResponses() {
-	return existMultipleUserResponses;
-    }
-
-    /**
-     * @param existMultipleUserResponses
-     *            The existMultipleUserResponses to set.
-     */
-    public void setExistMultipleUserResponses(String existMultipleUserResponses) {
-	this.existMultipleUserResponses = existMultipleUserResponses;
-    }
-
     public String getAllowRichEditor() {
 	return allowRichEditor;
     }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java
===================================================================
diff -u -r70e7323be9b50d1e8c3902cde43cbe5039181541 -ra1e4f1c8cd378514548ca6efc7b8739910dafe91
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java	(.../LearningUtil.java)	(revision 70e7323be9b50d1e8c3902cde43cbe5039181541)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java	(.../LearningUtil.java)	(revision a1e4f1c8cd378514548ca6efc7b8739910dafe91)
@@ -74,7 +74,7 @@
 	}
 
 	generalLearnerFlowDTO.setUserNameVisible(new Boolean(qaContent.isUsernameVisible()).toString());
-	generalLearnerFlowDTO.setShowOtherAnswers(new Boolean(qaContent.isShowOtherAnswers()).toString());
+	generalLearnerFlowDTO.setShowOtherAnswers(qaContent.isShowOtherAnswers());
 	generalLearnerFlowDTO.setAllowRichEditor(new Boolean(qaContent.isAllowRichEditor()).toString());
 	generalLearnerFlowDTO
 		.setUseSelectLeaderToolOuput(new Boolean(qaContent.isUseSelectLeaderToolOuput()).toString());
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
===================================================================
diff -u -r70e7323be9b50d1e8c3902cde43cbe5039181541 -ra1e4f1c8cd378514548ca6efc7b8739910dafe91
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	(.../QaLearningAction.java)	(revision 70e7323be9b50d1e8c3902cde43cbe5039181541)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	(.../QaLearningAction.java)	(revision a1e4f1c8cd378514548ca6efc7b8739910dafe91)
@@ -397,16 +397,6 @@
 	    generalLearnerFlowDTO.setAllowRichEditor(new Boolean(allowRichEditor).toString());
 	    generalLearnerFlowDTO.setUserUid(user.getQueUsrId().toString());
 
-	    int sessionUserCount = 0;
-	    if (qaSession.getQaQueUsers() != null) {
-		sessionUserCount = qaSession.getQaQueUsers().size();
-	    }
-
-	    if (sessionUserCount > 1) {
-		// there are multiple user responses
-		generalLearnerFlowDTO.setExistMultipleUserResponses(new Boolean(true).toString());
-	    }
-
 	    boolean usernameVisible = qaContent.isUsernameVisible();
 	    generalLearnerFlowDTO.setUserNameVisible(new Boolean(usernameVisible).toString());
 
@@ -500,15 +490,6 @@
 	QaQueUsr qaQueUsr = getCurrentUser(toolSessionID);
 	generalLearnerFlowDTO.setUserUid(qaQueUsr.getQueUsrId().toString());
 
-	int sessionUserCount = 0;
-	if (qaSession.getQaQueUsers() != null) {
-	    sessionUserCount = qaSession.getQaQueUsers().size();
-	}
-
-	if (sessionUserCount > 1) {
-	    generalLearnerFlowDTO.setExistMultipleUserResponses(new Boolean(true).toString());
-	}
-
 	boolean usernameVisible = qaContent.isUsernameVisible();
 	generalLearnerFlowDTO.setUserNameVisible(new Boolean(usernameVisible).toString());
 
@@ -822,16 +803,6 @@
 	QaLearningAction.refreshSummaryData(request, qaContent, QaLearningAction.qaService, httpSessionID, qaQueUsr,
 		generalLearnerFlowDTO);
 
-	int sessionUserCount = 0;
-	if (qaSession.getQaQueUsers() != null) {
-	    sessionUserCount = qaSession.getQaQueUsers().size();
-	}
-
-	if (sessionUserCount > 1) {
-	    // there are multiple user responses
-	    generalLearnerFlowDTO.setExistMultipleUserResponses(new Boolean(true).toString());
-	}
-
 	boolean isLearnerFinished = qaQueUsr.isLearnerFinished();
 	generalLearnerFlowDTO.setRequestLearningReportViewOnly(new Boolean(isLearnerFinished).toString());
 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java
===================================================================
diff -u -r70e7323be9b50d1e8c3902cde43cbe5039181541 -ra1e4f1c8cd378514548ca6efc7b8739910dafe91
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	(.../QaLearningStarterAction.java)	(revision 70e7323be9b50d1e8c3902cde43cbe5039181541)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	(.../QaLearningStarterAction.java)	(revision a1e4f1c8cd378514548ca6efc7b8739910dafe91)
@@ -255,23 +255,7 @@
 	generalLearnerFlowDTO.setInitialScreen(new Boolean(true).toString());
 
 	request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
-	/*
-	 * Is the request for a preview by the author?
-	 * Preview The tool must be able to show the specified content as if it was running in a lesson.
-	 * It will be the learner url with tool access mode set to ToolAccessMode.AUTHOR
-	 * 3 modes are:
-	 * author
-	 * teacher
-	 * learner
-	 */
-	/* handling PREVIEW mode */
 
-	if ((qaSession.getQaQueUsers() != null) && (qaSession.getQaQueUsers().size() > 1)
-		&& !qaContent.isUseSelectLeaderToolOuput()) {
-	    //there are multiple user responses
-	    generalLearnerFlowDTO.setExistMultipleUserResponses(new Boolean(true).toString());
-	}
-
 	/*
 	 * by now, we know that the mode is either teacher or learner
 	 * check if the mode is teacher and request is for Learner Progress
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -r677769eb66f1a9f9daa6ca1e7196fca8aa6f5abc -ra1e4f1c8cd378514548ca6efc7b8739910dafe91
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 677769eb66f1a9f9daa6ca1e7196fca8aa6f5abc)
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision a1e4f1c8cd378514548ca6efc7b8739910dafe91)
@@ -135,14 +135,14 @@
 					</html:button>
 				</c:if>
 
-				<c:if test="${generalLearnerFlowDTO.showOtherAnswers == 'true'}">
+				<c:if test="${generalLearnerFlowDTO.showOtherAnswers}">
 					<html:button property="viewAllResults" onclick="submitMethod('storeAllResults');"
 						styleClass="btn btn-default pull-right">
 						<fmt:message key="label.allResponses" />
 					</html:button>
 				</c:if>
 
-				<c:if test="${generalLearnerFlowDTO.showOtherAnswers != 'true'}">
+				<c:if test="${!generalLearnerFlowDTO.showOtherAnswers}">
 					<c:if test="${generalLearnerFlowDTO.reflection != 'true'}">
 						<div class="space-bottom-top align-right">
 							<html:link href="#nogo" property="endLearning" styleId="finishButton"
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
diff -u -r677769eb66f1a9f9daa6ca1e7196fca8aa6f5abc -ra1e4f1c8cd378514548ca6efc7b8739910dafe91
--- lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 677769eb66f1a9f9daa6ca1e7196fca8aa6f5abc)
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision a1e4f1c8cd378514548ca6efc7b8739910dafe91)
@@ -374,7 +374,7 @@
 
 		<!-- Others questions -->
 
-		<c:if test="${generalLearnerFlowDTO.existMultipleUserResponses == 'true'}">
+		<c:if test="${generalLearnerFlowDTO.showOtherAnswers}">
 			<h4>
 				<fmt:message key="label.other.answers" />
 			</h4>
Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
===================================================================
diff -u -r677769eb66f1a9f9daa6ca1e7196fca8aa6f5abc -ra1e4f1c8cd378514548ca6efc7b8739910dafe91
--- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 677769eb66f1a9f9daa6ca1e7196fca8aa6f5abc)
+++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision a1e4f1c8cd378514548ca6efc7b8739910dafe91)
@@ -362,19 +362,19 @@
 			</div>
 		</c:forEach>
 
-
-		<c:if test="${generalLearnerFlowDTO.teacherViewOnly != 'true' }">
-			<c:if test="${(generalLearnerFlowDTO.lockWhenFinished != 'true') && hasEditRight}">
+		<c:if test="${generalLearnerFlowDTO.teacherViewOnly != 'true' 
+				&& (generalLearnerFlowDTO.lockWhenFinished != 'true') && hasEditRight}">
+			<div style="overflow: hidden;">
 				<html:button property="redoQuestions" styleClass="btn btn-default pull-left"
 					onclick="submitMethod('redoQuestions');">
 					<fmt:message key="label.redo" />
 				</html:button>
-			</c:if>
+			</div>
 		</c:if>
 
 		<!-- Others questions -->
 
-		<c:if test="${generalLearnerFlowDTO.existMultipleUserResponses == 'true'}">
+		<c:if test="${generalLearnerFlowDTO.showOtherAnswers}">
 			<h4>
 				<fmt:message key="label.other.answers" />
 			</h4>