Index: lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rdd271045ecd35d9bcc6cf58caa74945fa4d26f03 -re34c7b767eb34caebbfa0c9bdfb50d771d3b9d95
--- lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision dd271045ecd35d9bcc6cf58caa74945fa4d26f03)
+++ lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision e34c7b767eb34caebbfa0c9bdfb50d771d3b9d95)
@@ -31,7 +31,7 @@
 label.learner.fileDescription  =Description
 label.learner.upload  =Upload
 label.learner.finished  =Finished uploading
-label.learner.time  =Uploaded on
+label.learner.time  =Uploaded
 label.learner.dateOfSubmission  =Submission date
 label.learner.comments  =Comments
 label.learner.marks  =Marks
@@ -90,10 +90,12 @@
 monitoring.user.loginname  =Username
 monitoring.user.reflection  =Notebook entry
 page.title.monitoring.view.reflection  =View Notebook entries
-label.limit.number.upload  =Limit number of files to upload
+label.enable.min.limit  =Set minimum number of files to upload
+label.limit.number.upload  =Set maximum number of files to upload
 label.number.to.upload  =Number of files to upload
 label.unlimited  =Unlimited
-message.left.upload.limit  =You could upload another {0} file(s).
+message.left.upload.limit  =Maximum number of files to be uploaded: {0}
+label.should.upload.another  =Minimum number of files to be uploaded: {0}
 messsage.learner.finish.confirm  =Are you going to finish submission?
 label.edit  =Edit
 message.no.reflection.available  =No Notebook available
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtConstants.java
===================================================================
diff -u -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d -re34c7b767eb34caebbfa0c9bdfb50d771d3b9d95
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtConstants.java	(.../SbmtConstants.java)	(revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtConstants.java	(.../SbmtConstants.java)	(revision e34c7b767eb34caebbfa0c9bdfb50d771d3b9d95)
@@ -31,7 +31,7 @@
 
     public static final String DEFAULT_TITLE = "Submit Files Title";
 
-    public static final String AUTHORING_DTO = "authoring";
+    public static final String ATTR_CONTENT = "content";
 
     public static final String TOOL_CONTENT_HANDLER_NAME = "sbmtToolContentHandler";
 
@@ -77,11 +77,13 @@
     
     public static final String ATTR_GROUP_LEADER = "groupLeader";
 
-    public static final String ATTR_LIMIT_UPLOAD = "limitUpload";
+    public static final String ATTR_IS_MAX_LIMIT_UPLOAD_ENABLED = "isMaxLimitUploadEnabled";
 
-    public static final String ATTR_LIMIT_UPLOAD_NUMBER = "limitUploadNumber";
+    public static final String ATTR_MAX_LIMIT_UPLOAD_NUMBER = "maxLimitUploadNumber";
+    
+    public static final String ATTR_MIN_LIMIT_UPLOAD_NUMBER = "minLimitUploadNumber";
 
-    public static final String ATTR_ARRIVE_LIMIT = "arriveLimit";
+    public static final String ATTR_MAX_LIMIT_REACHED = "maxLimitReached";
 
     public static final String ATTR_USER_FINISHED = "userFinished";
 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20191128.sql
===================================================================
diff -u
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20191128.sql	(revision 0)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20191128.sql	(revision e34c7b767eb34caebbfa0c9bdfb50d771d3b9d95)
@@ -0,0 +1,14 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+----------------------Put all sql statements below here-------------------------
+
+-- LDEV-4913 Include a minimum number of files to submit
+ALTER TABLE tl_lasbmt11_content ADD COLUMN min_limit_upload_number bigint;
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
Fisheye: Tag e34c7b767eb34caebbfa0c9bdfb50d771d3b9d95 refers to a dead (removed) revision in file `lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/AuthoringDTO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/SubmitUserDTO.java
===================================================================
diff -u -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d -re34c7b767eb34caebbfa0c9bdfb50d771d3b9d95
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/SubmitUserDTO.java	(.../SubmitUserDTO.java)	(revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/SubmitUserDTO.java	(.../SubmitUserDTO.java)	(revision e34c7b767eb34caebbfa0c9bdfb50d771d3b9d95)
@@ -64,8 +64,6 @@
     private boolean finishReflection;
     private String reflect;
 
-    private int limitUploadLeft;
-
     public SubmitUserDTO() {
 
     }
@@ -256,14 +254,6 @@
 	this.userID = userID;
     }
 
-    public int getLimitUploadLeft() {
-	return limitUploadLeft;
-    }
-
-    public void setLimitUploadLeft(int limitUploadLeft) {
-	this.limitUploadLeft = limitUploadLeft;
-    }
-
     public boolean isAnyFilesMarked() {
 	return anyFilesMarked;
     }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/model/SubmitFilesContent.java
===================================================================
diff -u -r1ee503e3d0e0228ea8a45025fddf15d9623c0377 -re34c7b767eb34caebbfa0c9bdfb50d771d3b9d95
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/model/SubmitFilesContent.java	(.../SubmitFilesContent.java)	(revision 1ee503e3d0e0228ea8a45025fddf15d9623c0377)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/model/SubmitFilesContent.java	(.../SubmitFilesContent.java)	(revision e34c7b767eb34caebbfa0c9bdfb50d771d3b9d95)
@@ -83,8 +83,12 @@
     @Column(name = "limit_upload")
     private boolean limitUpload;
 
+    //max limitUploadNumber
     @Column(name = "limit_upload_number")
     private int limitUploadNumber;
+    
+    @Column(name = "min_limit_upload_number")
+    private Integer minLimitUploadNumber;
 
     @Column(name = "reflect_on_activity")
     private boolean reflectOnActivity;
@@ -263,7 +267,15 @@
     public void setLimitUploadNumber(int limitUploadNumber) {
 	this.limitUploadNumber = limitUploadNumber;
     }
+    
+    public Integer getMinLimitUploadNumber() {
+	return minLimitUploadNumber;
+    }
 
+    public void setMinLimitUploadNumber(Integer minLimitUploadNumber) {
+	this.minLimitUploadNumber = minLimitUploadNumber;
+    }
+
     public Date getCreated() {
 	return created;
     }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
diff -u -r20aa6cbca9fc96d341080e6ad39f82593443f792 -re34c7b767eb34caebbfa0c9bdfb50d771d3b9d95
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 20aa6cbca9fc96d341080e6ad39f82593443f792)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision e34c7b767eb34caebbfa0c9bdfb50d771d3b9d95)
@@ -1328,6 +1328,7 @@
 	content.setUseSelectLeaderToolOuput(
 		JsonUtil.optBoolean(toolContentJSON, "useSelectLeaderToolOuput", Boolean.FALSE));
 	content.setLimitUploadNumber(JsonUtil.optInt(toolContentJSON, "limitUploadNumber", 0));
+	content.setMinLimitUploadNumber(JsonUtil.optInt(toolContentJSON, "minLimitUploadNumber", 0));
 	// submissionDeadline is set in monitoring
 
 	SubmitUser user = getContentUser(toolContentID, userID);
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/AuthoringController.java
===================================================================
diff -u -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d -re34c7b767eb34caebbfa0c9bdfb50d771d3b9d95
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision e34c7b767eb34caebbfa0c9bdfb50d771d3b9d95)
@@ -178,8 +178,9 @@
 	content.setReflectInstructions(authoringForm.getReflectInstructions());
 	content.setReflectOnActivity(authoringForm.isReflectOnActivity());
 	content.setLimitUpload(authoringForm.isLimitUpload());
-	content.setUseSelectLeaderToolOuput(authoringForm.isUseSelectLeaderToolOuput());
 	content.setLimitUploadNumber(authoringForm.getLimitUploadNumber());
+	content.setMinLimitUploadNumber(authoringForm.getMinLimitUploadNumber());
+	content.setUseSelectLeaderToolOuput(authoringForm.isUseSelectLeaderToolOuput());
 	content.setNotifyLearnersOnMarkRelease(authoringForm.isNotifyLearnersOnMarkRelease());
 	content.setNotifyTeachersOnFileSubmit(authoringForm.isNotifyTeachersOnFileSubmit());
 	return content;
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java
===================================================================
diff -u -r190c89f5332a6fa6da4d16fd4e0eb668a6d930f7 -re34c7b767eb34caebbfa0c9bdfb50d771d3b9d95
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java	(.../LearnerController.java)	(revision 190c89f5332a6fa6da4d16fd4e0eb668a6d930f7)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java	(.../LearnerController.java)	(revision e34c7b767eb34caebbfa0c9bdfb50d771d3b9d95)
@@ -148,8 +148,9 @@
 	sessionMap.put(SbmtConstants.ATTR_REFLECTION_INSTRUCTION, content.getReflectInstructions());
 	sessionMap.put(SbmtConstants.ATTR_TITLE, content.getTitle());
 	sessionMap.put(SbmtConstants.ATTR_INSTRUCTION, content.getInstruction());
-	sessionMap.put(SbmtConstants.ATTR_LIMIT_UPLOAD, content.isLimitUpload());
-	sessionMap.put(SbmtConstants.ATTR_LIMIT_UPLOAD_NUMBER, content.getLimitUploadNumber());
+	sessionMap.put(SbmtConstants.ATTR_IS_MAX_LIMIT_UPLOAD_ENABLED, content.isLimitUpload());
+	sessionMap.put(SbmtConstants.ATTR_MAX_LIMIT_UPLOAD_NUMBER, content.getLimitUploadNumber());
+	sessionMap.put(SbmtConstants.ATTR_MIN_LIMIT_UPLOAD_NUMBER, content.getMinLimitUploadNumber());
 	sessionMap.put(SbmtConstants.ATTR_USER_FINISHED, learner.isFinished());
 	sessionMap.put(SbmtConstants.ATTR_IS_MARKS_RELEASED, session.isMarksReleased());
 
@@ -459,16 +460,12 @@
 	// preset
 	// Monitor can edit the activity and set a limit / decreased the limit with
 	// the learner having already uploaded more files so ensure code handles that case.
-	boolean limitUpload = (Boolean) sessionMap.get(SbmtConstants.ATTR_LIMIT_UPLOAD);
+	boolean limitUpload = (Boolean) sessionMap.get(SbmtConstants.ATTR_IS_MAX_LIMIT_UPLOAD_ENABLED);
 	if (limitUpload && filesUploaded != null) {
-	    int limit = (Integer) sessionMap.get(SbmtConstants.ATTR_LIMIT_UPLOAD_NUMBER);
-	    int limitUploadLeft = 0;
-	    if (limit <= filesUploaded.size()) {
-		sessionMap.put(SbmtConstants.ATTR_ARRIVE_LIMIT, Boolean.TRUE);
-	    } else {
-		limitUploadLeft = limit - filesUploaded.size();
+	    int maxLimit = (Integer) sessionMap.get(SbmtConstants.ATTR_MAX_LIMIT_UPLOAD_NUMBER);
+	    if (maxLimit <= filesUploaded.size()) {
+		sessionMap.put(SbmtConstants.ATTR_MAX_LIMIT_REACHED, Boolean.TRUE);
 	    }
-	    dto.setLimitUploadLeft(limitUploadLeft);
 	}
 
 	// retrieve notebook reflection entry.
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MonitoringController.java
===================================================================
diff -u -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d -re34c7b767eb34caebbfa0c9bdfb50d771d3b9d95
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision e34c7b767eb34caebbfa0c9bdfb50d771d3b9d95)
@@ -46,7 +46,6 @@
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.lamsfoundation.lams.tool.sbmt.SbmtConstants;
-import org.lamsfoundation.lams.tool.sbmt.dto.AuthoringDTO;
 import org.lamsfoundation.lams.tool.sbmt.dto.FileDetailsDTO;
 import org.lamsfoundation.lams.tool.sbmt.dto.SessionDTO;
 import org.lamsfoundation.lams.tool.sbmt.dto.StatisticDTO;
@@ -134,19 +133,18 @@
 	statistic(request, contentID);
 
 	// instruction
-	SubmitFilesContent persistContent = submitFilesService.getSubmitFilesContent(contentID);
+	SubmitFilesContent content = submitFilesService.getSubmitFilesContent(contentID);
 	// if this content does not exist, then reset the contentID to current value to keep it on HTML page.
-	persistContent.setContentID(contentID);
+	content.setContentID(contentID);
 
-	AuthoringDTO authorDto = new AuthoringDTO(persistContent);
-	request.setAttribute(SbmtConstants.AUTHORING_DTO, authorDto);
-	request.setAttribute(SbmtConstants.CONTENT_IN_USE, persistContent.isContentInUse());
+	request.setAttribute(SbmtConstants.ATTR_CONTENT, content);
+	request.setAttribute(SbmtConstants.CONTENT_IN_USE, content.isContentInUse());
 	request.setAttribute(SbmtConstants.ATTR_IS_GROUPED_ACTIVITY, submitFilesService.isGroupedActivity(contentID));
-	request.setAttribute(SbmtConstants.ATTR_REFLECTION_ON, persistContent.isReflectOnActivity());
+	request.setAttribute(SbmtConstants.ATTR_REFLECTION_ON, content.isReflectOnActivity());
 
 	// set SubmissionDeadline, if any
-	if (persistContent.getSubmissionDeadline() != null) {
-	    Date submissionDeadline = persistContent.getSubmissionDeadline();
+	if (content.getSubmissionDeadline() != null) {
+	    Date submissionDeadline = content.getSubmissionDeadline();
 	    HttpSession ss = SessionManager.getSession();
 	    UserDTO teacher = (UserDTO) ss.getAttribute(AttributeNames.USER);
 	    TimeZone teacherTimeZone = teacher.getTimeZone();
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/AuthoringForm.java
===================================================================
diff -u -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d -re34c7b767eb34caebbfa0c9bdfb50d771d3b9d95
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/AuthoringForm.java	(.../AuthoringForm.java)	(revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/AuthoringForm.java	(.../AuthoringForm.java)	(revision e34c7b767eb34caebbfa0c9bdfb50d771d3b9d95)
@@ -32,6 +32,8 @@
     private boolean useSelectLeaderToolOuput;
 
     private int limitUploadNumber;
+    
+    private Integer minLimitUploadNumber;
 
     private boolean reflectOnActivity;
 
@@ -61,6 +63,7 @@
 	useSelectLeaderToolOuput = content.isUseSelectLeaderToolOuput();
 	limitUpload = content.isLimitUpload();
 	limitUploadNumber = content.getLimitUploadNumber();
+	minLimitUploadNumber = content.getMinLimitUploadNumber();
 
 	reflectOnActivity = content.isReflectOnActivity();
 	reflectInstructions = content.getReflectInstructions();
@@ -158,7 +161,15 @@
     public void setLimitUploadNumber(int limitUploadNumber) {
 	this.limitUploadNumber = limitUploadNumber;
     }
+    
+    public Integer getMinLimitUploadNumber() {
+	return minLimitUploadNumber;
+    }
 
+    public void setMinLimitUploadNumber(Integer minLimitUploadNumber) {
+	this.minLimitUploadNumber = minLimitUploadNumber;
+    }
+
     public boolean isNotifyLearnersOnMarkRelease() {
 	return notifyLearnersOnMarkRelease;
     }
Index: lams_tool_sbmt/web/authoring/advance.jsp
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -re34c7b767eb34caebbfa0c9bdfb50d771d3b9d95
--- lams_tool_sbmt/web/authoring/advance.jsp	(.../advance.jsp)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_tool_sbmt/web/authoring/advance.jsp	(.../advance.jsp)	(revision e34c7b767eb34caebbfa0c9bdfb50d771d3b9d95)
@@ -1,14 +1,59 @@
 <%@include file="/common/taglibs.jsp"%>
+<style>
+	.slider-div {
+		padding: 15px 20px 0;
+	}
 
+</style>
 
-<!-- ========== Advanced Tab ========== -->
-
 <script type="text/javascript">
 	$(document).ready(function(){
+		//initialize bootstrap-sliders
+		$('.bootstrap-slider').bootstrapSlider();
+		//force slider to show tick labels
+		setTimeout(
+			function(){ 
+				//$(".bootstrap-slider").each(function() {
+					//$(this).bootstrapSlider('relayout');
+					//$(".bootstrap-slider").bootstrapSlider("relayout");
+				//});
+
+				$(".bootstrap-slider").bootstrapSlider("relayout");
+			}, 
+			1200
+		);
+		
+		$('#enable-min-limit').change(function(){
+			//toggle visibility of the slider
+			$('#minLimitUploadNumber').parent().toggleClass('hidden');
+
+			//force slider to show tick labels
+			$('#minLimitUploadNumber').bootstrapSlider('relayout');
+
+			//update slider's value on pressing checkbox
+			if ($(this).is(':checked')) {
+				$('#minLimitUploadNumber').bootstrapSlider("setValue", 1);
+			} else {
+				$('#minLimitUploadNumber').bootstrapSlider("setValue", '');
+				$('#minLimitUploadNumber').val('');
+			}
+		});
+
 		$('#limitUpload').change(function(){
-			var enabled = $(this).is(':checked');
-			$('#limitUploadNumber').prop('disabled', !enabled);
-		}).change();
+			//toggle visibility of the slider
+			$('#limitUploadNumber').parent().toggleClass('hidden');
+
+			//force slider to show tick labels
+			$('#limitUploadNumber').bootstrapSlider('relayout');
+
+			//update slider's value on pressing checkbox
+			if ($(this).is(':checked')) {
+				$('#limitUploadNumber').bootstrapSlider("setValue", 1);
+			} else {
+				$('#limitUploadNumber').bootstrapSlider("setValue", 0);
+				$('#limitUploadNumber').val(0);
+			}
+		});
 		
 		$('#reflectInstructions').keyup(function(){
 			var checked = $(this).val() != null && $(this).val().trim() != '';
@@ -18,67 +63,86 @@
 </script>
 
 <lams:SimplePanel titleKey="label.select.leader">
-<div class="checkbox">
-	<label for="useSelectLeaderToolOuput">
-		<form:checkbox path="useSelectLeaderToolOuput" value="1" id="useSelectLeaderToolOuput"/>
-		<fmt:message key="label.use.select.leader.tool.output" />
-	</label>
-</div>
+	<div class="checkbox">
+		<label for="useSelectLeaderToolOuput">
+			<form:checkbox path="useSelectLeaderToolOuput" value="1" id="useSelectLeaderToolOuput"/>
+			<fmt:message key="label.use.select.leader.tool.output" />
+		</label>
+	</div>
 </lams:SimplePanel>
 
 <lams:SimplePanel titleKey="label.file.options">
-<div class="checkbox">
-	<label for="limitUpload">
-		<form:checkbox path="limitUpload" id="limitUpload" />
-		<fmt:message key="label.limit.number.upload" />
-	</label>
+	<div class="checkbox">
+		<label for="enable-min-limit">
+			<input type="checkbox" id="enable-min-limit" <c:if test="${authoringForm.minLimitUploadNumber != null}">checked="checked"</c:if>/>
+			<fmt:message key="label.enable.min.limit" />
+		</label>
 
-	<form:select path="limitUploadNumber" id="limitUploadNumber" cssClass="loffset5 form-control form-control-inline">
-		<form:option value="1">1</form:option>
-		<form:option value="2">2</form:option>
-		<form:option value="3">3</form:option>
-		<form:option value="4">4</form:option>
-		<form:option value="5">5</form:option>
-	</form:select>
-</div>
+		<div class="slider-div <c:if test="${authoringForm.minLimitUploadNumber == null}">hidden</c:if>">
+			<input name="minLimitUploadNumber" id="minLimitUploadNumber" type="text"
+				class="bootstrap-slider" 
+				data-slider-tooltip="hide"
+				data-slider-ticks="[1, 2, 3, 4, 5]"
+				data-slider-ticks-labels='["1", "2", "3", "4", "5"]'
+				data-slider-lock-to-ticks="true"
+				data-slider-value="${authoringForm.minLimitUploadNumber}"
+			/>
+		</div>
+	</div>
+	
+	<div class="checkbox">
+		<label for="limitUpload">
+			<form:checkbox path="limitUpload" id="limitUpload" />
+			<fmt:message key="label.limit.number.upload" />
+		</label>
+
+		<div class="slider-div <c:if test="${!authoringForm.limitUpload}">hidden</c:if>">
+			<input name="limitUploadNumber" id="limitUploadNumber" class="bootstrap-slider" type="text"
+				data-slider-tooltip="hide"
+				data-slider-ticks="[1, 2, 3, 4, 5, 100]"
+				data-slider-ticks-positions="[0, 20, 40, 60, 80, 100]"
+				data-slider-ticks-labels='["1", "2", "3", "4", "5", "100"]'
+				data-slider-lock-to-ticks="true"
+				<c:if test="${authoringForm.limitUpload}">data-slider-value="${authoringForm.limitUploadNumber}"</c:if>
+			/>
+		</div>
+	</div>
 </lams:SimplePanel>
 
 <lams:SimplePanel titleKey="label.notifications">
-<div class="checkbox">
-	<label for="notifyLearnersOnMarkRelease">
-		<form:checkbox path="notifyLearnersOnMarkRelease" id="notifyLearnersOnMarkRelease" />
-		<fmt:message key="label.authoring.advanced.notify.mark.release" />
-	</label>
-</div>
-
-<div class="checkbox">
-	<label for="notifyTeachersOnFileSubmit">
-		<form:checkbox path="notifyTeachersOnFileSubmit" id="notifyTeachersOnFileSubmit" />
-		<fmt:message key="label.authoring.advanced.notify.onfilesubmit" />
-	</label>
-</div>
-
+	<div class="checkbox">
+		<label for="notifyLearnersOnMarkRelease">
+			<form:checkbox path="notifyLearnersOnMarkRelease" id="notifyLearnersOnMarkRelease" />
+			<fmt:message key="label.authoring.advanced.notify.mark.release" />
+		</label>
+	</div>
+	
+	<div class="checkbox">
+		<label for="notifyTeachersOnFileSubmit">
+			<form:checkbox path="notifyTeachersOnFileSubmit" id="notifyTeachersOnFileSubmit" />
+			<fmt:message key="label.authoring.advanced.notify.onfilesubmit" />
+		</label>
+	</div>
 </lams:SimplePanel>
 
 <lams:OutcomeAuthor toolContentId="${authoringForm.toolContentID}" />
 
 <lams:SimplePanel titleKey="label.activity.completion">
-<div class="checkbox">
-	<label for="lockOnFinished">
-		<form:checkbox path="lockOnFinished" id="lockOnFinished" />
-		<fmt:message key="label.authoring.advance.lock.on.finished" />
-	</label>
-</div>
-
-<div class="checkbox">
-	<label for="reflectOnActivity">
-		<form:checkbox path="reflectOnActivity" id="reflectOnActivity" />
-		<fmt:message key="label.authoring.advanced.reflectOnActivity" />
-	</label>
-</div>
-
-<div class="form-group">
-	<form:textarea path="reflectInstructions" id="reflectInstructions" cssClass="form-control" cols="50" rows="4"></form:textarea>
-</div>
+	<div class="checkbox">
+		<label for="lockOnFinished">
+			<form:checkbox path="lockOnFinished" id="lockOnFinished" />
+			<fmt:message key="label.authoring.advance.lock.on.finished" />
+		</label>
+	</div>
+	
+	<div class="checkbox">
+		<label for="reflectOnActivity">
+			<form:checkbox path="reflectOnActivity" id="reflectOnActivity" />
+			<fmt:message key="label.authoring.advanced.reflectOnActivity" />
+		</label>
+	</div>
+	
+	<div class="form-group">
+		<form:textarea path="reflectInstructions" id="reflectInstructions" cssClass="form-control" cols="50" rows="4"></form:textarea>
+	</div>
 </lams:SimplePanel>
-
Index: lams_tool_sbmt/web/authoring/authoring.jsp
===================================================================
diff -u -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 -re34c7b767eb34caebbfa0c9bdfb50d771d3b9d95
--- lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
+++ lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision e34c7b767eb34caebbfa0c9bdfb50d771d3b9d95)
@@ -11,16 +11,16 @@
 <%@ page import="org.lamsfoundation.lams.tool.sbmt.SbmtConstants"%>
 <lams:html>
 <lams:head>
-	
 	<lams:headItems />
 	<title><fmt:message key="activity.title" /></title>
-	
+	<link rel="stylesheet" type="text/css" href="<lams:LAMSURL />css/bootstrap-slider.css" />
+
+	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/bootstrap-slider.js"></script>
 	<script type="text/javascript">
         function doSelectTab(tabId) {
 	    	selectTab(tabId);
         } 
     </script>
-
 </lams:head>
 <body class="stripes">
 <form:form action="updateContent.do" id="authoringForm" modelAttribute="authoringForm" method="post" enctype="multipart/form-data">
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -r3bb7e0141ae1cc15ccd737c95d90b5762a34ad61 -re34c7b767eb34caebbfa0c9bdfb50d771d3b9d95
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 3bb7e0141ae1cc15ccd737c95d90b5762a34ad61)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision e34c7b767eb34caebbfa0c9bdfb50d771d3b9d95)
@@ -14,48 +14,50 @@
 <lams:head>
 	<title><fmt:message key="tool.display.name" /></title>
 	<%@ include file="/common/header.jsp"%>
+	
 	<script type="text/javascript" src="${lams}includes/javascript/upload.js"></script>
-
 	<script type="text/javascript">
 		$(document).ready(function() {
 			$("time.timeago").timeago();
 		});
 
-		function submitCount(tUrl) {
-			var lockOnFinished = <c:out value="${sessionMap.lockOnFinish}"/>;
-			var uploadFileNum = <c:choose><c:when test="${empty learner.filesUploaded}">0</c:when><c:otherwise>1</c:otherwise></c:choose>;
-			if (lockOnFinished && uploadFileNum == 0) {
-				if (confirm("<fmt:message key='learner.finish.without.upload'/>"))
-					location.href = tUrl;
-				else
-					return false;
-				//			}else{
-				//				if(confirm("<fmt:message key='messsage.learner.finish.confirm'/>"))
-				//					location.href= tUrl;
-				//				else
-				//					return false;
-				//			}
-			} else if (uploadFileNum == 0) {
-				if (confirm("<fmt:message key='messsage.learner.finish.confirm'/>")) {
-					disableButtons();
-					location.href = tUrl;
-				} else {
-					return false;
-				}
-			} else {
-				disableButtons();
-				location.href = tUrl;
-			}
-		}
 		function finish() {
 			var finishUrl = "<lams:WebAppURL />learning/finish.do?sessionMapID=${sessionMapID}";
-			return submitCount(finishUrl);
+			return validateFinish(finishUrl);
 		}
 		function notebook() {
 			var continueUrl = "<lams:WebAppURL />learning/newReflection.do?sessionMapID=${sessionMapID}";
-			return submitCount(continueUrl);
+			return validateFinish(continueUrl);
 		}
-		function validate() {
+		function validateFinish(tUrl) {
+			var uploadedFilesNumber = <c:choose><c:when test="${empty learner.filesUploaded}">0</c:when><c:otherwise>1</c:otherwise></c:choose>;
+
+			//enforce min files upload limit
+			<c:if test="${sessionMap.minLimitUploadNumber != null}">
+				if (uploadedFilesNumber < ${sessionMap.minLimitUploadNumber}) {
+					alert('<fmt:message key="label.should.upload.another"><fmt:param value="${sessionMap.minLimitUploadNumber}" /></fmt:message>');
+					return false;
+				}
+			</c:if>
+
+			//let user confirm zero files upload
+			if (uploadedFilesNumber == 0) {
+				if (${sessionMap.lockOnFinish}) {
+					if (!confirm("<fmt:message key='learner.finish.without.upload'/>")) {
+						return false;
+					}
+				} else {
+					if (!confirm("<fmt:message key='messsage.learner.finish.confirm'/>")) {
+						return false;
+					}
+				}
+			}
+
+			disableButtons();
+			location.href = tUrl;
+		}
+		
+		function validateFileUpload() {
 			var valid = true;
 
 			// check description
@@ -87,6 +89,7 @@
 			}
 			return valid;
 		}
+		
 		function disableButtons() {
 			// do not disable the file button or the file will be missing on the upload.
 			$('.btn-disable-on-submit').prop('disabled', true);
@@ -104,24 +107,21 @@
 			msg = msg.replace('{0}', filename);
 			var answer = confirm(msg);
 			if (answer) {	
-				 $.ajax({
-					 	url: '<c:url value="/learning/deleteLearnerFile.do"/>',
-			            data: 'detailId=' + detailId,
-			            success: function () {
-			            	document.location.href = "<lams:WebAppURL />learning/${sessionMap.mode}.do?toolSessionID=${sessionMap.toolSessionID}";
-			            },
-			            error: function(error){
-			                alert("readyState: "+xhr.readyState+"\nstatus: "+xhr.status);
-			                alert("responseText: "+xhr.responseText);
-			            }
-			       	});
+				$.ajax({
+					url: '<c:url value="/learning/deleteLearnerFile.do"/>',
+			        data: 'detailId=' + detailId,
+			        success: function () {
+			          	document.location.href = "<lams:WebAppURL />learning/${sessionMap.mode}.do?toolSessionID=${sessionMap.toolSessionID}";
+			        },
+			        error: function(error){
+			         	alert("readyState: "+xhr.readyState+"\nstatus: "+xhr.status);
+			            alert("responseText: "+xhr.responseText);
+			        }
+			    });
 			}
 		}
-
 	</script>
-
 </lams:head>
-
 <body class="stripes">
 
 	<lams:Page type="learner" title="${sessionMap.title}" formID="learnerForm">
@@ -130,6 +130,7 @@
 		</div>
 
 		<!-- notices and announcements -->
+		
 		<c:if test="${(sessionMap.mode == 'author' || sessionMap.mode == 'learner') && hasEditRight}">
 			<c:if test="${sessionMap.lockOnFinish}">
 				<!--  Lock when finished -->
@@ -155,24 +156,26 @@
 				</lams:Alert>
 			</c:if>
 
-			<c:if test="${sessionMap.limitUpload}">
-				<c:choose>
-					<c:when test="${not sessionMap.userFinished || not sessionMap.lockOnFinish}">
-						<lams:Alert id="limitUploads" close="true" type="info">
-							<fmt:message key="message.left.upload.limit">
-								<fmt:param value="${learner.limitUploadLeft}" />
-							</fmt:message>
-						</lams:Alert>
-					</c:when>
-				</c:choose>
+			<c:if test="${not sessionMap.userFinished || not sessionMap.lockOnFinish}">
+				<c:if test="${sessionMap.isMaxLimitUploadEnabled}">
+					<lams:Alert id="limitUploads" close="true" type="info">
+						<fmt:message key="message.left.upload.limit">
+							<fmt:param value="${sessionMap.maxLimitUploadNumber}" />
+						</fmt:message>
+					</lams:Alert>
+				</c:if>
+				
+				<c:if test="${sessionMap.minLimitUploadNumber != null}">
+					<lams:Alert id="minLimitUploadNumber" close="true" type="info">
+						<fmt:message key="label.should.upload.another">
+							<fmt:param value="${sessionMap.minLimitUploadNumber}" />
+						</fmt:message>
+					</lams:Alert>
+				</c:if>
 			</c:if>
-
 		</c:if>
-		<!-- End notices and announcements -->
-
 		<lams:errors/>
 
-
 		<!--Checks if the filesUploaded property of the SbmtLearnerForm is set -->
 		<c:choose>
 			<c:when test="${empty learner.filesUploaded && hasEditRight}">
@@ -182,158 +185,141 @@
 			</c:when>
 
 			<c:otherwise>
-			
-			<table class="table table-condensed">
-				<tr>
-					<th class="active">
-						<fmt:message key="monitoring.user.submittedFiles" />
-					</th>
-					<th colspan="2" class="active">
-						<c:out value="${fn:length(learner.filesUploaded)}" />
-					</th>
-				<tr>
-				<c:forEach var="file" items="${learner.filesUploaded}" varStatus="status">
-					<tr class="active">
-						<!--First Row displaying the name of the File -->
-						<td colspan="${file.currentLearner ? 2 : 3}">
-							<c:out value="${status.count}" />) <c:out value="${file.filePath}" />
-							<c:if test="${file.currentLearner}">
-								<c:set var="downloadURL">
-									<c:url value="/download?uuid=${file.uuID}&versionID=${file.versionID}&preferDownload=true" />
-								</c:set>
+				<div class="voffset10">
+					<fmt:message key="monitoring.user.submittedFiles" />: <c:out value="${fn:length(learner.filesUploaded)}" />
+				</div>
+				
+				<table class="table table-condensed voffset20">
+					<c:forEach var="file" items="${learner.filesUploaded}" varStatus="status">
+					
+						<!--The name of the File -->
+						<tr class="active">
+							<td colspan="${file.currentLearner ? 2 : 3}">
+								<c:out value="${status.count}" />) <c:out value="${file.filePath}" />
+								
+								<c:if test="${file.currentLearner}">
+									<c:set var="downloadURL">
+										<c:url value="/download?uuid=${file.uuID}&versionID=${file.versionID}&preferDownload=true" />
+									</c:set>
+									</td>
+									
+									<td>
+										<c:if test="${empty file.marks && hasEditRight}">
+										 	<a href="javascript:deleteLearnerFile(${file.submissionID}, '${file.filePath}');" class="btn btn-default btn-disable-on-submit pull-right">
+							                      <i class="fa fa-trash" title="<fmt:message key="label.monitoring.original.learner.file.delete" />"></i> <span class="hidden-xs"></span>
+						                 	</a>
+						                 </c:if>
+					                 
+										<a href="${downloadURL}" title="<fmt:message key="label.download" />" class="btn btn-default btn-disable-on-submit pull-right">
+											<i class="fa fa-download" ></i>
+										</a>
+									</td>
+								</c:if>
+							</td>
+						</tr>
+						
+						<!--The description of the File -->
+						<tr>
+							<td colspan="3">
+								<lams:out value="${file.fileDescription}" escapeHtml="true" />
+								
+								<div class="text-muted voffset10">
+									<fmt:message key="label.learner.time" />&nbsp;
+									<lams:Date value="${file.dateOfSubmission}" timeago="true"/>
+								</div>
+							</td>
+						</tr>
+	
+						<!--Comments -->
+						<c:if test="${sessionMap.isMarksReleased and not empty file.comments}">
+							<tr>
+								<td colspan="3">
+									<fmt:message key="label.learner.comments" />:
+									<c:out value="${file.comments}" escapeXml="false" />
 								</td>
+							</tr>
+						</c:if>
+		
+						<!--Marks-->
+						<c:if test="${sessionMap.isMarksReleased and not empty file.marks}">
+							<tr>
+								<td colspan="3">
+									<fmt:message key="label.learner.marks" />:
+									<c:out value="${file.marks}" escapeXml="true" />
+								</td>
+							</tr>
+						</c:if>
+						
+						<!--Marked file-->
+						<c:if  test="${sessionMap.isMarksReleased and not empty file.markFileUUID}">	
+							<tr>
+								<td><fmt:message key="label.monitor.mark.markedFile" /></td>
 								<td>
-								<c:if test="${empty file.marks && hasEditRight}">
-								 <a href="javascript:deleteLearnerFile(${file.submissionID}, '${file.filePath}');" class="btn btn-default btn-disable-on-submit pull-right">
-					                      <i class="fa fa-trash" title="<fmt:message key="label.monitoring.original.learner.file.delete" />"></i> <span class="hidden-xs"></span>
-				                 </a>
-				                 </c:if>
-									<a href="${downloadURL}" title="<fmt:message key="label.download" />" class="btn btn-default btn-disable-on-submit pull-right">
-										<i class="fa fa-download" ></i>
+									<c:out value="${file.markFileName}" />
+								</td>
+								<td>
+									<c:set var="markFileDownloadURL">
+										<c:url value="/download?uuid=${file.markFileUUID}&versionID=${file.markFileVersionID}&preferDownload=true" />
+									</c:set>
+									<a href="${markFileDownloadURL}" title="<fmt:message key='label.download' />" class="btn btn-default btn-disable-on-submit pull-right">
+										<i class="fa fa-download"></i>
 									</a>
 								</td>
-							   </c:if>
-						</td>
-					</tr>
-					<tr>
-						<!--Second Row displaying the description of the File -->
-						<td style="vertical-align:top"><fmt:message key="label.learner.fileDescription" /></td>
-						<td colspan="2"><lams:out value="${file.fileDescription}" escapeHtml="true" /></td>
-					</tr>
-
-					<tr>
-						<!--Third row displaying the date of submission of the File -->
-						<td><fmt:message key="label.learner.time" /></td>
-						<td colspan="2">
-							<lams:Date value="${file.dateOfSubmission}" timeago="true"/>
-						</td>
-					</tr>
-
-				<!--Fourth row displaying the comments -->
-				<c:if test="${sessionMap.isMarksReleased and not empty file.comments}">
-					<tr>
-						<td style="vertical-align:top"><fmt:message key="label.learner.comments" /></td>
-						<td colspan="2">
-							<c:out value="${file.comments}" escapeXml="false" />
-						</td>
-					</tr>
-				</c:if>
-
-				<!--Fifth row displaying the marks-->
-				<c:if test="${sessionMap.isMarksReleased and not empty file.marks}">
-					<tr>
-						<td><fmt:message key="label.learner.marks" /></td>
-						<td>
-							<c:out value="${file.marks}" escapeXml="true" />
-						</td>
-					</tr>
-				</c:if>
-				<!--Sixth row displaying the marked file-->
-				<c:if  test="${sessionMap.isMarksReleased and not empty file.markFileUUID}">	
-					<tr>
-						<td><fmt:message key="label.monitor.mark.markedFile" /></td>
-						<td>
-							<c:out value="${file.markFileName}" />
-						</td>
-						<td>
-							<c:set var="markFileDownloadURL">
-								<c:url value="/download?uuid=${file.markFileUUID}&versionID=${file.markFileVersionID}&preferDownload=true" />
-							</c:set>
-							<a href="${markFileDownloadURL}" title="<fmt:message key='label.download' />" class="btn btn-default btn-disable-on-submit pull-right">
-								<i class="fa fa-download"></i>
-							</a>
-						</td>
-					</tr>
-				</c:if>	
-					<tr style="margin-bottom: 5px; border-bottom: 5px solid #ddd">
-						<td></td>
-						<td></td>
-						<td></td>
-					</tr>
-				</c:forEach>
-			</table>
-
+							</tr>
+						</c:if>	
+					</c:forEach>
+				</table>
 			</c:otherwise>
 		</c:choose>
 
 		<hr width="100%"/>
-		<!-- Form -->
 
-		<c:if test="${sessionMap.mode != 'teacher'}">
-			<!-- dont display form if teacher -->
+		<!-- upload form (we display it only if the user is not finished and lockedWhenFinished or no more files allowed) -->
+		<c:if test="${!sessionMap.finishLock && !sessionMap.maxLimitReached && hasEditRight && sessionMap.mode != 'teacher'}">
+			<form:form action="uploadFile.do" modelAttribute="learnerForm" id="learnerForm" method="post" enctype="multipart/form-data" onsubmit="return validateFileUpload();" >
+				<input type="hidden" name="sessionMapID" value="${sessionMapID}"/>
+				<input type="hidden" name="toolSessionID" value="${toolSessionID}" />
 
-			<!-- now check if the user is (finished + lockedWhenFinished) or no more files allowed -->
-			<c:set var="displayForm" value="${sessionMap.finishLock || sessionMap.arriveLimit}" />
-
-			<c:if test="${!displayForm && hasEditRight}">
-
-				<form:form action="uploadFile.do" modelAttribute="learnerForm" id="learnerForm" method="post" enctype="multipart/form-data" onsubmit="return validate();" >
-					<input type="hidden" name="sessionMapID" value="${sessionMapID}"/>
-
-					<!-- Hidden fields -->
-					<input type="hidden" name="toolSessionID" value="${toolSessionID}" />
-
-					<!--File path row -->
-					<div class="panel panel-default">
-						<div class="panel-heading panel-title">
-							<fmt:message key="label.learner.upload" />
+				<!--File path row -->
+				<div class="panel panel-default">
+					<div class="panel-heading panel-title">
+						<fmt:message key="label.learner.upload" />
+					</div>
+					
+					<div class="panel-body">
+						<div class="form-group">
+							<label for="file"><fmt:message key="label.learner.filePath" />&nbsp;<span style="color: red">*</span></label>
+							<lams:FileUpload fileFieldname="file" fileInputMessageKey="label.learner.filePath"
+								uploadInfoMessageKey="label.learner.uploadMessage" maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"/>
 						</div>
-						<div class="panel-body">
-
-							<div class="form-group">
-								<label for="file"><fmt:message key="label.learner.filePath" />&nbsp;<span style="color: red">*</span></label>
-								<lams:FileUpload fileFieldname="file" fileInputMessageKey="label.learner.filePath"
-									uploadInfoMessageKey="label.learner.uploadMessage" maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"/>
-							</div>
-							<div class="form-group">
-								<!--File Description row -->
-								<label for="description"><fmt:message key="label.learner.fileDescription" />&nbsp;<span
-									style="color: red">*</span></label>
-								<form:textarea id="description" cssClass="form-control" path="description"></form:textarea>
-								<div id="desc-error-msg" class="text-danger" style="display: none;"></div>
-							</div>
-							<p class="help-block"><small><fmt:message key="errors.required"><fmt:param>*</fmt:param></fmt:message></small></p>
-							<div class="form-group">
-								<c:if test="${hasEditRight}">											
-									<button id="uploadButton" type="submit" <c:if test="${sessionMap.finishLock || sessionMap.arriveLimit}">disabled="disabled"</c:if>
-										class="btn btn-sm btn-default btn-primary btn-disable-on-submit">
-										<i class="fa fa-xs fa-plus"></i> <fmt:message key="label.add" />
-									</button>
-								</c:if>
-							</div>
+						
+						<!--File Description -->
+						<div class="form-group">	
+							<label for="description"><fmt:message key="label.learner.fileDescription" />&nbsp;<span
+								style="color: red">*</span></label>
+							<form:textarea id="description" cssClass="form-control" path="description"></form:textarea>
+							<div id="desc-error-msg" class="text-danger" style="display: none;"></div>
 						</div>
+						
+						<p class="help-block"><small><fmt:message key="errors.required"><fmt:param>*</fmt:param></fmt:message></small></p>
+						<div class="form-group">
+							<c:if test="${hasEditRight}">
+								<button id="uploadButton" type="submit" <c:if test="${sessionMap.finishLock || sessionMap.maxLimitReached}">disabled="disabled"</c:if>
+									class="btn btn-sm btn-default btn-primary btn-disable-on-submit pull-right">
+									<i class="fa fa-xs fa-plus"></i> <fmt:message key="label.add" />
+								</button>
+							</c:if>
+						</div>
 					</div>
-				</form:form>
+				</div>
+			</form:form>
 				
-				<lams:WaitingSpinner id="attachmentArea_Busy"/>
-			</c:if>
+			<lams:WaitingSpinner id="attachmentArea_Busy"/>
 		</c:if>
-		<!-- end form -->
+		
+		<!-- reflection -->
 
-
-
 		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
-			<!-- reflection -->
 			<div class="panel panel-default">
 				<div class="panel-heading panel-title">
 					<fmt:message key="title.reflection" />
@@ -367,32 +353,32 @@
 					</c:if>
 				</div>
 			</div>
-			<!-- end reflection -->
 		</c:if>
+		
+		<!-- submit buttons -->
 
 		<c:if test="${sessionMap.mode != 'teacher'}">
-		<c:choose>
-			<c:when test="${sessionMap.reflectOn and (not sessionMap.userFinished)}">
-				<button id="notebookButton" onclick="javascript:notebook();" class="btn btn-primary btn-disable-on-submit pull-right">
-					<fmt:message key="label.continue" />
+			<c:choose>
+				<c:when test="${sessionMap.reflectOn and (not sessionMap.userFinished)}">
+					<button id="notebookButton" onclick="javascript:notebook();" class="btn btn-primary btn-disable-on-submit pull-right">
+						<fmt:message key="label.continue" />
 					</button>
-			</c:when>
-			<c:otherwise>
-				<button type="submit" onclick="javascript:finish();" class="btn btn-primary btn-disable-on-submit pull-right na" id="finishButton">
-					<c:choose>
-						<c:when test="${isLastActivity}">
-							<fmt:message key="button.submit" />
-						</c:when>
-						<c:otherwise>
-							<fmt:message key="button.finish" />
-						</c:otherwise>
-					</c:choose>
-				</button>
-			</c:otherwise>
-		</c:choose>
+				</c:when>
+				<c:otherwise>
+					<button type="submit" onclick="javascript:finish();" class="btn btn-primary btn-disable-on-submit pull-right na" id="finishButton">
+						<c:choose>
+							<c:when test="${isLastActivity}">
+								<fmt:message key="button.submit" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="button.finish" />
+							</c:otherwise>
+						</c:choose>
+					</button>
+				</c:otherwise>
+			</c:choose>
 		</c:if>
 
-
 		<div id="footer"></div>
 	</lams:Page>
 </body>
Index: lams_tool_sbmt/web/monitoring/parts/activity.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re34c7b767eb34caebbfa0c9bdfb50d771d3b9d95
--- lams_tool_sbmt/web/monitoring/parts/activity.jsp	(.../activity.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_sbmt/web/monitoring/parts/activity.jsp	(.../activity.jsp)	(revision e34c7b767eb34caebbfa0c9bdfb50d771d3b9d95)
@@ -13,7 +13,7 @@
 			<fmt:message key="label.authoring.basic.title" />
 		</td>
 		<td>
-			<c:out value="${authoring.title}" escapeXml="true" />
+			<c:out value="${content.title}" escapeXml="true" />
 		</td>
 	</tr>
 
@@ -22,7 +22,7 @@
 			<fmt:message key="label.authoring.basic.instruction" />
 		</td>
 		<td>
-			<c:out value="${authoring.instruction}" escapeXml="false" />
+			<c:out value="${content.instruction}" escapeXml="false" />
 		</td>
 	</tr>
 </table>
Index: lams_tool_sbmt/web/monitoring/parts/advanceoptions.jsp
===================================================================
diff -u
--- lams_tool_sbmt/web/monitoring/parts/advanceoptions.jsp	(revision 0)
+++ lams_tool_sbmt/web/monitoring/parts/advanceoptions.jsp	(revision e34c7b767eb34caebbfa0c9bdfb50d771d3b9d95)
@@ -0,0 +1,138 @@
+<%@include file="/common/taglibs.jsp"%>
+<c:set var="adTitle"><fmt:message key="monitor.summary.th.advancedSettings" /></c:set>
+<lams:AdvancedAccordian title="${adTitle}">
+             
+<table class="table table-striped table-condensed">
+	<tr>
+		<td>
+			<fmt:message key="label.use.select.leader.tool.output" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${content.useSelectLeaderToolOuput}">
+					<fmt:message key="label.on" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>
+		
+	<tr>
+		<td>
+			<fmt:message key="label.authoring.advance.lock.on.finished" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${content.lockOnFinished}">
+					<fmt:message key="label.on" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>
+		
+	<tr>
+		<td>
+			<fmt:message key="label.enable.min.limit" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${content.minLimitUploadNumber != null}">
+					<fmt:message key="label.on" />, ${content.minLimitUploadNumber}
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>
+	
+	<tr>
+		<td>
+			<fmt:message key="label.limit.number.upload" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${content.limitUpload}">
+					<fmt:message key="label.on" />, ${content.limitUploadNumber}
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>
+	
+	<tr>
+		<td>
+			<fmt:message key="label.authoring.advanced.notify.mark.release" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${content.notifyLearnersOnMarkRelease}">
+					<fmt:message key="label.on" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>
+	
+	<tr>
+		<td>
+			<fmt:message key="label.authoring.advanced.notify.onfilesubmit" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${content.notifyTeachersOnFileSubmit}">
+					<fmt:message key="label.on" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>
+	
+	<tr>
+		<td>
+			<fmt:message key="monitor.summary.td.addNotebook" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${content.reflectOnActivity}">
+					<fmt:message key="label.on" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>
+	
+	<c:choose>
+		<c:when test="${content.reflectOnActivity}">
+			<tr>
+				<td>
+					<fmt:message key="monitor.summary.td.notebookInstructions" />
+				</td>
+				<td>
+					<lams:out value="${content.reflectInstructions}" escapeHtml="true"/>	
+				</td>
+			</tr>
+	</c:when>
+	</c:choose>
+</table>
+</lams:AdvancedAccordian>	
Index: lams_tool_sbmt/web/monitoring/parts/summary.jsp
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -re34c7b767eb34caebbfa0c9bdfb50d771d3b9d95
--- lams_tool_sbmt/web/monitoring/parts/summary.jsp	(.../summary.jsp)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_tool_sbmt/web/monitoring/parts/summary.jsp	(.../summary.jsp)	(revision e34c7b767eb34caebbfa0c9bdfb50d771d3b9d95)
@@ -1,13 +1,7 @@
 <%@include file="/common/taglibs.jsp"%>
+<c:set var="tool"><lams:WebAppURL /></c:set>
+<c:set var="lams"><lams:LAMSURL /></c:set>
 
-<c:set var="tool">
-	<lams:WebAppURL />
-</c:set>
-
-<c:set var="lams">
-	<lams:LAMSURL />
-</c:set>
-
 <style>
 	.group-mark-release-label {
 		margin-top: 8px;
@@ -32,7 +26,6 @@
 </script>
 <script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 <script type="text/javascript" src="${lams}/includes/javascript/portrait.js" ></script>
-
 <script type="text/javascript">
 	$(document).ready(function(){
 	    
@@ -109,7 +102,6 @@
             })
 		});
   	});
-
   	
   	function launchPopup(url, title) {
 		var wd = null;
@@ -132,7 +124,6 @@
 				"mark");
 	}
 
-
 	function releaseMarks(sessionId) {
 		$("#messageArea_Busy").show();
 		
@@ -149,15 +140,14 @@
 			}
 		});
 	}
-
 </script>
 
 <div class="panel">
 	<h4>
-	    <c:out value="${authoring.title}" escapeXml="true"/>
+	    <c:out value="${content.title}" escapeXml="true"/>
 	</h4>
 	<div class="instructions voffset5">
-	    <c:out value="${authoring.instruction}" escapeXml="false"/>
+	    <c:out value="${content.instruction}" escapeXml="false"/>
 	</div>
 	
 	<c:if test="${empty sessions}">
@@ -228,126 +218,6 @@
 		
 </c:forEach>
 
+<%@ include file="advanceoptions.jsp"%>	
 
-<c:set var="adTitle"><fmt:message key="monitor.summary.th.advancedSettings" /></c:set>
-<lams:AdvancedAccordian title="${adTitle}">
-             
-<table class="table table-striped table-condensed">
-	<tr>
-		<td>
-			<fmt:message key="label.use.select.leader.tool.output" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${authoring.useSelectLeaderToolOuput}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-		
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.lock.on.finished" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${authoring.lockOnFinished}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-		
-	<tr>
-		<td>
-			<fmt:message key="label.limit.number.upload" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${authoring.limitUpload}">
-					<fmt:message key="label.on" />, ${authoring.limitUploadNumber}
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advanced.notify.mark.release" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${authoring.notifyLearnersOnMarkRelease}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advanced.notify.onfilesubmit" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${authoring.notifyTeachersOnFileSubmit}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="monitor.summary.td.addNotebook" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${authoring.reflectOnActivity}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<c:choose>
-		<c:when test="${authoring.reflectOnActivity}">
-			<tr>
-				<td>
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</td>
-				<td>
-					<lams:out value="${authoring.reflectInstructions}" escapeHtml="true"/>	
-				</td>
-			</tr>
-	</c:when>
-	</c:choose>
-</table>
-</lams:AdvancedAccordian>		
-
 <%@include file="daterestriction.jsp"%>