Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -reff051707b529a9a4f9416c5a5a5f546050bd55e -rb345765f54736d37da68498f53527511560eb0c5
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision eff051707b529a9a4f9416c5a5a5f546050bd55e)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b345765f54736d37da68498f53527511560eb0c5)
@@ -86,6 +86,7 @@
 label.authoring.advance.section.questions.count = Questions in section
 label.authoring.advance.section.add = Add section
 label.authoring.advance.section.remove = Remove section
+label.authoring.advance.section.all.remaining.questions = All remaining
 label.authoring.advance.shuffle.questions = Shuffle questions
 label.authoring.advance.attempts.allowed = Attempts allowed
 label.authoring.advance.unlimited = Unlimited
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
===================================================================
diff -u -reff051707b529a9a4f9416c5a5a5f546050bd55e -rb345765f54736d37da68498f53527511560eb0c5
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision eff051707b529a9a4f9416c5a5a5f546050bd55e)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision b345765f54736d37da68498f53527511560eb0c5)
@@ -416,7 +416,7 @@
 	for (QuestionDTO questionDto : questionDtos) {
 	    questionsForOnePage.add(questionDto);
 	    questionInPageCount++;
-	    if (questionInPageCount == questionPerPageCount && pageIterator.hasNext()) {
+	    if (questionPerPageCount > 0 && questionInPageCount == questionPerPageCount && pageIterator.hasNext()) {
 		questionsForOnePage = new LinkedHashSet<>();
 		pagedQuestionDtos.add(questionsForOnePage);
 		questionPerPageCount = pageIterator.next();
Index: lams_tool_assessment/web/pages/authoring/advance.jsp
===================================================================
diff -u -reff051707b529a9a4f9416c5a5a5f546050bd55e -rb345765f54736d37da68498f53527511560eb0c5
--- lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision eff051707b529a9a4f9416c5a5a5f546050bd55e)
+++ lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision b345765f54736d37da68498f53527511560eb0c5)
@@ -63,6 +63,8 @@
 			$('#confidence-levels-type-area').css('display', 'none');
 		</c:if>
 
+		$('.sectionEntry:last .sectionRemoveButton', sectionsContainer).removeClass('hidden');
+		
 		// sections add/remove functionality
 		let sectionAddButton = $('#sectionAddButton').click(function(){
 				let sectionsContainer = $('#sectionsContainer'),
@@ -71,12 +73,10 @@
 					section = $('#sectionTemplate').clone().attr('id', 'sectionEntry' + sectionSuffix).removeClass('hidden');
 			$('.sectionRemoveButton', sections).addClass('hidden');
 			section.appendTo(sectionsContainer);
+			$('.sectionRemoveButton', section).removeClass('hidden');
+			
 			$('input[type="text"]', section).attr('name', 'sectionName' + sectionSuffix);
 			$('select', section).attr('name', 'sectionQuestionCount' + sectionSuffix);
-			$('.sectionRemoveButton', section).removeClass('hidden').click(function(){
-				section.remove();
-				$('.sectionEntry:last .sectionRemoveButton', sectionsContainer).removeClass('hidden');
-			});
 		});
 		
 		$('input[name="questionDistributionType"]').change(function(){
@@ -99,6 +99,11 @@
 			}
 		}).first().change();
 	});
+
+	function removeSection(button){
+		$(button).closest('.sectionEntry').remove();
+		$('#sectionsContainer .sectionEntry:last .sectionRemoveButton').removeClass('hidden');
+	}
 </script>
 
 <!-- Advance Tab Content -->
@@ -194,13 +199,20 @@
 						   value="<c:out value='${section.name}' />" name="sectionName${sectionStatus.index + 1}" />
 					<fmt:message key="label.authoring.advance.section.questions.count" />
 					<select class="form-control input-sm loffset10" name="sectionQuestionCount${sectionStatus.index + 1}">
+						<option value="0" ${section.questionCount eq 0 ? 'selected' : ''}>
+							<fmt:message key="label.authoring.advance.section.all.remaining.questions" />
+						</option>
 						<c:forEach var="sectionQuestionCountOption" begin="1" end="15">
 							<option value="${sectionQuestionCountOption}"
 							        ${sectionQuestionCountOption eq section.questionCount ? 'selected' : ''}>
 								${sectionQuestionCountOption}
 							</option>
 						</c:forEach>
 					</select>
+					<button type="button" class="sectionRemoveButton btn btn-default btn-sm loffset20 hidden"
+							onClick="javascript:removeSection(this)">
+						<i class="fa fa-remove"></i>&nbsp;<fmt:message key="label.authoring.advance.section.remove" />
+					</button>
 				</div>
 			</c:forEach>
 		</div>
@@ -210,14 +222,17 @@
 			<input type="text" class="form-control input-sm loffset10" maxlength="100" />
 			<fmt:message key="label.authoring.advance.section.questions.count" />
 			<select class="form-control input-sm loffset10">
+				<option value="0" selected>
+					<fmt:message key="label.authoring.advance.section.all.remaining.questions" />
+				</option>
 				<c:forEach var="sectionQuestionCountOption" begin="1" end="15">
-					<option value="${sectionQuestionCountOption}"
-					        ${sectionQuestionCountOption eq 5 ? 'selected' : ''}>
+					<option value="${sectionQuestionCountOption}">
 						${sectionQuestionCountOption}
 					</option>
 				</c:forEach>
 			</select>
-			<button type="button" class="sectionRemoveButton btn btn-default btn-sm loffset20 hidden">
+			<button type="button" class="sectionRemoveButton btn btn-default btn-sm loffset20 hidden"
+					onClick="javascript:removeSection(this)">
 				<i class="fa fa-remove"></i>&nbsp;<fmt:message key="label.authoring.advance.section.remove" />
 			</button>
 		</div>