Index: lams_tool_assessment/web/pages/monitoring/parts/mcqStudentChoices.jsp
===================================================================
diff -u -r53429b6384ba7befc3a644a91d7a1389ae5a7dfa -ra8acfcc470265c2243ccba63e9b38cab20d306bd
--- lams_tool_assessment/web/pages/monitoring/parts/mcqStudentChoices.jsp	(.../mcqStudentChoices.jsp)	(revision 53429b6384ba7befc3a644a91d7a1389ae5a7dfa)
+++ lams_tool_assessment/web/pages/monitoring/parts/mcqStudentChoices.jsp	(.../mcqStudentChoices.jsp)	(revision a8acfcc470265c2243ccba63e9b38cab20d306bd)
@@ -1,6 +1,7 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <!-- Table -->
+<c:if test="${not empty questions}">
 <div class="row no-gutter">
 <div class="col-xs-12 col-md-12 col-lg-12">
 <div class="panel">
@@ -47,6 +48,7 @@
 </div>          
 </div>
 </div>
+
 <!-- End table -->
 
 <!-- Question detail modal -->
@@ -98,3 +100,4 @@
 	</div>
 </c:forEach>
 <!-- End question detail modal -->
+</c:if>
\ No newline at end of file
Index: lams_tool_assessment/web/pages/monitoring/summary.jsp
===================================================================
diff -u -ra8614f8bb8ccde5d2068b34659649c3c93c4e0d1 -ra8acfcc470265c2243ccba63e9b38cab20d306bd
--- lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision a8614f8bb8ccde5d2068b34659649c3c93c4e0d1)
+++ lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision a8acfcc470265c2243ccba63e9b38cab20d306bd)
@@ -702,11 +702,16 @@
 
 <c:if test="${not empty sessionDtos}">
 	
-	<c:if test="${displayStudentChoices}">
-		<h5><fmt:message key="label.student.choices" /></h5>
-		
-		<%@ include file="/pages/monitoring/parts/mcqStudentChoices.jsp" %>
-	</c:if>
+	<c:choose>
+		<c:when test="${displayStudentChoices and not empty questions}">
+			<h5><fmt:message key="label.student.choices" /></h5>
+			<%@ include file="/pages/monitoring/parts/mcqStudentChoices.jsp" %>
+		</c:when>
+		<c:otherwise>
+			<%-- To maintain structure as if student choices table was present --%>
+			<div class="row"></div>
+		</c:otherwise>
+	</c:choose>
 	
 	<button onclick="return exportSummary();" class="btn btn-default btn-sm btn-disable-on-submit pull-right">
 		<i class="fa fa-download" aria-hidden="true"></i> 
@@ -798,24 +803,24 @@
 		</c:if>
 	</div>
 
-		<c:if test="${assessment.allowDiscloseAnswers}">
-			<div class="voffset5">
-				<a id="discloseAllCorrect" class="btn btn-default ${allCorrectDisclosed ? 'disabled' : ''}">
-					<c:if test="${allCorrectDisclosed}">
+	<c:if test="${assessment.allowDiscloseAnswers}">
+		<div class="voffset5">
+			<a id="discloseAllCorrect" class="btn btn-default ${allCorrectDisclosed ? 'disabled' : ''}">
+				<c:if test="${allCorrectDisclosed}">
+					<i class="fa fa-check text-success">&nbsp;</i>
+				</c:if>
+				<fmt:message key="label.disclose.all.correct.answers" />
+			</a>
+			<c:if test="${sessionMap.isGroupedActivity}">
+				<a id="discloseAllGroups" class="btn btn-default ${allGroupsDisclosed ? 'disabled' : ''}">
+					<c:if test="${allGroupsDisclosed}">
 						<i class="fa fa-check text-success">&nbsp;</i>
 					</c:if>
-					<fmt:message key="label.disclose.all.correct.answers" />
+					<fmt:message key="label.disclose.all.groups.answers" />
 				</a>
-				<c:if test="${sessionMap.isGroupedActivity}">
-					<a id="discloseAllGroups" class="btn btn-default ${allGroupsDisclosed ? 'disabled' : ''}">
-						<c:if test="${allGroupsDisclosed}">
-							<i class="fa fa-check text-success">&nbsp;</i>
-						</c:if>
-						<fmt:message key="label.disclose.all.groups.answers" />
-					</a>
-				</c:if>
-			</div>
-		</c:if>
+			</c:if>
+		</div>
+	</c:if>
 </c:if>
 
 <br/>