Index: lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -46,9 +46,12 @@
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
 		
 		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
+		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
@@ -57,19 +60,40 @@
 			'minLength' : 2,
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
-				var index = ui.content.length;
+				var index = ui.content.length - 1,
+					// if result is empty, term and outcome add enabled come as objects (label, value)
+					// if there are results, they come as simple values
+					outcomeAddEnabled = ui.content[index] instanceof Object ? ui.content[index].label : ui.content[index],
+					// convert to boolean
+					outcomeAddEnabled = outcomeAddEnabled == 'true',
+					term = ui.content[index - 1] instanceof Object ? ui.content[index - 1].label : ui.content[index - 1],
+					sameNameFound = false;
+				index--;
+				ui.content.splice(index, 2);
 				while(index--) {
+					var label = ui.content[index].label;
+					if (label.split('(')[0].trim() == term) {
+						// do not offer to create an output which perfectly matches an existing one
+						sameNameFound = true;
+					}
 					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
 						ui.content.splice(index, 1);
 					}
 				}
+				if (outcomeAddEnabled && !sameNameFound) {
+					ui.content.push({
+						'label' : term + ' ' + outcomeCreateNewLabel
+					});
+				}
 			},
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
 					'data': $.extend({
-						'outcomeId' : ui.item.value
+						'outcomeId' : ui.item.value,
+						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
+						'name'		: ui.item.value ? null : ui.item.label.replace(outcomeCreateNewLabel, '')
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
 					'cache' : false,
@@ -109,10 +133,12 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
 												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
 						outcomeButton.click(function(){
-							removeOutcomeMapping(this);
+							if (confirm(outcomeMappingRemoveConfirm)) {
+								removeOutcomeMapping(this);
+							}
 						});
 					});
 				}
Index: lams_central/build.xml
===================================================================
diff -u -rb67e582d11a128d2b381a02bb86363c770322d40 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_central/build.xml	(.../build.xml)	(revision b67e582d11a128d2b381a02bb86363c770322d40)
+++ lams_central/build.xml	(.../build.xml)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -34,6 +34,32 @@
 		</copy>
 	</target>
 	
+	<target name="_copy-jsp" depends="sass.compile, _js-minify">
+			<!-- Internal target: Copies JSP files. -->
+			<echo>${ant.project.name}: Copying JSP files</echo>
+
+			<!-- No processing is needed for most of the files so copy files straight to assembly dir to create WAR -->
+			<echo>Copying web resources</echo>
+		 	<copy todir="${basedir}/build/war">
+				<fileset dir="${conf.web.dir}">
+					<exclude name="**/*.scss"/>
+					<exclude name="authoring/template/tbl/tbl.jsp"/>
+				</fileset>
+		 	</copy>
+		
+			<!-- Now handle the tweaks to the authoring template files -->
+			<echo>Configuring template files to generate desired activities</echo>
+		 	<copy todir="${basedir}/build/war/authoring/template/tbl/" overwrite="true" verbose="true">
+				<fileset dir="${conf.web.dir}/authoring/template/tbl/">
+					<include name="tbl.jsp" />
+				</fileset>
+				<filterset>
+					<filter token="template_tbl_show_introduction" value="${template.tbl.show.introduction}" />
+					<filter token="template_tbl_show_preview" value="${template.tbl.show.preview}" />
+					<filter token="template_tbl_show_notebook" value="${template.tbl.show.notebook}" />
+				</filterset>
+		 	</copy>
+	</target>
 	
 	<target name="_build-war" depends="_build-manifest, _copy-war-resources, _copy-jsp">
 		<!-- Internal target: Builds WAR without archivisation -->
Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java
===================================================================
diff -u -r679782834f99e7e2699f9f34ae8bf1c75abc7bb5 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java	(.../DisplayGroupController.java)	(revision 679782834f99e7e2699f9f34ae8bf1c75abc7bb5)
+++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java	(.../DisplayGroupController.java)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -219,6 +219,8 @@
 		    "fa fa-fw fa-bolt" + (disabled ? " disabled" : ""), "index.kumalive.tooltip"));
 	}
 
+	Collections.reverse(links); // UI no longer reversing the order using pull-right
+	
 	orgBean.setLinks(links);
 	orgBean.setMoreLinks(moreLinks);
 
Index: lams_central/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_central/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_central/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -46,9 +46,12 @@
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
 		
 		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
+		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
@@ -57,19 +60,40 @@
 			'minLength' : 2,
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
-				var index = ui.content.length;
+				var index = ui.content.length - 1,
+					// if result is empty, term and outcome add enabled come as objects (label, value)
+					// if there are results, they come as simple values
+					outcomeAddEnabled = ui.content[index] instanceof Object ? ui.content[index].label : ui.content[index],
+					// convert to boolean
+					outcomeAddEnabled = outcomeAddEnabled == 'true',
+					term = ui.content[index - 1] instanceof Object ? ui.content[index - 1].label : ui.content[index - 1],
+					sameNameFound = false;
+				index--;
+				ui.content.splice(index, 2);
 				while(index--) {
+					var label = ui.content[index].label;
+					if (label.split('(')[0].trim() == term) {
+						// do not offer to create an output which perfectly matches an existing one
+						sameNameFound = true;
+					}
 					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
 						ui.content.splice(index, 1);
 					}
 				}
+				if (outcomeAddEnabled && !sameNameFound) {
+					ui.content.push({
+						'label' : term + ' ' + outcomeCreateNewLabel
+					});
+				}
 			},
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
 					'data': $.extend({
-						'outcomeId' : ui.item.value
+						'outcomeId' : ui.item.value,
+						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
+						'name'		: ui.item.value ? null : ui.item.label.replace(outcomeCreateNewLabel, '')
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
 					'cache' : false,
@@ -109,10 +133,12 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
 												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
 						outcomeButton.click(function(){
-							removeOutcomeMapping(this);
+							if (confirm(outcomeMappingRemoveConfirm)) {
+								removeOutcomeMapping(this);
+							}
 						});
 					});
 				}
Index: lams_central/web/addLesson.jsp
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_central/web/addLesson.jsp	(.../addLesson.jsp)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_central/web/addLesson.jsp	(.../addLesson.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -315,7 +315,8 @@
 		<fmt:message key="authoring.fla.page.menu.preview" />
 	</button>
 	<div class="pull-right">
-		<button id="addButton" class="btn btn-primary" href="#" onClick="javascript:addLesson()">
+		<button id="addButton" class="btn btn-primary" href="#" onClick="javascript:addLesson()"
+				data-loading-text="<i class='fa fa-circle-o-notch fa-spin'></i><span> <fmt:message key="button.add.now" /></span>">
 			<i class="fa fa-plus"></i> 
 			<fmt:message key="button.add.now" />
 		</button>
Index: lams_central/web/authoring/authoring.jsp
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -736,7 +736,7 @@
 				<td>
 					 <input class="propertiesContentFieldGroupCountEnable" type="radio"
 					 		name="propertiesContentFieldGroupDivide">
-					 <input class="propertiesContentFieldGroupCount spinner" type="text">
+					 <input class="propertiesContentFieldGroupCount spinner" type="number">
 				</td>
 			</tr>
 			<tr>
@@ -746,7 +746,7 @@
 				<td>
 					<input class="propertiesContentFieldLearnerCountEnable" type="radio"
 					 		name="propertiesContentFieldGroupDivide">
-					 <input class="propertiesContentFieldLearnerCount spinner" type="text">
+					 <input class="propertiesContentFieldLearnerCount spinner" type="number">
 				</td>
 			</tr>
 			<tr>
@@ -818,15 +818,15 @@
 					<fmt:message key="authoring.fla.page.prop.gate.delay" />
 				</td>
 				<td>
-					<input class="propertiesContentFieldOffsetDay spinner" type="text"> 
+					<input class="propertiesContentFieldOffsetDay spinner" type="number"> 
 					<fmt:message key="authoring.fla.page.prop.days" />
 				</td>
 				<td>
-					<input class="propertiesContentFieldOffsetHour spinner" type="text"> 
+					<input class="propertiesContentFieldOffsetHour spinner" type="number"> 
 					<fmt:message key="authoring.fla.page.prop.hours" />
 				</td>
 				<td>
-					<input class="propertiesContentFieldOffsetMinute spinner" type="text"> 
+					<input class="propertiesContentFieldOffsetMinute spinner" type="number"> 
 					<fmt:message key="authoring.fla.page.prop.minutes" />
 				</td>
 			</tr>
@@ -911,15 +911,15 @@
 					<fmt:message key="authoring.fla.page.prop.branching.sequences.min" />
 				</td>
 				<td>
-					<input class="propertiesContentFieldOptionalSequenceMin spinner" type="text">
+					<input class="propertiesContentFieldOptionalSequenceMin spinner" type="number">
 				</td>
 			</tr>
 			<tr>
 				<td>
 					<fmt:message key="authoring.fla.page.prop.branching.sequences.max" />
 				</td>
 				<td>
-					<input class="propertiesContentFieldOptionalSequenceMax spinner" type="text">
+					<input class="propertiesContentFieldOptionalSequenceMax spinner" type="number">
 				</td>
 			</tr>
 		</table>
@@ -963,15 +963,15 @@
 					<fmt:message key="authoring.fla.page.prop.optional.activities.min" />
 				</td>
 				<td>
-					<input class="propertiesContentFieldOptionalActivityMin spinner" type="text">
+					<input class="propertiesContentFieldOptionalActivityMin spinner" type="number">
 				</td>
 			</tr>
 			<tr>
 				<td>
 					<fmt:message key="authoring.fla.page.prop.optional.activities.max" />
 				</td>
 				<td>
-					<input class="propertiesContentFieldOptionalActivityMax spinner" type="text">
+					<input class="propertiesContentFieldOptionalActivityMax spinner" type="number">
 				</td>
 			</tr>
 		</table>
@@ -1060,10 +1060,10 @@
 		 	<option value="range"><fmt:message key="authoring.fla.page.dialog.cond.range" /></option>
 		 </select>
 		 <div id="rangeAddDiv" class="outputSelectDependent">
-			 <input id="singleRangeSpinner" class="outputSelectDependent spinner"/>
+			 <input id="singleRangeSpinner" class="outputSelectDependent spinner" type="number" />
 			 <div id="multiRangeDiv" class="outputSelectDependent">
-			 	<fmt:message key="authoring.fla.page.dialog.cond.range.from" /> <input id="multiRangeFromSpinner" class="spinner" />
-			 	<fmt:message key="authoring.fla.page.dialog.cond.range.to" /> <input id="multiRangeToSpinner" class="spinner" />
+			 	<fmt:message key="authoring.fla.page.dialog.cond.range.from" /> <input id="multiRangeFromSpinner" class="spinner" type="number" />
+			 	<fmt:message key="authoring.fla.page.dialog.cond.range.to" /> <input id="multiRangeToSpinner" class="spinner" type="number" />
 			 </div>
 			 <button id="rangeAddButton" class="btn btn-default">
 			 	<i class="fa fa-plus"></i>
Index: lams_central/web/authoring/template/tool/assessmcq.jsp
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_central/web/authoring/template/tool/assessmcq.jsp	(.../assessmcq.jsp)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_central/web/authoring/template/tool/assessmcq.jsp	(.../assessmcq.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -1,26 +1,38 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 <%@ page import="org.lamsfoundation.lams.authoring.template.web.LdTemplateController"%>
 <c:set var="maxOptionCount" value="<%=LdTemplateController.MAX_OPTION_COUNT%>"/>
 
 <c:set var="required">${questionNumber eq 1 ? "class=\"input required\"" : "class=\"input\""}</c:set>
 
-<%-- Generic MCQ question for assessment. Expects an input of questionNumber, contentFolderID, and creates a text field field question${questionNumber} and three options --%>
+<%-- Generic MCQ question for assessment. Expects an input of questionNumber, contentFolderID, and creates a text field field question${questionNumber} and three options.
+         Question, and hence question.title and question.text are optional and are only populated if QTI is used to start the questions. ${containingDivName} is set if this is being called from 
+         a page with multiple sets of assessments, like the Application Exercises for TBL. --%>
 
+<%-- The title needs to look like an ordinary panel title, but be editable via the X-editable javascript. But that won't be returned to the server in the form data, so copy what appears in the displayed span to a hidden input field.  --%>
+<c:choose>
+<c:when test="${not empty question.title}"><c:set var="questionTitle">${question.title}</c:set></c:when>
+<c:otherwise><c:set var="questionTitle"><fmt:message key="authoring.label.question.num"><fmt:param value="${questionNumber}"/></fmt:message></c:set></c:otherwise>
+</c:choose>
+<c:set var="questionTitleDisplay">${containingDivName}assessment${questionNumber}titleDisplay</c:set>
+<c:set var="questionTitleField">${containingDivName}assessment${questionNumber}title</c:set>
+
 <div class="card card-plain">
 	<div class="card-header">
 		<div class="card-title">		
 		${questionNumber eq 1 ? "<label class=\"required\">" : ""}
-			<fmt:message key="authoring.label.application.exercise.num"><fmt:param value="${questionNumber}"/></fmt:message>
+			<span class="hoverEdit" name="${questionTitleDisplay}" id="${questionTitleDisplay}" ><c:out value="${questionTitle}" /></span><span>&nbsp;</span><i class='fa fa-sm fa-pencil'></i>
 		${questionNumber eq 1 ? "</label>" : ""}
+			<input name="${questionTitleField}" id="${questionTitleField}" type="hidden" value="${questionTitle}"/>
 		</div>
 	</div>
 
 	<div class="card-body">	
 
-	<input type="hidden" name="assessment${questionNumber}type" id="assessment${questionNumber}type" value="mcq"/>
-	<lams:CKEditor id="assessment${questionNumber}" value="" contentFolderID="${contentFolderID}" height="100"></lams:CKEditor>
+	<input type="hidden" name="${containingDivName}assessment${questionNumber}type" id="${containingDivName}assessment${questionNumber}type" value="mcq"/>
+	<lams:CKEditor id="${containingDivName}assessment${questionNumber}" value="${question.text}" contentFolderID="${contentFolderID}" height="100"></lams:CKEditor>
 	
 	<table class="table table-sm table-no-border">
 	<tr><td></td><td></td>
@@ -36,31 +48,64 @@
 	</tr>
 	</table>
 	
-	<div id="divassmcq${questionNumber}options">
-	<input type="hidden" name="assmcq${questionNumber}numOptions" id="assmcq${questionNumber}numOptions" value="4"/>
-	<div id="divassmcq${questionNumber}opt1">
-	<c:set scope="request" var="optionText"></c:set>
+	<div id="${containingDivName}divassmcq${questionNumber}options">
+	<c:choose>
+
+	<c:when test="${not empty question.answers}">
+	<c:set var="numAnswers">${fn:length(question.answers)}</c:set>
+	<input type="hidden" name="${containingDivName}assmcq${questionNumber}numOptions" id="${containingDivName}assmcq${questionNumber}numOptions" value="${numAnswers}"/>
+	<c:set scope="request" var="optionCount">${numAnswers}</c:set>
+	<c:forEach items="${question.answers}" var="answer" varStatus="loopStatus">
+		<c:set scope="request" var="optionText">${answer.text}</c:set>
+		<c:set scope="request" var="optionNumber">${loopStatus.count}</c:set>
+		<c:set scope="request" var="optionGrade">${answer.score}</c:set>
+		<div id="${containingDivName}divassmcq${questionNumber}opt${optionNumber}">
+		<%@ include file="assessoption.jsp" %>
+		</div>
+	</c:forEach>
+	</c:when>
+
+	<c:otherwise>
+	<input type="hidden" name="${containingDivName}assmcq${questionNumber}numOptions" id="${containingDivName}assmcq${questionNumber}numOptions" value="4"/>
 	<c:set scope="request" var="optionCount">4</c:set>
+	<c:set scope="request" var="optionText"></c:set>
+	<div id="${containingDivName}divassmcq${questionNumber}opt1">
 	<c:set scope="request" var="optionNumber">1</c:set>
 	<%@ include file="assessoption.jsp" %>
 	</div>
-	<div id="divassmcq${questionNumber}opt2">
+	<div id="${containingDivName}divassmcq${questionNumber}opt2">
 	<c:set scope="request" var="optionNumber">2</c:set>
 	<%@ include file="assessoption.jsp" %>
 	</div>
-	<div id="divassmcq${questionNumber}opt3">
+	<div id="${containingDivName}divassmcq${questionNumber}opt3">
 	<c:set scope="request" var="optionNumber">3</c:set>
 	<%@ include file="assessoption.jsp" %>
 	</div>
-	<div id="divassmcq${questionNumber}opt4">
+	<div id="${containingDivName}divassmcq${questionNumber}opt4">
 	<c:set scope="request" var="optionNumber">4</c:set>
 	<%@ include file="assessoption.jsp" %>
 	</div>
+	</c:otherwise>
+	
+	</c:choose>
 	</div>
-
-	<div id="createAssessmentOptionButton${questionNumber}" class="pull-right"><a href="#" onclick="javascript:createAssessmentOption(${questionNumber},${maxOptionCount});" class="btn btn-default btn-sm"><fmt:message key="authoring.create.option"/></a></div>
 	
+	<div id="${containingDivName}createAssessmentOptionButton${questionNumber}" class="pull-right"><a href="#" onclick="javascript:createAssessmentOption(${questionNumber},${maxOptionCount}, '${containingDivName}');" class="btn btn-default btn-sm"><fmt:message key="authoring.create.option"/></a></div>
+	
 	</div>
 </div>
-	
+
+<script type="text/javascript">
+   $('#${questionTitleDisplay}').editable({
+   	mode: 'inline',
+       type: 'text',
+       validate: validateXEditable,
+       success: function(response, newValue) {
+       	var trimmedValue = newValue.trim();
+       	$('#${questionTitleDisplay}').val(trimmedValue);
+       	$('#${questionTitleField}').val(trimmedValue);
+       }
+   }).on('shown', onShownForXEditable)
+	  .on('hidden', onHiddenForXEditable);
+</script>
 	
\ No newline at end of file
Index: lams_central/web/authoring/template/tool/assessment.jsp
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_central/web/authoring/template/tool/assessment.jsp	(.../assessment.jsp)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_central/web/authoring/template/tool/assessment.jsp	(.../assessment.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -1,21 +1,46 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%-- Generic assessment tool page. Expects an input of questionNumber & contentFolderID, and creates a field named assessment${questionNumber} suitable for a essay entry --%>
+<%-- Generic assessment tool page. Expects an input of questionNumber & contentFolderID, and creates a field named assessment${questionNumber} suitable for a essay entry.
+  Question, and hence question.title and question.text are optional and are only populated if QTI is used to start the questions. ${containingDivName} is set if this is being called from 
+         a page with multiple sets of assessments, like the Application Exercises for TBL. --%>
 
+<%-- The title needs to look like an ordinary panel title, but be editable via the X-editable javascript. But that won't be returned to the server in the form data, so copy what appears in the displayed span to a hidden input field.  --%>
+<c:choose>
+<c:when test="${not empty question.title}"><c:set var="questionTitle">${question.title}</c:set></c:when>
+<c:otherwise><c:set var="questionTitle"><fmt:message key="authoring.label.question.num"><fmt:param value="${questionNumber}"/></fmt:message></c:set></c:otherwise>
+</c:choose>
+<c:set var="questionTitleDisplay">${containingDivName}assessment${questionNumber}titleDisplay</c:set>
+<c:set var="questionTitleField">${containingDivName}assessment${questionNumber}title</c:set>
+
 <div class="card card-plain">
 	<div class="card-header">
 		<div class="card-title">		
 		${questionNumber eq 1 ? "<label class=\"required\">" : ""}
-			<fmt:message key="authoring.label.application.exercise.num"><fmt:param value="${questionNumber}"/></fmt:message>
+			<span class="hoverEdit" name="${questionTitleDisplay}" id="${questionTitleDisplay}" ><c:out value="${questionTitle}" /></span><span>&nbsp;</span><i class='fa fa-sm fa-pencil'></i>
 		${questionNumber eq 1 ? "</label>" : ""}
+			<input name="${questionTitleField}" id="${questionTitleField}" type="hidden" value="${questionTitle}"/>
 		</div>
 	</div>
 
 	<div class="card-body">	
 	
-	<input type="hidden" name="assessment${questionNumber}type" id="assessment${questionNumber}type" value="essay"/>
-	<lams:CKEditor id="assessment${questionNumber}" value="" contentFolderID="${contentFolderID}" height="100"></lams:CKEditor>
+	<input type="hidden" name="${containingDivName}assessment${questionNumber}type" id="${containingDivName}assessment${questionNumber}type" value="essay"/>
+	<lams:CKEditor id="${containingDivName}assessment${questionNumber}" value="${question.text}" contentFolderID="${contentFolderID}" height="100"></lams:CKEditor>
 	
 	</div>
-</div>
\ No newline at end of file
+</div>
+
+<script type="text/javascript">
+   $('#${questionTitleDisplay}').editable({
+   		mode: 'inline',
+       	type: 'text',
+       	validate: validateXEditable,
+       	success: function(response, newValue) {
+	       	var trimmedValue = newValue.trim();
+	       	$('#${questionTitleDisplay}').val(trimmedValue);
+	       	$('#${questionTitleField}').val(trimmedValue);
+        }
+   }).on('shown', onShownForXEditable)
+	  .on('hidden', onHiddenForXEditable);
+</script>
\ No newline at end of file
Index: lams_central/web/authoring/template/tool/assessoption.jsp
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_central/web/authoring/template/tool/assessoption.jsp	(.../assessoption.jsp)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_central/web/authoring/template/tool/assessoption.jsp	(.../assessoption.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -1,9 +1,9 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%-- Option page for the Assessment Multiple Choice question. Creates the output assmcq${questionNumber}option${optionNumber} --%>
+<%-- Option page for the Assessment Multiple Choice question. Creates the output ${containingDivName}assmcq${questionNumber}option${optionNumber} --%>
 
-		<c:set scope="request" var="qnon">assmcq${questionNumber}option${optionNumber}</c:set>
+		<c:set scope="request" var="qnon">${containingDivName}assmcq${questionNumber}option${optionNumber}</c:set>
 
 		<table class="table table-sm table-no-border">
 		<tr>
@@ -22,15 +22,15 @@
 			<!-- Don't display up icon if first line -->
 			<c:if test="${optionNumber > 1}">
  				<lams:Arrow state="up" id="${qnon}UpButton" title="<fmt:message key='hint.option.up'/>" 
- 					onclick="javascript:swapOptions(${questionNumber}, ${optionNumber}, ${optionNumber-1}, 'divassmcq${questionNumber}options', true)"/>
+ 					onclick="javascript:swapOptions(${questionNumber}, ${optionNumber}, ${optionNumber-1}, '${containingDivName}divassmcq${questionNumber}options', '${containingDivName}')"/>
  			</c:if>
 			<!-- Don't display down icon if last line -->
 			<c:set var="display" value="${optionCount > optionNumber ? '' : 'none'}"/>
 			<lams:Arrow state="down" id="${qnon}DownButton" title="<fmt:message key='hint.option.down'/>" 
-				onclick="javascript:swapOptions(${questionNumber}, ${optionNumber}, ${optionNumber+1}, 'divassmcq${questionNumber}options', true)" display="${display}"/>
+				onclick="javascript:swapOptions(${questionNumber}, ${optionNumber}, ${optionNumber+1}, '${containingDivName}divassmcq${questionNumber}options', '${containingDivName}')" display="${display}"/>
  		</td>
 		<td width="20px" align="center">
-			<i class="fa fa-times" id="${qnon}DeleteButton" title="<fmt:message key='hint.option.delete'/>" onclick="removeOption(${questionNumber}, ${optionNumber}, 'divassmcq${questionNumber}options', true)">
+			<i class="fa fa-times" id="${qnon}DeleteButton" title="<fmt:message key='hint.option.delete'/>" onclick="removeOption(${questionNumber}, ${optionNumber}, '${containingDivName}divassmcq${questionNumber}options', '${containingDivName}')">
 		</td>
 		</tr>
 		</table>
\ No newline at end of file
Index: lams_central/web/authoring/template/tool/mcoption.jsp
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_central/web/authoring/template/tool/mcoption.jsp	(.../mcoption.jsp)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_central/web/authoring/template/tool/mcoption.jsp	(.../mcoption.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -15,14 +15,7 @@
 			<lams:CKEditor id="${qnon}" value="${optionText}" contentFolderID="${contentFolderID}" height="100"></lams:CKEditor> 
 		</td>
 		<td width="60px">
-			<c:choose>
-			<c:when test="${option.correct}">
-				<input type="radio" name="question${questionNumber}correct" value="${optionNumber}" id="${qnon}correct"/ checked> 
-			</c:when>
-			<c:otherwise>
-				<input type="radio" name="question${questionNumber}correct" value="${optionNumber}" id="${qnon}correct"/ > 
-			</c:otherwise>
-			</c:choose>
+				<input type="radio" name="question${questionNumber}correct" value="${optionNumber}" id="${qnon}correct" ${optionCorrect?"checked":""}/> 
 		</td>
 		<td class="arrows" width="40px">
 			<!-- Don't display up icon if first line -->
Index: lams_central/web/authoring/template/tool/mcquestion.jsp
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_central/web/authoring/template/tool/mcquestion.jsp	(.../mcquestion.jsp)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_central/web/authoring/template/tool/mcquestion.jsp	(.../mcquestion.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -1,18 +1,32 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 <%@ page import="org.lamsfoundation.lams.authoring.template.web.LdTemplateController"%>
 <c:set var="maxOptionCount" value="<%=LdTemplateController.MAX_OPTION_COUNT%>"/>
-<%-- Generic Q&A question page. Expects an input of questionNumber, contentFolderID, and creates a text field field question${questionNumber} and three options --%>
+<%-- Generic Q&A question page. Expects an input of questionNumber, contentFolderID, and creates a text field field question${questionNumber} and three options / as many as are need for a QTI import --%>
 
+<%-- The title needs to look like an ordinary panel title, but be editable via the X-editable javascript. But that won't be returned to the server in the form data, so copy what appears in the displayed span to a hidden input field.  --%>
+<c:choose>
+<c:when test="${not empty question.title}"><c:set var="questionTitle">${question.title}</c:set></c:when>
+<c:otherwise><c:set var="questionTitle"><fmt:message key="authoring.label.question.num"><fmt:param value="${questionNumber}"/></fmt:message></c:set></c:otherwise>
+</c:choose>
+<c:set var="questionTitleDisplay">question${questionNumber}titleDisplay</c:set>
+<c:set var="questionTitleField">question${questionNumber}title</c:set>
+
 <div class="card card-plain">
 	<div class="card-header">
-		<div class="card-title"><label class="required"><fmt:message key="authoring.label.question.num"><fmt:param value="${questionNumber}"/></fmt:message></label></div>
+		<div class="card-title">
+		${questionNumber eq 1 ? "<label class=\"required\">" : ""}
+			<span class="hoverEdit" name="${questionTitleDisplay}" id="${questionTitleDisplay}" ><c:out value="${questionTitle}" /></span><span>&nbsp;</span><i class='fa fa-sm fa-pencil'></i>
+		${questionNumber eq 1 ? "</label>" : ""}
+			<input name="${questionTitleField}" id="${questionTitleField}" type="hidden" value="${questionTitle}"/>
+		</div>
 	</div>
 
 	<div class="card-body">	
 	
-		<lams:CKEditor id="question${questionNumber}" value="${option.text}" contentFolderID="${contentFolderID}" height="100"></lams:CKEditor>
+		<lams:CKEditor id="question${questionNumber}" value="${question.text}" contentFolderID="${contentFolderID}" height="100"></lams:CKEditor>
 		
 		<table class="table table-sm table-no-border">
 		<tr><td></td>
@@ -27,29 +41,63 @@
 		</td>
 		</tr>
 		</table>
-		
+	
 		<div id="divq${questionNumber}options">
-		<input type="hidden" name="numOptionsQuestion${questionNumber}" id="numOptionsQuestion${questionNumber}" value="4"/>
-		<div id="divq${questionNumber}opt1">
-		<c:set scope="request" var="optionText"></c:set>
-		<c:set scope="request" var="optionCount">4</c:set>
-		<c:set scope="request" var="optionNumber">1</c:set>
-		<%@ include file="mcoption.jsp" %>
+		<c:choose>	
+		<c:when test="${not empty question.answers}">
+			<c:set var="numAnswers">${fn:length(question.answers)}</c:set>
+			<input type="hidden" name="numOptionsQuestion${questionNumber}" id="numOptionsQuestion${questionNumber}" value="${numAnswers}"/>
+			<c:set scope="request" var="optionCount">${numAnswers}</c:set>
+			<c:forEach items="${question.answers}" var="answer" varStatus="loopStatus">
+				<c:set scope="request" var="optionText">${answer.text}</c:set>
+				<c:set scope="request" var="optionCorrect">${answer.score > 0}</c:set>
+				<c:set scope="request" var="optionNumber">${loopStatus.count}</c:set>
+				<div id="divq${questionNumber}opt${optionNumber}">
+					<%@ include file="mcoption.jsp" %>
+			</div>
+		</c:forEach>
+		</c:when>
+		
+		<c:otherwise>
+			<input type="hidden" name="numOptionsQuestion${questionNumber}" id="numOptionsQuestion${questionNumber}" value="4"/>
+			<div id="divq${questionNumber}opt1">
+			<c:set scope="request" var="optionText"></c:set>
+			<c:set scope="request" var="optionCount">4</c:set>
+			<c:set scope="request" var="optionNumber">1</c:set>
+			<%@ include file="mcoption.jsp" %>
+			</div>
+			<div id="divq${questionNumber}opt2">
+			<c:set scope="request" var="optionNumber">2</c:set>
+			<%@ include file="mcoption.jsp" %>
+			</div>
+			<div id="divq${questionNumber}opt3">
+			<c:set scope="request" var="optionNumber">3</c:set>
+			<%@ include file="mcoption.jsp" %>
+			</div>
+			<div id="divq${questionNumber}opt4">
+			<c:set scope="request" var="optionNumber">4</c:set>
+			<%@ include file="mcoption.jsp" %>
+			</div>
+		</c:otherwise>
+		
+		</c:choose>
 		</div>
-		<div id="divq${questionNumber}opt2">
-		<c:set scope="request" var="optionNumber">2</c:set>
-		<%@ include file="mcoption.jsp" %>
-		</div>
-		<div id="divq${questionNumber}opt3">
-		<c:set scope="request" var="optionNumber">3</c:set>
-		<%@ include file="mcoption.jsp" %>
-		</div>
-		<div id="divq${questionNumber}opt4">
-		<c:set scope="request" var="optionNumber">4</c:set>
-		<%@ include file="mcoption.jsp" %>
-		</div>
-		</div>
-
+		
 		<div id="createOptionButton${questionNumber}" class="pull-right"><a href="#" onclick="javascript:createOption(${questionNumber},${maxOptionCount});" class="btn btn-default btn-sm"><fmt:message key="authoring.create.option"/></a></div>
 	</div>		
-</div>
\ No newline at end of file
+</div>
+
+<script type="text/javascript">
+   $('#${questionTitleDisplay}').editable({
+   		mode: 'inline',
+      	type: 'text',
+       	validate: validateXEditable,
+       	success: function(response, newValue) {
+       		var trimmedValue = newValue.trim();
+       		$('#${questionTitleDisplay}').val(trimmedValue);
+       		$('#${questionTitleField}').val(trimmedValue);
+        }
+   }).on('shown', onShownForXEditable)
+	  .on('hidden', onHiddenForXEditable);
+
+</script>
\ No newline at end of file
Index: lams_central/web/css/_authoring_base.scss
===================================================================
diff -u -rd432ad1e56c019311c8ca428ba8e08907a56077c -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_central/web/css/_authoring_base.scss	(.../_authoring_base.scss)	(revision d432ad1e56c019311c8ca428ba8e08907a56077c)
+++ lams_central/web/css/_authoring_base.scss	(.../_authoring_base.scss)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -559,12 +559,19 @@
 #rootwizard table.table-condensed {
   margin-bottom: 0px; }
 
-#rootwizard .required:after {
-  content: "*";
-  font-style: normal;
-  font-weight: normal;
-  text-decoration: inherit;
-  margin-left: 5px; }
+#rootwizard {
+	.required:after {
+	  content: "*";
+	  font-style: normal;
+	  font-weight: normal;
+	  text-decoration: inherit;
+	  margin-left: 5px; 
+  }
+  
+	.panel-title .required {
+		font-weight: 500;
+	}
+}
 
 #rootwizard .container {
     margin-right: 4px;
@@ -600,3 +607,24 @@
 #rootwizard .progress-bar {
      background-color: $brand-primary;
 }
+
+#rootwizard {
+	div.space-top {
+		padding-top: 15px;
+	}
+	div.space-sides {
+		padding-left: 15px;
+		padding-right: 15px;
+	}
+	div.space-bottom {
+		padding-bottom: 15px;
+	}
+	// Allow panel titles to be edited - show pencil only when hovering
+	span.hoverEdit:hover +span+ i { 
+		visibility: visible;
+	}
+	span.hoverEdit +span+ i { 
+		visibility: hidden;
+	}
+}
+	
\ No newline at end of file
Index: lams_central/web/css/_learner_base.scss
===================================================================
diff -u -ra1716c658ce789163118c281e8952f83368ea57b -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_central/web/css/_learner_base.scss	(.../_learner_base.scss)	(revision a1716c658ce789163118c281e8952f83368ea57b)
+++ lams_central/web/css/_learner_base.scss	(.../_learner_base.scss)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -1218,4 +1218,16 @@
 
 #fullPageContentDiv:fullscreen #mainDiv {
   @include mainDivDefn;
-}
\ No newline at end of file
+}
+
+/* jqGrid text wrapping */
+.ui-jqgrid tr.jqgrow td, .ui-jqgrid tr.ui-subgrid td {
+	white-space:normal !important;
+   	height:auto;
+}
+/* jqGrid text wrapping, that has no blanks or other white-space (https://stackoverflow.com/a/6915486) */
+.ui-jqgrid tr.jqgrow td, .ui-jqgrid tr.ui-subgrid td {
+	word-wrap: break-word; /* IE 5.5+ and CSS3 */
+    overflow: hidden;
+    vertical-align: middle;
+} 
\ No newline at end of file
Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
diff -u -r4d710be17dc384e90d10a8a57c9fe2f7c77c88e2 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 4d710be17dc384e90d10a8a57c9fe2f7c77c88e2)
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -936,14 +936,6 @@
 		
 		layout.dialogs.push(layout.ldStoreDialog);
 
-		$('#ldStoreDialogImportPartFrame').load(function() {
-			var frame = $(this);
-			if (!frame.attr('src')){
-				return;
-			}
-		    frame.height(+frame.contents().find('svg').attr('height') + 40);
-		});
-		
 		// there should be no focus, just highlight
 		YAHOO.widget.TreeView.FOCUS_CLASS_NAME = null;
 		var tree = new YAHOO.widget.TreeView('ldStoreDialogTree');
@@ -2274,8 +2266,12 @@
 				} else {
 					GeneralLib.resizePaper();
 				}
+				
+				var parentFrame = window.parent.GeneralLib;
+				if (parentFrame) {
+					parentFrame.resizeImportPartFrame(+paper.attr('height'));
+				}
 
-
 				if (systemGate) {
 					// if system gate exists, it is Live Edit
 					layout.liveEdit = true;
@@ -2460,7 +2456,10 @@
 						             activity instanceof ActivityDefs.ParallelActivity ? 5 : 1,
 				iconPath = null,
 				isGrouped = activity.grouping ? true : false,
-				parentActivityID = activity.parentActivity ? activity.parentActivity.id : null;
+				parentActivityID = activity.parentActivity ? activity.parentActivity.id : null,
+				gateActivityCompletionBased = false,
+				activityTransitions = activity instanceof ActivityDefs.BranchingActivity ?
+						activity.end.transitions : activity.transitions;
 			
 			if (activity.toolID) {
 				activityTypeID = 1;
@@ -2510,7 +2509,13 @@
 			} else if (activity instanceof  ActivityDefs.GateActivity){
 				switch(activity.gateType) {
 					case 'sync'       : activityTypeID = 3; break;
-					case 'schedule'   : activityTypeID = 4; break;
+					case 'schedule'   : 
+						activityTypeID = 4; 
+						gateActivityCompletionBased = activity.gateActivityCompletionBased
+							//check the previous activity is available as well
+							&& (activityTransitions && activityTransitions.to && activityTransitions.to.length > 0);
+						break;
+						
 					case 'permission' : activityTypeID = 5; break;
 					case 'system' 	  : activityTypeID = 9; systemGate = activity; break;
 					case 'condition'  :
@@ -2642,7 +2647,7 @@
 				'defaultActivityUIID'    : activity.defaultActivityUIID,
 				'gateStartTimeOffset'	 : activity.gateType == 'schedule' ?
 											activity.offsetDay*24*60 + activity.offsetHour*60 + activity.offsetMinute : null,
-				'gateActivityCompletionBased' : activity.gateActivityCompletionBased,
+				'gateActivityCompletionBased' : gateActivityCompletionBased,
 				'gateActivityLevelID'    : activity instanceof ActivityDefs.GateActivity ? 1 : null,
 				'minOptions'			 : activity.minOptions || null,
 				'maxOptions'			 : activity.maxOptions || null,
@@ -2653,9 +2658,6 @@
 														null : activity.gradebookToolOutputDefinitionName,
 				'gradebookToolOutputWeight' : activity.gradebookToolOutputWeight
 			});
-	
-			var activityTransitions = activity instanceof ActivityDefs.BranchingActivity ?
-					activity.end.transitions : activity.transitions;
 			
 			if (activityTransitions) {
 				// iterate over transitions and create a list
@@ -2732,6 +2734,11 @@
 	},
 	
 	
+	resizeImportPartFrame : function(svgHeight) {
+		$('#ldStoreDialogImportPartFrame').height(svgHeight + 40);
+	},
+	
+	
 	/**
 	 * Sets new paper dimensions and moves some static elements.
 	 */
Index: lams_central/web/includes/javascript/dialog.js
===================================================================
diff -u -r4d710be17dc384e90d10a8a57c9fe2f7c77c88e2 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_central/web/includes/javascript/dialog.js	(.../dialog.js)	(revision 4d710be17dc384e90d10a8a57c9fe2f7c77c88e2)
+++ lams_central/web/includes/javascript/dialog.js	(.../dialog.js)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -286,6 +286,19 @@
     }
     //disable scrolling of the parent's content
     dialog.parent().addClass("modal-open");
+
+	// in case of monitor dialog reload its content. It's required as all monitor dialogs use the same ids for their HTML elements
+	var isMonitorDialog = dialog.data('isMonitorDialog');
+	if (isMonitorDialog) {
+		//hide iframe until it gets loaded
+		$('iframe', dialog).hide();
+		$('iframe', dialog).load(function() {
+			$('iframe', dialog).show();
+		});
+		
+		//reload iframe
+	    $('iframe', dialog)["0"].contentWindow.location.reload();
+	}   
 }
 
 /**
@@ -417,4 +430,4 @@
 			}
 		}
 	});
-}
\ No newline at end of file
+}
Index: lams_central/web/main.jsp
===================================================================
diff -u -rf6ec928138a1e687ccf2059e8b50f3afce8f3640 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_central/web/main.jsp	(.../main.jsp)	(revision f6ec928138a1e687ccf2059e8b50f3afce8f3640)
+++ lams_central/web/main.jsp	(.../main.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -95,9 +95,7 @@
 				<fmt:message key="index.kumalive" var="KUMALIVE_TITLE_VAR"/>
 				KUMALIVE_TITLE : '<c:out value="${KUMALIVE_TITLE_VAR}" />',
 				<fmt:message key="index.outcome.manage" var="OUTCOME_MANAGE_TITLE_VAR"/>
-				OUTCOME_MANAGE_TITLE : '<c:out value="${OUTCOME_MANAGE_TITLE_VAR}" />',
-				<fmt:message key="outcome.manage.title" var="OUTCOME_COURSE_MANAGE_TITLE_VAR"/>
-				OUTCOME_COURSE_MANAGE_TITLE : '<c:out value="${OUTCOME_COURSE_MANAGE_TITLE_VAR}" />'
+				OUTCOME_MANAGE_TITLE : '<c:out value="${OUTCOME_MANAGE_TITLE_VAR}" />'
 			},
 			activeOrgId = <c:choose><c:when test="${empty activeOrgId}">null</c:when><c:otherwise>${activeOrgId}</c:otherwise></c:choose>;
 
Index: lams_central/web/outcome/outcomeEdit.jsp
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_central/web/outcome/outcomeEdit.jsp	(.../outcomeEdit.jsp)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_central/web/outcome/outcomeEdit.jsp	(.../outcomeEdit.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -21,16 +21,14 @@
 		<c:if test="${saved}">
 			var outcomesFrame = $('#dialogOutcome iframe', window.parent.document);
 			if (outcomesFrame.length == 0) {
-				window.parent.document.location.href = 
-					'<lams:LAMSURL/>outcome/outcomeManage.do${empty param.organisationID ? "" : "?organisationID=param.organisationID"}';
+				window.parent.document.location.href = '<lams:LAMSURL/>outcome/outcomeManage.do';
 			} else {
 				outcomesFrame.attr('src', outcomesFrame.attr('src'));
 				$('#dialogOutcomeEdit', window.parent.document).remove();
 			}
 		</c:if>
 		
-		var organisationId = '${param.organisationID}',
-			LAMS_URL = '<lams:LAMSURL/>',
+		var LAMS_URL = '<lams:LAMSURL/>',
 			decoderDiv = $('<div />'),
 			LABELS = {
 				<fmt:message key="outcome.manage.add" var="ADD_OUTCOME_TITLE_VAR"/>
@@ -40,20 +38,14 @@
 				<fmt:message key="outcome.manage.remove.confirm" var="REMOVE_OUTCOME_CONFIRM_LABEL_VAR"/>
 				REMOVE_OUTCOME_CONFIRM_LABEL : decoderDiv.html('<c:out value="${REMOVE_OUTCOME_CONFIRM_LABEL_VAR}" />').text(),
 				<fmt:message key="scale.title" var="OUTCOME_MANAGE_SCALE_TITLE_VAR"/>
-				OUTCOME_SCALE_MANAGE_TITLE : '<c:out value="${OUTCOME_MANAGE_SCALE_TITLE_VAR}" />',
-				<fmt:message key="scale.manage.title" var="OUTCOME_SCALE_COURSE_MANAGE_TITLE_VAR"/>
-				OUTCOME_SCALE_COURSE_MANAGE_TITLE : '<c:out value="${OUTCOME_SCALE_COURSE_MANAGE_TITLE_VAR}" />'
+				OUTCOME_SCALE_MANAGE_TITLE : '<c:out value="${OUTCOME_MANAGE_SCALE_TITLE_VAR}" />'
 			};
 	</script>
 </lams:head>
 <body>
 
 <form:form action="outcomeSave.do" method="post" modelAttribute="outcomeForm">
-	<c:set var="formDisabled" value="${not empty outcomeForm.outcomeId and empty outcomeForm.organisationId and not canManageGlobal}" />
-
 	<form:hidden path="outcomeId" />
-	<form:hidden path="organisationId" />
-	<form:hidden path="contentFolderId" />
 	
 	<div class="container">
 		<div class="row vertical-center-row">
@@ -66,28 +58,17 @@
 						
 						<div class="form-group">
 							<label><fmt:message key="outcome.manage.add.name" />:
-								<form:input path="name" size="50" maxlength="255" cssClass="form-control" disabled="${formDisabled}" />
+								<form:input path="name" size="50" maxlength="255" cssClass="form-control" />
 							</label>
 						</div>
 						<div class="form-group">
 							<label><fmt:message key="outcome.manage.add.code" />:
-								<form:input path="code" size="50" maxlength="50" cssClass="form-control" disabled="${formDisabled}" />
+								<form:input path="code" size="50" maxlength="50" cssClass="form-control" />
 							</label>
 						</div>
 						<div class="form-group">
-							<fmt:message key="outcome.manage.scope" />:
-							<c:choose>
-								<c:when test="${empty outcomeForm.organisationId}">
-									<fmt:message key="outcome.manage.scope.global" />
-								</c:when>
-								<c:otherwise>
-									<fmt:message key="outcome.manage.scope.course" />
-								</c:otherwise>
-							</c:choose>
-						</div>
-						<div class="form-group">
 							<label><fmt:message key="outcome.manage.add.scale" />:
-								<form:select path="scaleId"  cssClass="form-control" disabled="${formDisabled}">
+								<form:select path="scaleId"  cssClass="form-control">
 									<c:forEach items="${scales}" var="scale">
 										<form:option value="${scale.scaleId}">
 											<c:out value="${scale.name}" /> (<c:out value="${scale.code}" />)
@@ -101,25 +82,15 @@
 						</div>
 						<div class="form-group">
 							<fmt:message key="outcome.manage.add.description" />:
-							<c:choose>
-								<c:when test="${formDisabled}">
-									<br />
-									<c:out value="${outcomeForm.description}" />
-								</c:when>
-								<c:otherwise>
-									 <lams:CKEditor id="description" value="${outcomeForm.description}" contentFolderID="${outcomeForm.contentFolderId}"></lams:CKEditor>
-								</c:otherwise>
-							</c:choose>
+							<lams:CKEditor id="description" value="${outcomeForm.description}" contentFolderID="${outcomeForm.contentFolderId}"></lams:CKEditor>
 						</div>
 					</div>
 				</div>
 			</div>
 		</div>
-		<c:if test="${not formDisabled}">
-			<button id="addButton" type="submit" class="btn btn-primary" onClick="javascript:submitOutcome()">
-				<fmt:message key="outcome.manage.add.save" />
-			</button>
-		</c:if>
+		<button id="addButton" type="submit" class="btn btn-primary" onClick="javascript:submitOutcome()">
+			<fmt:message key="outcome.manage.add.save" />
+		</button>
 	</div>
 </form:form>
 </body>
Index: lams_central/web/outcome/outcomeManage.jsp
===================================================================
diff -u -rd432ad1e56c019311c8ca428ba8e08907a56077c -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_central/web/outcome/outcomeManage.jsp	(.../outcomeManage.jsp)	(revision d432ad1e56c019311c8ca428ba8e08907a56077c)
+++ lams_central/web/outcome/outcomeManage.jsp	(.../outcomeManage.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -18,8 +18,7 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.cookie.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 	<script type="text/javascript">
-		var organisationId = '${param.organisationID}',
-			LAMS_URL = '<lams:LAMSURL/>',
+		var LAMS_URL = '<lams:LAMSURL/>',
 			
 			decoderDiv = $('<div />'),
 			LABELS = {
@@ -44,9 +43,6 @@
 			<div class="col-xs-3">
 				<fmt:message key='outcome.manage.add.code' />
 			</div>
-			<div class="col-xs-2">
-				<fmt:message key='outcome.manage.scope' />
-			</div>
 			<div class="col-xs-1">
 			</div>
 			<div class="col-xs-1">
@@ -60,57 +56,34 @@
 				<div class="col-xs-3">
 					<c:out value="${outcome.code}" />
 				</div>
-				<div class="col-xs-2">
-					<c:choose>
-						<c:when test="${empty outcome.organisation}">
-							<fmt:message key='outcome.manage.scope.global' />
-						</c:when>
-						<c:otherwise>
-							<fmt:message key='outcome.manage.scope.course' />
-						</c:otherwise>
-					</c:choose>
-				</div>
 				<div class="col-xs-1">
-					<c:choose>
-						<c:when test="${not empty outcome.organisation or canManageGlobal}">
-							<i class="manageButton fa fa-pencil" title="<fmt:message key='outcome.manage.edit' />"
-						   	   onClick="javascript:openEditOutcomeDialog(${outcome.outcomeId})" >
-							</i>
-						</c:when>
-						<c:otherwise>
-							<i class="manageButton fa fa-eye" title="<fmt:message key='outcome.manage.view' />"
-						   	   onClick="javascript:openEditOutcomeDialog(${outcome.outcomeId})" >
-							</i>
-						</c:otherwise>
-					</c:choose>
+					<i class="manageButton fa fa-pencil" title="<fmt:message key='outcome.manage.edit' />"
+				   	   onClick="javascript:openEditOutcomeDialog(${outcome.outcomeId})" >
+					</i>
 				</div>
 				<div class="col-xs-1">
-					<c:if test="${not empty outcome.organisation or canManageGlobal}">
-						<i class="manageButton fa fa-remove" title="<fmt:message key='outcome.manage.remove' />"
-					   	   onClick="javascript:removeOutcome(${outcome.outcomeId})" >
-						</i>
-					</c:if>
+					<i class="manageButton fa fa-remove" title="<fmt:message key='outcome.manage.remove' />"
+				   	   onClick="javascript:removeOutcome(${outcome.outcomeId})" >
+					</i>
 				</div>
 			</div>
 		</c:forEach>
-		<c:if test="${canManageGlobal}">
-			<c:if test="${not empty outcomes}">
-				<div id="exportButton" class="btn btn-default pull-left" onClick="javascript:exportOutcome()"
-					 data-loading-text="<i class='fa fa-circle-o-notch fa-spin'></i><span> <fmt:message key="outcome.export" /></span>">
-					<i class="fa fa-download"></i>
-					<span class="hidden-xs">
-						<fmt:message key="outcome.export" />
-					</span>
-				</div>
-			</c:if>
-			
-			<div id="importButton" class="btn btn-default pull-left" onClick="javascript:$('#importInput').click()">
-				<i class="fa fa-upload"></i> <fmt:message key="outcome.import" />
+		<c:if test="${not empty outcomes}">
+			<div id="exportButton" class="btn btn-default pull-left" onClick="javascript:exportOutcome()"
+				 data-loading-text="<i class='fa fa-circle-o-notch fa-spin'></i><span> <fmt:message key="outcome.export" /></span>">
+				<i class="fa fa-download"></i>
+				<span class="hidden-xs">
+					<fmt:message key="outcome.export" />
+				</span>
 			</div>
-			<form id="importForm" action="outcomeImport.do" method="post" enctype="multipart/form-data">
-				<input type="file" id="importInput" name="file"/>
-			</form>
 		</c:if>
+		
+		<div id="importButton" class="btn btn-default pull-left" onClick="javascript:$('#importInput').click()">
+			<i class="fa fa-upload"></i> <fmt:message key="outcome.import" />
+		</div>
+		<form id="importForm" action="outcomeImport.do" method="post" enctype="multipart/form-data">
+			<input type="file" id="importInput" name="file"/>
+		</form>
 		<div id="addButton" class="btn btn-primary" onClick="javascript:openEditOutcomeDialog()">
 			<i class="fa fa-plus"></i>
 			<span><fmt:message key='outcome.manage.add' /></span>
Index: lams_central/web/outcome/scaleEdit.jsp
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_central/web/outcome/scaleEdit.jsp	(.../scaleEdit.jsp)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_central/web/outcome/scaleEdit.jsp	(.../scaleEdit.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -21,25 +21,20 @@
 		<c:if test="${saved}">
 			var scalesFrame = $('#dialogOutcomeScale iframe', window.parent.document);
 			if (scalesFrame.length == 0) {
-				window.parent.document.location.href = 
-					'<lams:LAMSURL/>outcome/scaleManage.do${empty param.organisationID ? "" : "?organisationID=param.organisationID"}';
+				window.parent.document.location.href = '<lams:LAMSURL/>outcome/scaleManage.do';
 			} else {
 				scalesFrame.attr('src', scalesFrame.attr('src'));
 				$('#dialogOutcomeScaleEdit', window.parent.document).remove();
 			}
 		</c:if>
-		
-		var organisationId = '${param.organisationID}';
 	</script>
 </lams:head>
 <body>
 
 <form:form action="scaleSave.do" method="post" modelAttribute="scaleForm">
-	<c:set var="formDisabled" value="${isDefaultScale or (not empty scaleForm.scaleId and empty scaleForm.organisationId and not canManageGlobal)}" />
+	<c:set var="formDisabled" value="${isDefaultScale}" />
 
 	<form:hidden path="scaleId" />
-	<form:hidden path="organisationId" />
-	<form:hidden path="contentFolderId" />
 	
 	<div class="container">
 		<div class="row vertical-center-row">
@@ -61,22 +56,13 @@
 							</label>
 						</div>
 						<div class="form-group">
-							<fmt:message key="outcome.manage.scope" />:
-							<c:choose>
-								<c:when test="${empty scaleForm.organisationId}">
-									<fmt:message key="outcome.manage.scope.global" />
-								</c:when>
-								<c:otherwise>
-									<fmt:message key="outcome.manage.scope.course" />
-								</c:otherwise>
-							</c:choose>
-						</div>
-						<div class="form-group">
 							<label><fmt:message key="scale.manage.add.value" />:<br />
 								<form:textarea path="items" disabled="${formDisabled}" />
-								<lams:Alert type="info" close="false">
-							        <fmt:message key="scale.manage.add.value.info" />
-								</lams:Alert>
+								<c:if test="${not formDisabled}">
+									<lams:Alert type="info" close="false">
+							        	<fmt:message key="scale.manage.add.value.info" />
+									</lams:Alert>
+								</c:if>
 							</label>
 						</div>
 						<div class="form-group">
Index: lams_central/web/outcome/scaleManage.jsp
===================================================================
diff -u -rd432ad1e56c019311c8ca428ba8e08907a56077c -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_central/web/outcome/scaleManage.jsp	(.../scaleManage.jsp)	(revision d432ad1e56c019311c8ca428ba8e08907a56077c)
+++ lams_central/web/outcome/scaleManage.jsp	(.../scaleManage.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -17,8 +17,7 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.cookie.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 	<script type="text/javascript">
-		var organisationId = '${param.organisationID}',
-			LAMS_URL = '<lams:LAMSURL/>',
+		var LAMS_URL = '<lams:LAMSURL/>',
 			
 			decoderDiv = $('<div />'),
 			LABELS = {
@@ -44,9 +43,6 @@
 			<div class="col-xs-3">
 				<fmt:message key='outcome.manage.add.code' />
 			</div>
-			<div class="col-xs-2">
-				<fmt:message key='outcome.manage.scope' />
-			</div>
 			<div class="col-xs-1">
 			</div>
 			<div class="col-xs-1">
@@ -60,19 +56,9 @@
 				<div class="col-xs-3">
 					<c:out value="${scale.code}" />
 				</div>
-				<div class="col-xs-2">
-					<c:choose>
-						<c:when test="${empty scale.organisation}">
-							<fmt:message key='outcome.manage.scope.global' />
-						</c:when>
-						<c:otherwise>
-							<fmt:message key='outcome.manage.scope.course' />
-						</c:otherwise>
-					</c:choose>
-				</div>
 				<div class="col-xs-1">
 					<c:choose>
-						<c:when test="${scale.scaleId != 1 and (not empty scale.organisation or canManageGlobal)}">
+						<c:when test="${scale.scaleId != 1}">
 							<i class="manageButton fa fa-pencil" title="<fmt:message key='scale.manage.edit' />"
 						   	   onClick="javascript:openEditScaleDialog(${scale.scaleId})" >
 							</i>
@@ -85,29 +71,27 @@
 					</c:choose>
 				</div>
 				<div class="col-xs-1">
-					<c:if test="${scale.scaleId != 1 and (not empty scale.organisation or canManageGlobal)}">
+					<c:if test="${scale.scaleId != 1}">
 						<i class="manageButton fa fa-remove" title="<fmt:message key='scale.manage.remove' />"
 					   	   onClick="javascript:removeScale(${scale.scaleId})" >
 						</i>
 					</c:if>
 				</div>
 			</div>
 		</c:forEach>
-		<c:if test="${canManageGlobal}">
-			<div id="exportButton" class="btn btn-default pull-left" onClick="javascript:exportOutcome(true)"
-				 data-loading-text="<i class='fa fa-circle-o-notch fa-spin'></i><span> <fmt:message key="outcome.export" /></span>">
-				<i class="fa fa-download"></i>
-				<span class="hidden-xs">
-					<fmt:message key="outcome.export" />
-				</span>
-			</div> 
-			<div id="importButton" class="btn btn-default pull-left" onClick="javascript:$('#importInput').click()">
-				<i class="fa fa-upload"></i> <fmt:message key="outcome.import" />
-			</div>
-			<form id="importForm" action="scaleImport.do" method="post" enctype="multipart/form-data">
-				<input type="file" id="importInput" name="file"/>
-			</form>
-		</c:if>
+		<div id="exportButton" class="btn btn-default pull-left" onClick="javascript:exportOutcome(true)"
+			 data-loading-text="<i class='fa fa-circle-o-notch fa-spin'></i><span> <fmt:message key="outcome.export" /></span>">
+			<i class="fa fa-download"></i>
+			<span class="hidden-xs">
+				<fmt:message key="outcome.export" />
+			</span>
+		</div> 
+		<div id="importButton" class="btn btn-default pull-left" onClick="javascript:$('#importInput').click()">
+			<i class="fa fa-upload"></i> <fmt:message key="outcome.import" />
+		</div>
+		<form id="importForm" action="scaleImport.do" method="post" enctype="multipart/form-data">
+			<input type="file" id="importInput" name="file"/>
+		</form>
 		<div id="addButton" class="btn btn-primary" onClick="javascript:openEditScaleDialog()">
 			<i class="fa fa-plus"></i>
 			<span><fmt:message key='scale.manage.add' /></span>
Index: lams_central/web/profile/editprofile.jsp
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_central/web/profile/editprofile.jsp	(.../editprofile.jsp)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_central/web/profile/editprofile.jsp	(.../editprofile.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -8,7 +8,16 @@
 <%@ page import="org.lamsfoundation.lams.usermanagement.AuthenticationMethod"
 	import="org.lamsfoundation.lams.util.Configuration"
 	import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
-<c:set var="lams"><lams:LAMSURL/></c:set>
+<c:set var="lams"><lams:LAMSURL/></c:set>	
+<c:set var="profileEditEnabled"><%=Configuration.get(ConfigurationKeys.PROFILE_EDIT_ENABLE)%></c:set>
+<c:set var="partialProfileEditEnabled"><%=Configuration.get(ConfigurationKeys.PROFILE_PARTIAL_EDIT_ENABLE)%></c:set>
+<c:set var="authenticationMethodId">
+	<lams:user property="authenticationMethodId" />
+</c:set>
+<c:set var="dbId"><%=AuthenticationMethod.DB%></c:set>
+<%-- This gets overwritten for a client during build process (SP-3) --%>
+<c:set var="editOnlyName" value="false" />
+							
 <lams:html>
 <lams:head>
 	<lams:css/>
@@ -40,30 +49,30 @@
 		<form:hidden path="userId" />
 		<form:hidden path="login" />
 		<form:hidden path="password" />
+		<input type="hidden" name="editNameOnly" value="${editOnlyName}" />
 
-		<c:set var="profileEditEnabled"><%=Configuration.get(ConfigurationKeys.PROFILE_EDIT_ENABLE)%></c:set>
-		<c:set var="partialProfileEditEnabled"><%=Configuration.get(ConfigurationKeys.PROFILE_PARTIAL_EDIT_ENABLE)%></c:set>
 		<div style="clear: both;"></div>
 		<div class="container-fluid">
 			<div class="row vertical-center-row justify-content-center">
 			<div class="col-sm-10">
 					<div class="card card-plain">
 					<div class="card-body card-plain">
 							<lams:errors path="*"/>
-							<c:set var="authenticationMethodId">
-								<lams:user property="authenticationMethodId" />
-							</c:set>
-							<c:set var="dbId"><%=AuthenticationMethod.DB%></c:set>
 							<c:if test="${authenticationMethodId eq dbId}">
 
 								<div class="form-group">
-									<span class="lead"><label class="bmd-label-static"><fmt:message
-												key="label.username" /></label>: ${UserForm.login}</span>
+									<span class="lead">
+										<label class="bmd-label-static">
+											<fmt:message key="label.username" />
+										</label>: 
+										${newForm.login}
+									</span>
 								</div>
+								
 								<div class="form-group bmd-form-group">
 									<label class="bmd-label-floating"><fmt:message key="label.title" />:</label>
 									<form:input path="title" size="32" maxlength="32"
-										disabled="${!profileEditEnabled}" cssClass="form-control" />
+										disabled="${!profileEditEnabled or editOnlyName}" cssClass="form-control" />
 								</div>
 
 								<div class="form-group bmd-form-group">
@@ -84,46 +93,46 @@
 								<div class="form-group bmd-form-group">
 									<label class="bmd-label-floating"><fmt:message key="label.email" /> *:</label>
 									<form:input path="email" size="50" maxlength="128"
-										disabled="${!profileEditEnabled and !partialProfileEditEnabled}"
+										disabled="${!profileEditEnabled and !partialProfileEditEnabled or editOnlyName}"
 										cssClass="form-control" />
 								</div>
 
 								<div class="form-group bmd-form-group">
 									<label class="bmd-label-floating"><fmt:message key="label.address_line_1" />:</label>
 									<form:input path="addressLine1" size="50" maxlength="64"
-										disabled="${!profileEditEnabled}" cssClass="form-control" />
+										disabled="${!profileEditEnabled or editOnlyName}" cssClass="form-control" />
 								</div>
 								<div class="form-group bmd-form-group">
 									<label class="bmd-label-floating"><fmt:message key="label.address_line_2" />:</label>
 									<form:input path="addressLine2" size="50" maxlength="64"
-										disabled="${!profileEditEnabled}" cssClass="form-control" />
+										disabled="${!profileEditEnabled or editOnlyName}" cssClass="form-control" />
 								</div>
 								<div class="form-group bmd-form-group">
 									<label class="bmd-label-floating"><fmt:message key="label.address_line_3" />:</label>
 									<form:input path="addressLine3" size="50" maxlength="64"
-										disabled="${!profileEditEnabled}" cssClass="form-control" />
+										disabled="${!profileEditEnabled or editOnlyName}" cssClass="form-control" />
 								</div>
 
 								<div class="form-group bmd-form-group">
 									<label class="bmd-label-floating"><fmt:message key="label.city" />:</label>
 									<form:input path="city" size="50" maxlength="64"
-										disabled="${!profileEditEnabled}" cssClass="form-control" />
+										disabled="${!profileEditEnabled or editOnlyName}" cssClass="form-control" />
 								</div>
 
 								<div class="form-group bmd-form-group">
 									<label class="bmd-label-floating"><fmt:message key="label.state" />:</label>
 									<form:input path="state" size="50" maxlength="64"
-										disabled="${!profileEditEnabled}" cssClass="form-control" />
+										disabled="${!profileEditEnabled or editOnlyName}" cssClass="form-control" />
 								</div>
 								<div class="form-group bmd-form-group">
 									<label class="bmd-label-floating"><fmt:message key="label.postcode" />:</label>
 									<form:input path="postcode" size="10" maxlength="10"
-										disabled="${!profileEditEnabled}" cssClass="form-control" />
+										disabled="${!profileEditEnabled or editOnlyName}" cssClass="form-control" />
 								</div>
 								<div class="form-group bmd-form-group">
 									<label class="bmd-label-static"><fmt:message key="label.country" /> *:</label>
 
-									<form:select path="country" disabled="${!profileEditEnabled}" cssClass="form-control">
+									<form:select path="country" disabled="${!profileEditEnabled or editOnlyName}" cssClass="form-control">
 										<form:option value="0">
 											<fmt:message key="label.select.country" />
 										</form:option>
@@ -137,33 +146,33 @@
 								<div class="form-group bmd-form-group">
 									<label class="bmd-label-floating"><fmt:message key="label.day_phone" />:</label>
 									<form:input path="dayPhone" size="50" maxlength="64"
-										disabled="${!profileEditEnabled and !partialProfileEditEnabled}"
+										disabled="${!profileEditEnabled and !partialProfileEditEnabled or editOnlyName}"
 										cssClass="form-control" />
 								</div>
 								<div class="form-group bmd-form-group">
 									<label class="bmd-label-floating"><fmt:message key="label.evening_phone" />:</label>
 									<form:input path="eveningPhone" size="50" maxlength="64"
-										disabled="${!profileEditEnabled and !partialProfileEditEnabled}"
+										disabled="${!profileEditEnabled and !partialProfileEditEnabled or editOnlyName}"
 										cssClass="form-control" />
 								</div>
 								<div class="form-group bmd-form-group">
 									<label class="bmd-label-floating"><fmt:message key="label.mobile_phone" />:</label>
 									<form:input path="mobilePhone" size="50" maxlength="64"
-										disabled="${!profileEditEnabled and !partialProfileEditEnabled}"
+										disabled="${!profileEditEnabled and !partialProfileEditEnabled or editOnlyName}"
 										cssClass="form-control" />
 								</div>
 
 								<div class="form-group bmd-form-group">
 									<label class="bmd-label-floating"><fmt:message key="label.fax" />:</label>
 									<form:input path="fax" size="50" maxlength="64"
-										disabled="${!profileEditEnabled and !partialProfileEditEnabled}"
+										disabled="${!profileEditEnabled and !partialProfileEditEnabled or editOnlyName}"
 										cssClass="form-control" />
 								</div>
 
 								<div class="form-group bmd-form-group">
 									<label class="bmd-label-static"><fmt:message key="label.language" />:</label>
 									<form:select path="localeId"
-										disabled="${!profileEditEnabled}" cssClass="form-control">
+										disabled="${!profileEditEnabled or editOnlyName}" cssClass="form-control">
 										<c:forEach items="${locales}" var="locale">
 											<form:option value="${locale.localeId}">
 												<c:out value="${locale.description}" />
@@ -174,7 +183,7 @@
 
 								<div class="form-group bmd-form-group">
 									<label class="bmd-label-static"><fmt:message key="label.timezone.title" />:</label>
-									<form:select path="timeZone" disabled="${!profileEditEnabled}" cssClass="form-control">
+									<form:select path="timeZone" disabled="${!profileEditEnabled or editOnlyName}" cssClass="form-control">
 										<c:forEach items="${timezoneDtos}" var="timezoneDto">
 											<form:option value="${timezoneDto.timeZoneId}">
 												${timezoneDto.timeZoneId} - ${timezoneDto.displayName}
@@ -185,7 +194,7 @@
 
 								<div class="form-group bmd-form-group">
 									<label class="bmd-label-static"><fmt:message key="label.theme" />:</label>
-									<form:select path="userTheme" disabled="${!profileEditEnabled}" cssClass="form-control">
+									<form:select path="userTheme" disabled="${!profileEditEnabled or editOnlyName}" cssClass="form-control">
 										<c:forEach items="${themes}" var="theme">
 											<form:option value="${theme.themeId}">${theme.name}</form:option>
 										</c:forEach>
Index: lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -46,9 +46,12 @@
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
 		
 		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
+		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
@@ -57,19 +60,40 @@
 			'minLength' : 2,
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
-				var index = ui.content.length;
+				var index = ui.content.length - 1,
+					// if result is empty, term and outcome add enabled come as objects (label, value)
+					// if there are results, they come as simple values
+					outcomeAddEnabled = ui.content[index] instanceof Object ? ui.content[index].label : ui.content[index],
+					// convert to boolean
+					outcomeAddEnabled = outcomeAddEnabled == 'true',
+					term = ui.content[index - 1] instanceof Object ? ui.content[index - 1].label : ui.content[index - 1],
+					sameNameFound = false;
+				index--;
+				ui.content.splice(index, 2);
 				while(index--) {
+					var label = ui.content[index].label;
+					if (label.split('(')[0].trim() == term) {
+						// do not offer to create an output which perfectly matches an existing one
+						sameNameFound = true;
+					}
 					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
 						ui.content.splice(index, 1);
 					}
 				}
+				if (outcomeAddEnabled && !sameNameFound) {
+					ui.content.push({
+						'label' : term + ' ' + outcomeCreateNewLabel
+					});
+				}
 			},
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
 					'data': $.extend({
-						'outcomeId' : ui.item.value
+						'outcomeId' : ui.item.value,
+						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
+						'name'		: ui.item.value ? null : ui.item.label.replace(outcomeCreateNewLabel, '')
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
 					'cache' : false,
@@ -109,10 +133,12 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
 												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
 						outcomeButton.click(function(){
-							removeOutcomeMapping(this);
+							if (confirm(outcomeMappingRemoveConfirm)) {
+								removeOutcomeMapping(this);
+							}
 						});
 					});
 				}
Index: lams_gradebook/web/gradebookMonitor.jsp
===================================================================
diff -u -r6e5015d036550bcae770b2125000995c79c3dea2 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_gradebook/web/gradebookMonitor.jsp	(.../gradebookMonitor.jsp)	(revision 6e5015d036550bcae770b2125000995c79c3dea2)
+++ lams_gradebook/web/gradebookMonitor.jsp	(.../gradebookMonitor.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -197,6 +197,8 @@
 						     pager: subgrid_table_id + "_pager",
 						     rowList:[10,20,30,40,50,100],
 							 rowNum:10,
+							 sortorder: "asc", 
+							 sortname: "sequence", 
 						     cellurl: "<lams:LAMSURL />gradebook/gradebookMonitoring/updateUserActivityGradebookData.do?lessonID=${lessonDetails.lessonID}&view=monUserView&userID=" + userID,
 						     colNames: [
 						     	'',
@@ -386,11 +388,13 @@
 										 autoencode:false,
 										 autowidth: true,
 									     datatype: "xml",
-									     url: "<lams:LAMSURL />/gradebook/gradebook.do?dispatch=getActivityArchiveGridData&lessonID=${lessonDetails.lessonID}&activityID="
+									     url: "<lams:LAMSURL />gradebook/gradebook/getActivityArchiveGridData.do?lessonID=${lessonDetails.lessonID}&activityID="
 										      + activityID + "&view=monUserView&userID=" + userID,
 									     height: "100%",
 									     cmTemplate: { title: false },
 									     cellEdit:false,
+										 sortorder: "asc", 
+										 sortname: "sequence",
 									     pager: false,
 									     colNames: [
 									    	"<fmt:message key="gradebook.columntitle.attempt"/>",
@@ -449,7 +453,7 @@
 				    rowList:[10,20,30,40,50,100],
 				    rowNum:10,
 				    sortorder: "asc", 
-				    sortname: "activityId", 
+				    sortname: "sequence", 
 				    colNames:[
 				    	'', 
 				    	'',
@@ -614,12 +618,14 @@
 										 iconSet: 'fontAwesome',
 										 autoencode:false,
 									     datatype: "xml",
-									     url: "<lams:LAMSURL />/gradebook/gradebook.do?dispatch=getActivityArchiveGridData&lessonID=${lessonDetails.lessonID}&activityID="
+									     url: "<lams:LAMSURL />gradebook/gradebook/getActivityArchiveGridData.do?lessonID=${lessonDetails.lessonID}&activityID="
 										      + activityID + "&view=monActivityView&userID=" + userID,
 									     height: "100%",
 									     autowidth:true,
 									     cellEdit:false,
 									     pager: false,
+										 sortorder: "asc", 
+										 sortname: "sequence", 
 									     colNames: [
 									    	"<fmt:message key="gradebook.columntitle.attempt"/>",
 									     	"<fmt:message key="gradebook.columntitle.activityFeedback"/>", 
Index: lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -46,9 +46,12 @@
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
 		
 		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
+		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
@@ -57,19 +60,40 @@
 			'minLength' : 2,
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
-				var index = ui.content.length;
+				var index = ui.content.length - 1,
+					// if result is empty, term and outcome add enabled come as objects (label, value)
+					// if there are results, they come as simple values
+					outcomeAddEnabled = ui.content[index] instanceof Object ? ui.content[index].label : ui.content[index],
+					// convert to boolean
+					outcomeAddEnabled = outcomeAddEnabled == 'true',
+					term = ui.content[index - 1] instanceof Object ? ui.content[index - 1].label : ui.content[index - 1],
+					sameNameFound = false;
+				index--;
+				ui.content.splice(index, 2);
 				while(index--) {
+					var label = ui.content[index].label;
+					if (label.split('(')[0].trim() == term) {
+						// do not offer to create an output which perfectly matches an existing one
+						sameNameFound = true;
+					}
 					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
 						ui.content.splice(index, 1);
 					}
 				}
+				if (outcomeAddEnabled && !sameNameFound) {
+					ui.content.push({
+						'label' : term + ' ' + outcomeCreateNewLabel
+					});
+				}
 			},
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
 					'data': $.extend({
-						'outcomeId' : ui.item.value
+						'outcomeId' : ui.item.value,
+						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
+						'name'		: ui.item.value ? null : ui.item.label.replace(outcomeCreateNewLabel, '')
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
 					'cache' : false,
@@ -109,10 +133,12 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
 												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
 						outcomeButton.click(function(){
-							removeOutcomeMapping(this);
+							if (confirm(outcomeMappingRemoveConfirm)) {
+								removeOutcomeMapping(this);
+							}
 						});
 					});
 				}
Index: lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -46,9 +46,12 @@
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
 		
 		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
+		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
@@ -57,19 +60,40 @@
 			'minLength' : 2,
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
-				var index = ui.content.length;
+				var index = ui.content.length - 1,
+					// if result is empty, term and outcome add enabled come as objects (label, value)
+					// if there are results, they come as simple values
+					outcomeAddEnabled = ui.content[index] instanceof Object ? ui.content[index].label : ui.content[index],
+					// convert to boolean
+					outcomeAddEnabled = outcomeAddEnabled == 'true',
+					term = ui.content[index - 1] instanceof Object ? ui.content[index - 1].label : ui.content[index - 1],
+					sameNameFound = false;
+				index--;
+				ui.content.splice(index, 2);
 				while(index--) {
+					var label = ui.content[index].label;
+					if (label.split('(')[0].trim() == term) {
+						// do not offer to create an output which perfectly matches an existing one
+						sameNameFound = true;
+					}
 					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
 						ui.content.splice(index, 1);
 					}
 				}
+				if (outcomeAddEnabled && !sameNameFound) {
+					ui.content.push({
+						'label' : term + ' ' + outcomeCreateNewLabel
+					});
+				}
 			},
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
 					'data': $.extend({
-						'outcomeId' : ui.item.value
+						'outcomeId' : ui.item.value,
+						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
+						'name'		: ui.item.value ? null : ui.item.label.replace(outcomeCreateNewLabel, '')
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
 					'cache' : false,
@@ -109,10 +133,12 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
 												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
 						outcomeButton.click(function(){
-							removeOutcomeMapping(this);
+							if (confirm(outcomeMappingRemoveConfirm)) {
+								removeOutcomeMapping(this);
+							}
 						});
 					});
 				}
Index: lams_monitoring/web/css/_tblmonitor_base.scss
===================================================================
diff -u -r4d710be17dc384e90d10a8a57c9fe2f7c77c88e2 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_monitoring/web/css/_tblmonitor_base.scss	(.../_tblmonitor_base.scss)	(revision 4d710be17dc384e90d10a8a57c9fe2f7c77c88e2)
+++ lams_monitoring/web/css/_tblmonitor_base.scss	(.../_tblmonitor_base.scss)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -41,13 +41,12 @@
 }
 
 #page-content-wrapper {
-    width:100%;
-    position:absolute;
+    min-width: 100%;
+    width: 1px;
     padding: 10px 20px;
 }
 
 #wrapper.toggled #page-content-wrapper {
-    position: absolute;
     margin-right:-154px;
 }
 
@@ -173,19 +172,13 @@
         width: 0;
     }
 
-    #page-content-wrapper {
-        position: relative;
-    }
-
     #wrapper.toggled #page-content-wrapper {
-        position: relative;
         margin-right: 0;
     }
    
    .top-nav div {
 	    padding-top: 20px;
 	}
-
 }
 
 @media (max-width: 500px) {
Index: lams_monitoring/web/monitor.jsp
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -22,30 +22,7 @@
   
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 	<script type="text/javascript" >
-		$(document).bind("mobileinit", function(){
-		  $.mobile.loadingMessage = false;
-		  $.mobile.ignoreContentEnabled = true;
-		  $('body').attr('data-enhance', 'false');
-		});
-	</script>
-	
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.timepicker.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/readmore.min.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/d3.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/chart.js"></script>
-	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/monitorLesson.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/popper.min.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap-material-design.min.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/material-kit.js?v=2.0.5"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.tabcontroller.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/bootstrap-tour.min.js"></script> 
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/portrait.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/x-editable.js"></script>
-	
-	<script type="text/javascript">
+		<!-- Some of the following settings will be used in progressBar.js -->
 		var lessonId = ${lesson.lessonID},
 			userId = '<lams:user property="userID"/>',
 			ldId = ${lesson.learningDesignID},
@@ -63,18 +40,16 @@
 			presenceEnabled =  false,
 			hasDialog = false,
 			sequenceTabShowInfo = ${sequenceTabShowInfo eq true},
-			tourInProgress = false;
-			
+			tourInProgress = false,
 			LAMS_URL = '<lams:LAMSURL/>',
-			
 			decoderDiv = $('<div />'),
 			LABELS = {
 				<fmt:message key="index.emailnotifications" var="EMAIL_NOTIFICATIONS_TITLE_VAR"/>
 				EMAIL_NOTIFICATIONS_TITLE : '<c:out value="${EMAIL_NOTIFICATIONS_TITLE_VAR}" />',
 				<fmt:message key="force.complete.click" var="FORCE_COMPLETE_CLICK_VAR"/>
 				FORCE_COMPLETE_CLICK : decoderDiv.html('<c:out value="${FORCE_COMPLETE_CLICK_VAR}" />').text(),
 				<fmt:message key="button.force.complete" var="FORCE_COMPLETE_BUTTON_VAR"/>
-                FORCE_COMPLETE_BUTTON : '<c:out value="${FORCE_COMPLETE_BUTTON_VAR}" />',
+		        FORCE_COMPLETE_BUTTON : '<c:out value="${FORCE_COMPLETE_BUTTON_VAR}" />',
 				<fmt:message key="force.complete.end.lesson.confirm" var="FORCE_COMPLETE_END_LESSON_CONFIRM_VAR"/>
 				FORCE_COMPLETE_END_LESSON_CONFIRM : decoderDiv.html('<c:out value="${FORCE_COMPLETE_END_LESSON_CONFIRM_VAR}" />').text(),
 				<fmt:message key="force.complete.activity.confirm" var="FORCE_COMPLETE_ACTIVITY_CONFIRM_VAR"/>
@@ -89,8 +64,8 @@
 				LEARNER_GROUP_SHOW : '<c:out value="${LEARNER_GROUP_SHOW_VAR}" />',
 				<fmt:message key="learner.group.remove.progress" var="LEARNER_GROUP_REMOVE_PROGRESS_VAR"/>
 				LEARNER_GROUP_REMOVE_PROGRESS : decoderDiv.html('<c:out value="${LEARNER_GROUP_REMOVE_PROGRESS_VAR}" />').text(),
-                <fmt:message key="button.email" var="EMAIL_BUTTON_VAR"/>
-                EMAIL_BUTTON : '<c:out value="${EMAIL_BUTTON_VAR}" />',
+		        <fmt:message key="button.email" var="EMAIL_BUTTON_VAR"/>
+		        EMAIL_BUTTON : '<c:out value="${EMAIL_BUTTON_VAR}" />',
 				<fmt:message key="email.notifications" var="NOTIFCATIONS_VAR"/>
 				NOTIFCATIONS : '<c:out value="${NOTIFCATIONS_VAR}" />',
 				<fmt:message key="button.save" var="SAVE_BUTTON_VAR"/>
@@ -223,7 +198,28 @@
 				LIVE_EDIT_TOOLTIP: '<c:out value="${LIVE_EDIT_TOOLTIP_VAR}" />',
 				<fmt:message key="label.person.editing.lesson" var="LIVE_EDIT_WARNING_VAR"><fmt:param value="%0"/></fmt:message>
 				LIVE_EDIT_WARNING: '<c:out value="${LIVE_EDIT_WARNING_VAR}" />'
-		}
+			};
+	</script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
+	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/monitorLesson.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.timepicker.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/readmore.min.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/d3.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/chart.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.tabcontroller.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/bootstrap-tour.min.js"></script> 
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/portrait.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/x-editable.js"></script>
+	<script type="text/javascript">
+		$(document).bind("mobileinit", function(){
+			$.mobile.loadingMessage = false;
+			$.mobile.ignoreContentEnabled = true;
+			 $('body').attr('data-enhance', 'false');
+		});
 				
 		$(document).ready(function(){
 			initLessonTab();
@@ -243,44 +239,44 @@
 		});
 			
         function doSelectTab(tabId) {
-	        	if ( tourInProgress )  {
-	        		alert(LABELS.TOUR_DISABLED_ELEMENT);
-	        		return;
-	        	}
-	        	actualDoSelectTab(tabId);
+	        if ( tourInProgress )  {
+	        	alert(LABELS.TOUR_DISABLED_ELEMENT);
+	        	return;
+	        }
+	        actualDoSelectTab(tabId);
         }
 
         function actualDoSelectTab(tabId) {
-	    		selectTab(tabId);
+	    	selectTab(tabId);
 			var sequenceInfoDialog = $('#sequenceInfoDialog');
-	    		if ( tabId == '2' ) {
+	    	if ( tabId == '2' ) {
 				if (sequenceTabShowInfo) {
 					sequenceInfoDialog.modal("show");
 					sequenceTabShowInfo = false; // only show it once
                 }
+                
 			} else {
 				sequenceInfoDialog.modal("hide");
             }
-	    		if ( tabId == '4' ) {
-	    			updateGradebookTab();
-	    		}
+            
+	    	if ( tabId == '4' ) {
+	    		updateGradebookTab();
+	    	}
         }
 
         function switchToTblMonitor() {
-        	$("#content").load(LAMS_URL + 'monitoring/tblmonitor/start.do', 
-        	{
-        		lessonID: ${lesson.lessonID}
-        	});
+        	$("#content").load(
+                LAMS_URL + 'monitoring/tblmonitor/start.do', 
+        		{
+        			lessonID: ${lesson.lessonID}
+        		}
+        	);
         }
         
     	<%@ include file="monitorTour.jsp" %> 
-
 	</script>
-	
-	
-	<!-- Some settings need to be done in the script first and only then this file can be included -->
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 </lams:head>
+
 <body>
 	
 	<%-- "loading..." screen, gets removed on page full load --%>
@@ -568,6 +564,7 @@
 						</c:forEach>
 					</table>
 				</lams:TabBody>
+				
 				<lams:TabBody id="2" titleKey="label.advanced">
 					<span class="pull-left" style="display:none" id="liveEditWarning"></span>
 					
@@ -604,6 +601,7 @@
 					<img id="sequenceSearchedLearnerHighlighter"
 					     src="<lams:LAMSURL/>images/pedag_down_arrow.gif" />
 				</lams:TabBody>
+				
 				<lams:TabBody id="3" titleKey="label.conditions">
 					<table id="tabLearnerControlTable">
 						<tr>
@@ -660,6 +658,7 @@
 						</div>
 					</div>
 				</lams:TabBody>
+				
 				<lams:TabBody id="4" titleKey="label.gradebook">
 					<div id="gradebookTopButtonsContainer" class="topButtonsContainer pull-right">
 						<button onclick="javascript:startTour();return false;" class="btn btn-sm btn-default pull-right roffset10 tour-button"
Index: lams_monitoring/web/tblmonitor/sequence.jsp
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_monitoring/web/tblmonitor/sequence.jsp	(.../sequence.jsp)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_monitoring/web/tblmonitor/sequence.jsp	(.../sequence.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -222,7 +222,7 @@
 <c:if test="${(lesson.lessonStateId == 3) || (lesson.lessonStateId == 4) }">
 	<div class="row no-gutter">
 		<div class="col-sm-6 col-md-4 col-lg-4 ">
-			<a href="#nogo" type="button" id="disable-sequence-button" class="btn btn-sm btn-default">
+			<button type="button" id="disable-sequence-button" class="btn btn-sm btn-default">
 				<span id="disable-sequence-label">
 					<c:choose>
 						<c:when test="${lesson.lessonStateId == 4}">
@@ -233,7 +233,7 @@
 						</c:otherwise>
 					</c:choose>
 				</span>
-			</a>
+			</button>
 		</div>                                 
 	</div>
 	<br>
Index: lams_monitoring/web/tblmonitor/teams.jsp
===================================================================
diff -u -r7e71d3c117c81dda7bed5a8bfb1f3e01adc3c104 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_monitoring/web/tblmonitor/teams.jsp	(.../teams.jsp)	(revision 7e71d3c117c81dda7bed5a8bfb1f3e01adc3c104)
+++ lams_monitoring/web/tblmonitor/teams.jsp	(.../teams.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -3,6 +3,9 @@
 	.font-weight-bold {
 		font-weight: bold;
 	}
+	.group-title {
+	   	cursor: pointer;
+	}
 </style>
 
 <!-- ChartJS-->
@@ -32,6 +35,13 @@
 	       	});
 		});
 
+		//use jqeury toggle instead of bootstrap collapse 
+		$(".group-title").on('click', function () {
+			var div =  $("#collapse-" + $(this).data("groupid"));
+			div.toggleClass("in");
+			$(this).toggleClass("collapsed");
+		});
+
 		//Comparison button modal window
 		var chart;
 		$('#comparison-modal').on('shown.bs.modal', function (event) {
@@ -174,7 +184,7 @@
 		<div class="card card-plain">
 			<div class="card-header">
 				<h4 class="card-title card-collapse">
-					<a data-toggle="collapse" data-target="#collapse-${groupDto.groupID}" href="#collapse-${groupDto.groupID}" class="collapsed" id="group-name-${groupDto.groupID}">
+					<a data-toggle="collapse" data-groupid="${groupDto.groupID}" class="collapsed group-title" id="group-name-${groupDto.groupID}">
 						${groupDto.groupName}
 					</a>
 				</h4>
Index: lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -46,9 +46,12 @@
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
 		
 		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
+		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
@@ -57,19 +60,40 @@
 			'minLength' : 2,
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
-				var index = ui.content.length;
+				var index = ui.content.length - 1,
+					// if result is empty, term and outcome add enabled come as objects (label, value)
+					// if there are results, they come as simple values
+					outcomeAddEnabled = ui.content[index] instanceof Object ? ui.content[index].label : ui.content[index],
+					// convert to boolean
+					outcomeAddEnabled = outcomeAddEnabled == 'true',
+					term = ui.content[index - 1] instanceof Object ? ui.content[index - 1].label : ui.content[index - 1],
+					sameNameFound = false;
+				index--;
+				ui.content.splice(index, 2);
 				while(index--) {
+					var label = ui.content[index].label;
+					if (label.split('(')[0].trim() == term) {
+						// do not offer to create an output which perfectly matches an existing one
+						sameNameFound = true;
+					}
 					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
 						ui.content.splice(index, 1);
 					}
 				}
+				if (outcomeAddEnabled && !sameNameFound) {
+					ui.content.push({
+						'label' : term + ' ' + outcomeCreateNewLabel
+					});
+				}
 			},
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
 					'data': $.extend({
-						'outcomeId' : ui.item.value
+						'outcomeId' : ui.item.value,
+						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
+						'name'		: ui.item.value ? null : ui.item.label.replace(outcomeCreateNewLabel, '')
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
 					'cache' : false,
@@ -109,10 +133,12 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
 												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
 						outcomeButton.click(function(){
-							removeOutcomeMapping(this);
+							if (confirm(outcomeMappingRemoveConfirm)) {
+								removeOutcomeMapping(this);
+							}
 						});
 					});
 				}
Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
diff -u -rc8cf9027d03f39a61d2516ece7f158ffc8cc2001 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision c8cf9027d03f39a61d2516ece7f158ffc8cc2001)
+++ lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -81,7 +81,7 @@
 								for (var i = 0; i < sortable.el.rows.length; i++) {
 									var tr = sortable.el.rows[i];
 									var input = $("input", $(tr));
-								    input.val(i+1);
+								    input.val(i);
 								}
 							}
 						}			            
Index: lams_tool_assessment/web/pages/learning/parts/markhedging.jsp
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_assessment/web/pages/learning/parts/markhedging.jsp	(.../markhedging.jsp)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_assessment/web/pages/learning/parts/markhedging.jsp	(.../markhedging.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -15,7 +15,7 @@
 				</td>
 				
 				<td style="width: 100px;">
-					<select name="question${questionIndex}_${option.sequenceId}" class="mark-hedging-select" data-question-index="${questionIndex}"
+					<select name="question${questionIndex}_${option.uid}" class="mark-hedging-select" data-question-index="${questionIndex}"
 						<c:if test="${!hasEditRight}">disabled="disabled"</c:if>				
 					>
 						
Index: lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp	(.../matchingpairs.jsp)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp	(.../matchingpairs.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -13,7 +13,7 @@
 				</td>
 				
 				<td style="width: 100px;">
-					<select name="question${status.index}_${option.sequenceId}" <c:if test="${!hasEditRight}">disabled="disabled"</c:if>>
+					<select name="question${status.index}_${option.uid}" <c:if test="${!hasEditRight}">disabled="disabled"</c:if>>
 						<option value="-1">
 							<fmt:message key="label.learning.matching.pairs.choose" />
 						</option>
Index: lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp	(.../multiplechoice.jsp)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp	(.../multiplechoice.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -18,13 +18,13 @@
 				<td class="${question.prefixAnswersWithLetters?'has-radio-button-prefix':'has-radio-button'}">
 					<c:choose>
 						<c:when test="${question.multipleAnswersAllowed}">
-							<input type="checkbox" name="question${status.index}_${option.sequenceId}" value="${true}"
+							<input type="checkbox" name="question${status.index}_${option.uid}" value="${true}"
 		 						<c:if test="${option.answerBoolean}">checked="checked"</c:if>
 								<c:if test="${!hasEditRight}">disabled="disabled"</c:if>
 							/>
 						</c:when>
 						<c:otherwise>
-							<input type="radio" name="question${status.index}" value="${option.sequenceId}"
+							<input type="radio" name="question${status.index}" value="${option.uid}"
 		 						<c:if test="${option.answerBoolean}">checked="checked"</c:if>
 		 						<c:if test="${!hasEditRight}">disabled="disabled"</c:if>
 							/>
Index: lams_tool_assessment/web/pages/learning/parts/ordering.jsp
===================================================================
diff -u -rc8cf9027d03f39a61d2516ece7f158ffc8cc2001 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_assessment/web/pages/learning/parts/ordering.jsp	(.../ordering.jsp)	(revision c8cf9027d03f39a61d2516ece7f158ffc8cc2001)
+++ lams_tool_assessment/web/pages/learning/parts/ordering.jsp	(.../ordering.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -10,7 +10,7 @@
 			<c:forEach var="option" items="${question.optionDtos}" varStatus="ordStatus">
 				<tr>
 					<td class="ordering-option">
-						<input type="hidden" name="question${status.index}_${option.sequenceId}" value="${ordStatus.index}" />
+						<input type="hidden" name="question${status.index}_${option.uid}" value="${ordStatus.index}" />
 						<c:out value="${option.optionString}" escapeXml="false" />
 					</td>
 				</tr>
Index: lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(.../questionsummary.jsp)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(.../questionsummary.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -10,12 +10,10 @@
 		<c:set var="sessionDtos" value="${sessionMap.sessionDtos}"/>
 		
 		<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
-		<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet">
+		<link type="text/css" href="${lams}css/free.ui.jqgrid.min.css" rel="stylesheet">
 		<link type="text/css" href="${lams}css/jquery.jqGrid.confidence-level-formattter.css" rel="stylesheet">
-		<link type="text/css" href="<lams:WebAppURL/>includes/css/monitoring.css" rel="stylesheet">	
 		
-		<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
-	 	<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/free.jquery.jqgrid.min.js"></script>
 	 	<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.confidence-level-formattter.js"></script>
 	 	<script type="text/javascript" src="${lams}includes/javascript/portrait.js"></script>
   	    <script>
@@ -27,16 +25,19 @@
 	  				jQuery("#session${sessionDto.sessionId}").jqGrid({
 	  					datatype: "json",
 	  					url: "<c:url value="/monitoring/getUsersByQuestion.do"/>?sessionMapID=${sessionMapID}&sessionId=${sessionDto.sessionId}&questionUid=${questionSummary.question.uid}",
+	  					autoencode:false,
 	  					height: 'auto',
 	  					autowidth: true,
 	  					shrinkToFit: false,
 	  				    pager: 'pager${sessionDto.sessionId}',
 	  				  	rowList:[10,20,30,40,50,100],
 	  				    rowNum:10,
 	  				    viewrecords:true,
+	  					guiStyle: "bootstrap",
+	  					iconSet: 'fontAwesome',
 	  				   	colNames:[
 		  				   	'questionResultUid',
-	  				   	    	'maxMark',
+	  				   	    'maxMark',
 	  		  				"<fmt:message key="label.monitoring.summary.user.name" />",
 	  		  			    "<fmt:message key="label.monitoring.user.summary.grade" />",
 		  			   		<c:if test="${assessment.enableConfidenceLevels}">
@@ -93,17 +94,7 @@
 	  					},
   						loadComplete: function () {
   					   	 	initializePortraitPopover('<lams:LAMSURL/>');
-  					    	}
-  						/*  resetSelection() doesn't work in this version
-						    hope it'll be fixed in the next one
-						    
-	  					,
-	  					onSelectRow: function (rowid){
-	  						$("[id^='user']").resetSelection();
-	  					},
-	  					onCellSelect: function (rowid, iCol, cellcontent){
-	  						jQuery("#session${sessionDto.sessionId}}").resetSelection();
-	  					}*/ 	  				  	
+  					    }	  				  	
 	  				})
 	  				<c:if test="${!sessionMap.assessment.useSelectLeaderToolOuput}">
 		  				.jqGrid('filterToolbar', { 
@@ -205,8 +196,8 @@
 				</div>	
 			</c:forEach>
 			
-			<a href="#nogo" onclick="refreshSummaryPage();" class="btn btn-primary btn-sm voffset10 pull-right">
-				<fmt:message key="label.monitoring.question.summary.ok" /> 
+			<a href="#nogo" onclick="refreshSummaryPage();" class="btn btn-default btn-sm voffset10 pull-right">
+				<fmt:message key="label.close" /> 
 			</a>
 
 		</div>
Index: lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	(.../usersummary.jsp)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	(.../usersummary.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -8,12 +8,10 @@
 		<%@ include file="/common/header.jsp"%>		
 		
 		<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
-		<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet">
+		<link type="text/css" href="${lams}css/free.ui.jqgrid.min.css" rel="stylesheet">
 		<link type="text/css" href="${lams}css/jquery.jqGrid.confidence-level-formattter.css" rel="stylesheet">
-		<link type="text/css" href="<lams:WebAppURL/>includes/css/monitoring.css" rel="stylesheet">	
 
-		<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
-	 	<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/free.jquery.jqgrid.min.js"></script>
 	 	<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.confidence-level-formattter.js"></script>
   	    <script>
 	    	var isEdited = false;
@@ -24,11 +22,13 @@
 	  			
 	  				jQuery("#user${question.uid}").jqGrid({
 	  					datatype: "local",
+	  					autoencode:false,
 	  					rowNum: 10000,
 	  					height: 'auto',
 	  					autowidth: true,
 	  					shrinkToFit: false,
-	  					
+	  					guiStyle: "bootstrap",
+	  					iconSet: 'fontAwesome',
 	  				   	colNames:[
 		  				   	"<fmt:message key="label.monitoring.user.summary.attempt" />",
 	  						'questionResultUid',
@@ -38,8 +38,7 @@
 	  							"<fmt:message key="label.confidence" />",
 	  						</c:if>
 	  						"<fmt:message key="label.monitoring.user.summary.grade" />"
-	  					],
-	  						    
+	  					],  
 	  				   	colModel:[
 	  				   		{name:'id', index:'id', width:52, sorttype:"int"},
 	  				   		{name:'questionResultUid', index:'questionResultUid', width:0, hidden: true},
@@ -50,7 +49,6 @@
 			  			  	</c:if>
 	  				   		{name:'grade', index:'grade', width:80, sorttype:"float", editable:true, editoptions: {size:4, maxlength: 4}, align:"right", classes: 'vertical-align' }		
 	  				   	],
-	  				   	
 	  				   	multiselect: false,
 	  				  	cellurl: '<c:url value="/monitoring/saveUserGrade.do?sessionMapID=${sessionMapID}"/>',
 	  				  	cellEdit: true,
@@ -85,17 +83,7 @@
 	  							var questionResultUid = jQuery("#user${question.uid}").getCell(rowid, 'questionResultUid');
 	  							return {questionResultUid:questionResultUid};		  				  		
 	  				  		}
-	  					}
-  						/*  resetSelection() doesn't work in this version
-						    hope it'll be fixed in the next one
-						    
-	  					,
-	  					onSelectRow: function (rowid){
-	  						$("[id^='user']").resetSelection();
-	  					},
-	  					onCellSelect: function (rowid, iCol, cellcontent){
-	  						jQuery("#user${question.uid+1}").resetSelection();
-	  					}*/ 	  				  	
+	  					}  				  	
 	  				});
 	  				
 	  	   	        <c:forEach var="questionResult" items="${userSummaryItem.questionResults}" varStatus="i">
@@ -228,7 +216,7 @@
 			</c:forEach>
 
 			<a href="#nogo" onclick="refreshSummaryPage();" class="btn btn-default btn-sm voffset20 pull-right">
-				<fmt:message key="label.monitoring.user.summary.ok" /> 
+				<fmt:message key="label.close" /> 
 			</a>
 
 		</div>
Index: lams_tool_assessment/web/pages/monitoring/summary.jsp
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -22,6 +22,8 @@
 			    rowList:[10,20,30,40,50,100],
 			    rowNum:10,
 			    viewrecords:true,
+				guiStyle: "bootstrap",
+				iconSet: 'fontAwesome',
 			   	colNames:[
 				   	'userId',
 					'sessionId',
@@ -46,28 +48,28 @@
 			  	},
 			  	onSelectRow: function(rowid) { 
 			  	    if(rowid == null) { 
-			  	    		rowid=0; 
+			  	    	rowid=0; 
 			  	    } 
 			   		var userId = jQuery("#list${sessionDto.sessionId}").getCell(rowid, 'userId');
 			   		var sessionId = jQuery("#list${sessionDto.sessionId}").getCell(rowid, 'sessionId');
 					var userMasterDetailUrl = '<c:url value="/monitoring/userMasterDetail.do"/>';
 		  	        jQuery("#userSummary${sessionDto.sessionId}").clearGridData().setGridParam({gridstate: "visible"}).trigger("reloadGrid");
 		  	        $("#masterDetailArea").load(
-		  	        		userMasterDetailUrl,
-		  	        		{
-		  	        			userID: userId,
-		  	        			sessionId: sessionId,
-		  	        			sessionMapID: '${sessionMapID}'
+		  	        	userMasterDetailUrl,
+		  	        	{
+		  	        		userID: userId,
+		  	        		sessionId: sessionId,
+		  	        		sessionMapID: '${sessionMapID}'
 		  	       		}
 		  	       	);    
 	  	  		},
 			    loadError: function(xhr,st,err) {
-			    		jQuery("#list${sessionDto.sessionId}").clearGridData();
-			    		$.jgrid.info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="error.loaderror"/>", "<fmt:message key="label.ok"/>");
+			    	jQuery("#list${sessionDto.sessionId}").clearGridData();
+			    	$.jgrid.info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="error.loaderror"/>", "<fmt:message key="label.ok"/>");
 			    },
 			    loadComplete: function () {
 			   	 	initializePortraitPopover('<lams:LAMSURL/>');
-			    	},
+			    },
 
 			})
 			<c:if test="${!sessionMap.assessment.useSelectLeaderToolOuput}">
@@ -80,13 +82,14 @@
 	        var oldValue = 0;
 			jQuery("#userSummary${sessionDto.sessionId}").jqGrid({
 				datatype: "local",
+				autoencode:false,
 				rowNum: 10000,
 				gridstate:"hidden",
-				//hiddengrid:true,
 				height: 180,
 				autowidth: true,
 				shrinkToFit: false,
-				caption: "<fmt:message key="label.monitoring.summary.learner.summary" />",
+				guiStyle: "bootstrap",
+				iconSet: 'fontAwesome',
 			   	colNames:[
 				   	'#',
 					'questionResultUid',
@@ -105,7 +108,7 @@
 	  			   	<c:if test="${sessionMap.assessment.enableConfidenceLevels}">
 	  			   		{name:'confidence', index:'confidence', width: 80, classes: 'vertical-align', formatter: gradientNumberFormatter},
 	  			  	</c:if>
-	  			  	{name:'response', index:'response', width:443, sortable:false}
+	  			  	{name:'response', index:'response', datatype:'html', width:443, sortable:false}
 			   	],
 			   	multiselect: false,
 
@@ -282,6 +285,7 @@
 		jqgrids.each(function(index) {
 			var gridId = $(this).attr('id');
 	    	var gridParentWidth = jQuery('#gbox_' + gridId).parent().width();
+	    	console.log(gridParentWidth);
 	    	jQuery('#' + gridId).setGridWidth(gridParentWidth, true);
 	    });
 	};
Index: lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp	(.../assessment.jsp)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp	(.../assessment.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -175,7 +175,12 @@
 				<div class="card card-plain">
 					<div class="card-header">
 						<div class="card-title">
-							<span class="float-left space-right">Q${i.index+1})</span> <c:out value="${question.title}" escapeXml="false"/>
+							<c:if test="${assessmentDto.assessment.numbered}">
+								<span class="float-left space-right">Q${i.index+1})</span>
+							</c:if> 
+							
+							<c:out value="${question.title}" escapeXml="false"/>
+							
 							<c:if test="${assessmentDto.assessment.allowDiscloseAnswers}">
 								<div class="btn-group-xs pull-right disclose-button-group" questionUid="${question.uid}">
 									<%-- Allow disclosing correct answers only for multiple choice questions --%>
Index: lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -46,9 +46,12 @@
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
 		
 		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
+		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
@@ -57,19 +60,40 @@
 			'minLength' : 2,
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
-				var index = ui.content.length;
+				var index = ui.content.length - 1,
+					// if result is empty, term and outcome add enabled come as objects (label, value)
+					// if there are results, they come as simple values
+					outcomeAddEnabled = ui.content[index] instanceof Object ? ui.content[index].label : ui.content[index],
+					// convert to boolean
+					outcomeAddEnabled = outcomeAddEnabled == 'true',
+					term = ui.content[index - 1] instanceof Object ? ui.content[index - 1].label : ui.content[index - 1],
+					sameNameFound = false;
+				index--;
+				ui.content.splice(index, 2);
 				while(index--) {
+					var label = ui.content[index].label;
+					if (label.split('(')[0].trim() == term) {
+						// do not offer to create an output which perfectly matches an existing one
+						sameNameFound = true;
+					}
 					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
 						ui.content.splice(index, 1);
 					}
 				}
+				if (outcomeAddEnabled && !sameNameFound) {
+					ui.content.push({
+						'label' : term + ' ' + outcomeCreateNewLabel
+					});
+				}
 			},
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
 					'data': $.extend({
-						'outcomeId' : ui.item.value
+						'outcomeId' : ui.item.value,
+						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
+						'name'		: ui.item.value ? null : ui.item.label.replace(outcomeCreateNewLabel, '')
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
 					'cache' : false,
@@ -109,10 +133,12 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
 												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
 						outcomeButton.click(function(){
-							removeOutcomeMapping(this);
+							if (confirm(outcomeMappingRemoveConfirm)) {
+								removeOutcomeMapping(this);
+							}
 						});
 					});
 				}
Index: lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -46,9 +46,12 @@
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
 		
 		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
+		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
@@ -57,19 +60,40 @@
 			'minLength' : 2,
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
-				var index = ui.content.length;
+				var index = ui.content.length - 1,
+					// if result is empty, term and outcome add enabled come as objects (label, value)
+					// if there are results, they come as simple values
+					outcomeAddEnabled = ui.content[index] instanceof Object ? ui.content[index].label : ui.content[index],
+					// convert to boolean
+					outcomeAddEnabled = outcomeAddEnabled == 'true',
+					term = ui.content[index - 1] instanceof Object ? ui.content[index - 1].label : ui.content[index - 1],
+					sameNameFound = false;
+				index--;
+				ui.content.splice(index, 2);
 				while(index--) {
+					var label = ui.content[index].label;
+					if (label.split('(')[0].trim() == term) {
+						// do not offer to create an output which perfectly matches an existing one
+						sameNameFound = true;
+					}
 					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
 						ui.content.splice(index, 1);
 					}
 				}
+				if (outcomeAddEnabled && !sameNameFound) {
+					ui.content.push({
+						'label' : term + ' ' + outcomeCreateNewLabel
+					});
+				}
 			},
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
 					'data': $.extend({
-						'outcomeId' : ui.item.value
+						'outcomeId' : ui.item.value,
+						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
+						'name'		: ui.item.value ? null : ui.item.label.replace(outcomeCreateNewLabel, '')
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
 					'cache' : false,
@@ -109,10 +133,12 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
 												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
 						outcomeButton.click(function(){
-							removeOutcomeMapping(this);
+							if (confirm(outcomeMappingRemoveConfirm)) {
+								removeOutcomeMapping(this);
+							}
 						});
 					});
 				}
Index: lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -46,9 +46,12 @@
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
 		
 		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
+		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
@@ -57,19 +60,40 @@
 			'minLength' : 2,
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
-				var index = ui.content.length;
+				var index = ui.content.length - 1,
+					// if result is empty, term and outcome add enabled come as objects (label, value)
+					// if there are results, they come as simple values
+					outcomeAddEnabled = ui.content[index] instanceof Object ? ui.content[index].label : ui.content[index],
+					// convert to boolean
+					outcomeAddEnabled = outcomeAddEnabled == 'true',
+					term = ui.content[index - 1] instanceof Object ? ui.content[index - 1].label : ui.content[index - 1],
+					sameNameFound = false;
+				index--;
+				ui.content.splice(index, 2);
 				while(index--) {
+					var label = ui.content[index].label;
+					if (label.split('(')[0].trim() == term) {
+						// do not offer to create an output which perfectly matches an existing one
+						sameNameFound = true;
+					}
 					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
 						ui.content.splice(index, 1);
 					}
 				}
+				if (outcomeAddEnabled && !sameNameFound) {
+					ui.content.push({
+						'label' : term + ' ' + outcomeCreateNewLabel
+					});
+				}
 			},
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
 					'data': $.extend({
-						'outcomeId' : ui.item.value
+						'outcomeId' : ui.item.value,
+						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
+						'name'		: ui.item.value ? null : ui.item.label.replace(outcomeCreateNewLabel, '')
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
 					'cache' : false,
@@ -109,10 +133,12 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
 												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
 						outcomeButton.click(function(){
-							removeOutcomeMapping(this);
+							if (confirm(outcomeMappingRemoveConfirm)) {
+								removeOutcomeMapping(this);
+							}
 						});
 					});
 				}
Index: lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -46,9 +46,12 @@
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
 		
 		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
+		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
@@ -57,19 +60,40 @@
 			'minLength' : 2,
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
-				var index = ui.content.length;
+				var index = ui.content.length - 1,
+					// if result is empty, term and outcome add enabled come as objects (label, value)
+					// if there are results, they come as simple values
+					outcomeAddEnabled = ui.content[index] instanceof Object ? ui.content[index].label : ui.content[index],
+					// convert to boolean
+					outcomeAddEnabled = outcomeAddEnabled == 'true',
+					term = ui.content[index - 1] instanceof Object ? ui.content[index - 1].label : ui.content[index - 1],
+					sameNameFound = false;
+				index--;
+				ui.content.splice(index, 2);
 				while(index--) {
+					var label = ui.content[index].label;
+					if (label.split('(')[0].trim() == term) {
+						// do not offer to create an output which perfectly matches an existing one
+						sameNameFound = true;
+					}
 					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
 						ui.content.splice(index, 1);
 					}
 				}
+				if (outcomeAddEnabled && !sameNameFound) {
+					ui.content.push({
+						'label' : term + ' ' + outcomeCreateNewLabel
+					});
+				}
 			},
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
 					'data': $.extend({
-						'outcomeId' : ui.item.value
+						'outcomeId' : ui.item.value,
+						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
+						'name'		: ui.item.value ? null : ui.item.label.replace(outcomeCreateNewLabel, '')
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
 					'cache' : false,
@@ -109,10 +133,12 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
 												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
 						outcomeButton.click(function(){
-							removeOutcomeMapping(this);
+							if (confirm(outcomeMappingRemoveConfirm)) {
+								removeOutcomeMapping(this);
+							}
 						});
 					});
 				}
Index: lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -46,9 +46,12 @@
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
 		
 		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
+		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
@@ -57,19 +60,40 @@
 			'minLength' : 2,
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
-				var index = ui.content.length;
+				var index = ui.content.length - 1,
+					// if result is empty, term and outcome add enabled come as objects (label, value)
+					// if there are results, they come as simple values
+					outcomeAddEnabled = ui.content[index] instanceof Object ? ui.content[index].label : ui.content[index],
+					// convert to boolean
+					outcomeAddEnabled = outcomeAddEnabled == 'true',
+					term = ui.content[index - 1] instanceof Object ? ui.content[index - 1].label : ui.content[index - 1],
+					sameNameFound = false;
+				index--;
+				ui.content.splice(index, 2);
 				while(index--) {
+					var label = ui.content[index].label;
+					if (label.split('(')[0].trim() == term) {
+						// do not offer to create an output which perfectly matches an existing one
+						sameNameFound = true;
+					}
 					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
 						ui.content.splice(index, 1);
 					}
 				}
+				if (outcomeAddEnabled && !sameNameFound) {
+					ui.content.push({
+						'label' : term + ' ' + outcomeCreateNewLabel
+					});
+				}
 			},
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
 					'data': $.extend({
-						'outcomeId' : ui.item.value
+						'outcomeId' : ui.item.value,
+						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
+						'name'		: ui.item.value ? null : ui.item.label.replace(outcomeCreateNewLabel, '')
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
 					'cache' : false,
@@ -109,10 +133,12 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
 												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
 						outcomeButton.click(function(){
-							removeOutcomeMapping(this);
+							if (confirm(outcomeMappingRemoveConfirm)) {
+								removeOutcomeMapping(this);
+							}
 						});
 					});
 				}
Index: lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -46,9 +46,12 @@
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
 		
 		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
+		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
@@ -57,19 +60,40 @@
 			'minLength' : 2,
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
-				var index = ui.content.length;
+				var index = ui.content.length - 1,
+					// if result is empty, term and outcome add enabled come as objects (label, value)
+					// if there are results, they come as simple values
+					outcomeAddEnabled = ui.content[index] instanceof Object ? ui.content[index].label : ui.content[index],
+					// convert to boolean
+					outcomeAddEnabled = outcomeAddEnabled == 'true',
+					term = ui.content[index - 1] instanceof Object ? ui.content[index - 1].label : ui.content[index - 1],
+					sameNameFound = false;
+				index--;
+				ui.content.splice(index, 2);
 				while(index--) {
+					var label = ui.content[index].label;
+					if (label.split('(')[0].trim() == term) {
+						// do not offer to create an output which perfectly matches an existing one
+						sameNameFound = true;
+					}
 					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
 						ui.content.splice(index, 1);
 					}
 				}
+				if (outcomeAddEnabled && !sameNameFound) {
+					ui.content.push({
+						'label' : term + ' ' + outcomeCreateNewLabel
+					});
+				}
 			},
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
 					'data': $.extend({
-						'outcomeId' : ui.item.value
+						'outcomeId' : ui.item.value,
+						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
+						'name'		: ui.item.value ? null : ui.item.label.replace(outcomeCreateNewLabel, '')
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
 					'cache' : false,
@@ -109,10 +133,12 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
 												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
 						outcomeButton.click(function(){
-							removeOutcomeMapping(this);
+							if (confirm(outcomeMappingRemoveConfirm)) {
+								removeOutcomeMapping(this);
+							}
 						});
 					});
 				}
Index: lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -46,9 +46,12 @@
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
 		
 		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
+		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
@@ -57,19 +60,40 @@
 			'minLength' : 2,
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
-				var index = ui.content.length;
+				var index = ui.content.length - 1,
+					// if result is empty, term and outcome add enabled come as objects (label, value)
+					// if there are results, they come as simple values
+					outcomeAddEnabled = ui.content[index] instanceof Object ? ui.content[index].label : ui.content[index],
+					// convert to boolean
+					outcomeAddEnabled = outcomeAddEnabled == 'true',
+					term = ui.content[index - 1] instanceof Object ? ui.content[index - 1].label : ui.content[index - 1],
+					sameNameFound = false;
+				index--;
+				ui.content.splice(index, 2);
 				while(index--) {
+					var label = ui.content[index].label;
+					if (label.split('(')[0].trim() == term) {
+						// do not offer to create an output which perfectly matches an existing one
+						sameNameFound = true;
+					}
 					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
 						ui.content.splice(index, 1);
 					}
 				}
+				if (outcomeAddEnabled && !sameNameFound) {
+					ui.content.push({
+						'label' : term + ' ' + outcomeCreateNewLabel
+					});
+				}
 			},
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
 					'data': $.extend({
-						'outcomeId' : ui.item.value
+						'outcomeId' : ui.item.value,
+						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
+						'name'		: ui.item.value ? null : ui.item.label.replace(outcomeCreateNewLabel, '')
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
 					'cache' : false,
@@ -109,10 +133,12 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
 												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
 						outcomeButton.click(function(){
-							removeOutcomeMapping(this);
+							if (confirm(outcomeMappingRemoveConfirm)) {
+								removeOutcomeMapping(this);
+							}
 						});
 					});
 				}
Index: lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -46,9 +46,12 @@
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
 		
 		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
+		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
@@ -57,19 +60,40 @@
 			'minLength' : 2,
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
-				var index = ui.content.length;
+				var index = ui.content.length - 1,
+					// if result is empty, term and outcome add enabled come as objects (label, value)
+					// if there are results, they come as simple values
+					outcomeAddEnabled = ui.content[index] instanceof Object ? ui.content[index].label : ui.content[index],
+					// convert to boolean
+					outcomeAddEnabled = outcomeAddEnabled == 'true',
+					term = ui.content[index - 1] instanceof Object ? ui.content[index - 1].label : ui.content[index - 1],
+					sameNameFound = false;
+				index--;
+				ui.content.splice(index, 2);
 				while(index--) {
+					var label = ui.content[index].label;
+					if (label.split('(')[0].trim() == term) {
+						// do not offer to create an output which perfectly matches an existing one
+						sameNameFound = true;
+					}
 					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
 						ui.content.splice(index, 1);
 					}
 				}
+				if (outcomeAddEnabled && !sameNameFound) {
+					ui.content.push({
+						'label' : term + ' ' + outcomeCreateNewLabel
+					});
+				}
 			},
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
 					'data': $.extend({
-						'outcomeId' : ui.item.value
+						'outcomeId' : ui.item.value,
+						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
+						'name'		: ui.item.value ? null : ui.item.label.replace(outcomeCreateNewLabel, '')
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
 					'cache' : false,
@@ -109,10 +133,12 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
 												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
 						outcomeButton.click(function(){
-							removeOutcomeMapping(this);
+							if (confirm(outcomeMappingRemoveConfirm)) {
+								removeOutcomeMapping(this);
+							}
 						});
 					});
 				}
Index: lams_tool_lamc/web/authoring/editQuestionBox.jsp
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_lamc/web/authoring/editQuestionBox.jsp	(.../editQuestionBox.jsp)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_lamc/web/authoring/editQuestionBox.jsp	(.../editQuestionBox.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -3,13 +3,13 @@
 <c:set var="sessionMap" value="${sessionScope[sessionMapId]}" />
 <c:set var="questionDtos" value="${sessionMap.questionDtos}" />
 <c:set var="questionDto" value="${sessionMap.questionDto}" />
+<c:set var="isAuthoringRestricted" value="${sessionMap.isAuthoringRestricted}" />
 
 <lams:html>
 	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
-
 		<script type="text/JavaScript">
 			
 			function submitMethod(actionMethod) {
@@ -140,10 +140,8 @@
 				
 				return true;
 			}
-
 		</script>
 	</lams:head>
-
 <body class="stripes">
 
 	<form:form action="saveQuestion.do" modelAttribute="mcAuthoringForm" id="mcAuthoringForm" enctype="multipart/form-data" method="POST">
Index: lams_tool_lamc/web/authoring/itemlist.jsp
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_lamc/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_lamc/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -1,6 +1,7 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="sessionMap" value="${sessionScope[sessionMapId]}" />
 <c:set var="questionDtos" value="${sessionMap.questionDtos}" />
+<c:set var="isAuthoringRestricted" value="${sessionMap.isAuthoringRestricted}" />
 
 <div id="itemList">
 	<div class="card card-plain add-file">
@@ -9,9 +10,11 @@
 		<fmt:message key="label.questions" />
 		<i class="fa fa-spinner" style="display: none" id="resourceListArea_Busy"></i>
 		<div class="btn-group btn-group-xs pull-right">
-			<a href="#nogo" onClick="javascript:importQTI()" class="btn btn-default">
-				<fmt:message key="label.authoring.import.qti" />
-			</a>
+			<c:if test="${!isAuthoringRestricted}">
+				<a href="#nogo" onClick="javascript:importQTI()" class="btn btn-default">
+					<fmt:message key="label.authoring.import.qti" />
+				</a>
+			</c:if>
 			<a href="#nogo" onClick="javascript:exportQTI()" class="btn btn-default">
 				<fmt:message key="label.authoring.export.qti" />
 			</a>
@@ -82,9 +85,11 @@
 					</a>
 				</td>
 
-				<td  align="center" style="width:5%">
-					<i class="fa fa-times" title="<fmt:message key="label.tip.deleteQuestion" />" 	onclick="removeQuestion(${queIndex});"></i>
-				</td>
+				<c:if test="${!isAuthoringRestricted}">
+					<td  align="center" style="width:5%">
+						<i class="fa fa-times" title="<fmt:message key="label.tip.deleteQuestion" />" onclick="removeQuestion(${queIndex});"></i>
+					</td>
+				</c:if>
 
 			</tr>
 		</c:forEach>
Index: lams_tool_lamc/web/common/monitoringheader.jsp
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_lamc/web/common/monitoringheader.jsp	(.../monitoringheader.jsp)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_lamc/web/common/monitoringheader.jsp	(.../monitoringheader.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -15,8 +15,6 @@
 <script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery-ui.timepicker.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/popper.min.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/bootstrap-material-design.min.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
Index: lams_tool_lamc/web/monitoring/SummaryContent.jsp
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_lamc/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_lamc/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -3,23 +3,8 @@
 
 <link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
 <link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet">
-<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet">
+<link type="text/css" href="${lams}css/free.ui.jqgrid.min.css" rel="stylesheet">
 <link type="text/css" href="${lams}css/jquery.jqGrid.confidence-level-formattter.css" rel="stylesheet">
-<style type="text/css">
-	.ui-jqgrid {
-		border-left-style: none !important;
-		border-right-style: none !important;
-		border-bottom-style: none !important;
-	}
-	
-	.ui-jqgrid tr {
-		border-left-style: none !important;
-	}
-	
-	.ui-jqgrid td {
-		border-style: none !important;
-	}
-</style>
 
 <script type="text/javascript"> 
 	//pass settings to monitorToolSummaryAdvanced.js
@@ -35,6 +20,7 @@
 	};	
 </script>
 <script type="text/javascript" src="${lams}/includes/javascript/portrait.js" ></script>
+<script type="text/javascript" src="${lams}includes/javascript/free.jquery.jqgrid.min.js"></script>
 <script type="text/javascript" src="${lams}/includes/javascript/jquery.jqGrid.confidence-level-formattter.js" ></script>
 <script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 <script type="text/javascript">
@@ -53,7 +39,8 @@
 				rowList:[2,10,20,30,40,50,100],
 				rowNum:10,
 				viewrecords:true,
-			   	/* caption: "${sessionDto.sessionName}", */
+				guiStyle: "bootstrap",
+				iconSet: 'fontAwesome',
 			   	colNames:[
 					'userUid',
 					'userId',
@@ -74,18 +61,18 @@
 			   	},
 			   	loadComplete: function () {
 			   	 	initializePortraitPopover('<lams:LAMSURL/>');
-			    	},
+			    },
 			  	onSelectRow: function(rowid) { 
 			  	    if(rowid == null) { 
-			  	    		rowid=0; 
+			  	    	rowid=0; 
 			  	    } 
 			   		var userUid = jQuery("#group${sessionDto.sessionId}").getCell(rowid, 'userUid');
 					var userMasterDetailUrl = '<c:url value="/monitoring/userMasterDetail.do"/>';
 		  	        jQuery("#userSummary${sessionDto.sessionId}").clearGridData().setGridParam({gridstate: "visible"}).trigger("reloadGrid");
 		  	        $("#masterDetailArea").load(
-		  	        		userMasterDetailUrl,
-		  	        		{
-		  	        			userUid: userUid
+		  	        	userMasterDetailUrl,
+		  	        	{
+		  	        		userUid: userUid
 		  	       		}
 		  	       	);
 	  	  		} 
@@ -98,13 +85,14 @@
 	        var oldValue = 0;
 			jQuery("#userSummary${sessionDto.sessionId}").jqGrid({
 				datatype: "local",
+				autoencode:false,
 				rowNum: 10000,
 				gridstate:"hidden",
-				//hiddengrid:true,
 				height: 110,
 				autowidth: true,
 				shrinkToFit: true,
-				caption: "<fmt:message key="label.monitoring.summary.learner.summary" />",
+				guiStyle: "bootstrap",
+				iconSet: 'fontAwesome',
 			   	colNames:[
 				   	'#',
 					'userAttemptUid',
@@ -119,7 +107,7 @@
 	  			   	{name:'id', index:'id', width:20, sorttype:"int"},
 	  			   	{name:'userAttemptUid', index:'userAttemptUid', width:0, hidden: true},
 	  			   	{name:'title', index:'title', width: 200},
-	  			   	{name:'response', index:'response', width:443, sortable:false},
+	  			   	{name:'response', index:'response', width:473, sortable:false},
 	  			   	<c:if test="${enableConfidenceLevels}">
 	  			   		{name:'confidence', index:'confidence', width: 80, classes: 'vertical-align', formatter: gradientNumberFormatter},
 	  			  	</c:if>
@@ -186,11 +174,10 @@
         };
         setTimeout(function(){ window.dispatchEvent(new Event('resize')); }, 300);
         
-    		function userNameFormatter (cellvalue, options, rowObject) {
-	    		return definePortraitPopover(rowObject[4], rowObject[0],  rowObject[2]);
-    		}
+    	function userNameFormatter (cellvalue, options, rowObject) {
+	    	return definePortraitPopover(rowObject[4], rowObject[0],  rowObject[2]);
+    	}
 	});
-
 </script>
 
 <div class="card card-plain">
@@ -216,23 +203,14 @@
 	<!--For release marks feature-->
 	<lams:WaitingSpinner id="message-area-busy"></lams:WaitingSpinner>
 	<div class="voffset5 help-block" id="message-area"></div>
-
 </div>
 
-<%@ include file="parts/advanceQuestions.jsp"%>
-
 <c:if test="${not empty sessionDtos}">
-	<button onclick="return downloadMarks()" class="btn btn-default btn-xs btn-disable-on-submit pull-right">
-		<i class="fa fa-download" aria-hidden="true"></i> 
-		<fmt:message key="label.monitoring.downloadMarks.button" />
-	</button>
-
-	<h4>    
-		<fmt:message key="label.studentMarks"/>
-	</h4>
-
-	<div id="masterDetailArea">
-		<%@ include file="masterDetailLoadUp.jsp"%>
+	<div style="height: 30px;">
+		<button onclick="return downloadMarks()" class="btn btn-default btn-xs btn-disable-on-submit pull-right">
+			<i class="fa fa-download" aria-hidden="true"></i> 
+			<fmt:message key="label.monitoring.downloadMarks.button" />
+		</button>
 	</div>
 
 	<c:if test="${isGroupedActivity}">
@@ -257,8 +235,8 @@
 			<table id="group${sessionDto.sessionId}" class="scroll" cellpadding="0" cellspacing="0"></table>
 			<div id="pager-${sessionDto.sessionId}" class="scroll"></div>
 			
-			<div style="margin-top: 10px; width:99%;">
-				<table id="userSummary${sessionDto.sessionId}" class="scroll" cellpadding="0" cellspacing="0"></table>
+			<div style="margin-top: 10px;">
+				<table id="userSummary${sessionDto.sessionId}" class="scroll jqgrid-no-borders" cellpadding="0" cellspacing="0"></table>
 			</div>
 			
 		<c:if test="${isGroupedActivity}">
@@ -275,9 +253,14 @@
 
 </c:if>
 
+<div id="masterDetailArea">
+	<%@ include file="masterDetailLoadUp.jsp"%>
+</div>
+
 <c:if test="${not empty reflectionsContainerDTO}"> 							
 	<jsp:include page="/monitoring/Reflections.jsp" />
 </c:if>
 
+<%@ include file="parts/advanceQuestions.jsp"%>
 <%@ include file="parts/advanceOptions.jsp"%>
 <%@ include file="parts/dateRestriction.jsp"%>
Index: lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -46,9 +46,12 @@
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
 		
 		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
+		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
@@ -57,19 +60,40 @@
 			'minLength' : 2,
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
-				var index = ui.content.length;
+				var index = ui.content.length - 1,
+					// if result is empty, term and outcome add enabled come as objects (label, value)
+					// if there are results, they come as simple values
+					outcomeAddEnabled = ui.content[index] instanceof Object ? ui.content[index].label : ui.content[index],
+					// convert to boolean
+					outcomeAddEnabled = outcomeAddEnabled == 'true',
+					term = ui.content[index - 1] instanceof Object ? ui.content[index - 1].label : ui.content[index - 1],
+					sameNameFound = false;
+				index--;
+				ui.content.splice(index, 2);
 				while(index--) {
+					var label = ui.content[index].label;
+					if (label.split('(')[0].trim() == term) {
+						// do not offer to create an output which perfectly matches an existing one
+						sameNameFound = true;
+					}
 					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
 						ui.content.splice(index, 1);
 					}
 				}
+				if (outcomeAddEnabled && !sameNameFound) {
+					ui.content.push({
+						'label' : term + ' ' + outcomeCreateNewLabel
+					});
+				}
 			},
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
 					'data': $.extend({
-						'outcomeId' : ui.item.value
+						'outcomeId' : ui.item.value,
+						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
+						'name'		: ui.item.value ? null : ui.item.label.replace(outcomeCreateNewLabel, '')
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
 					'cache' : false,
@@ -109,10 +133,12 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
 												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
 						outcomeButton.click(function(){
-							removeOutcomeMapping(this);
+							if (confirm(outcomeMappingRemoveConfirm)) {
+								removeOutcomeMapping(this);
+							}
 						});
 					});
 				}
Index: lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -46,9 +46,12 @@
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
 		
 		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
+		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
@@ -57,19 +60,40 @@
 			'minLength' : 2,
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
-				var index = ui.content.length;
+				var index = ui.content.length - 1,
+					// if result is empty, term and outcome add enabled come as objects (label, value)
+					// if there are results, they come as simple values
+					outcomeAddEnabled = ui.content[index] instanceof Object ? ui.content[index].label : ui.content[index],
+					// convert to boolean
+					outcomeAddEnabled = outcomeAddEnabled == 'true',
+					term = ui.content[index - 1] instanceof Object ? ui.content[index - 1].label : ui.content[index - 1],
+					sameNameFound = false;
+				index--;
+				ui.content.splice(index, 2);
 				while(index--) {
+					var label = ui.content[index].label;
+					if (label.split('(')[0].trim() == term) {
+						// do not offer to create an output which perfectly matches an existing one
+						sameNameFound = true;
+					}
 					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
 						ui.content.splice(index, 1);
 					}
 				}
+				if (outcomeAddEnabled && !sameNameFound) {
+					ui.content.push({
+						'label' : term + ' ' + outcomeCreateNewLabel
+					});
+				}
 			},
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
 					'data': $.extend({
-						'outcomeId' : ui.item.value
+						'outcomeId' : ui.item.value,
+						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
+						'name'		: ui.item.value ? null : ui.item.label.replace(outcomeCreateNewLabel, '')
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
 					'cache' : false,
@@ -109,10 +133,12 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
 												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
 						outcomeButton.click(function(){
-							removeOutcomeMapping(this);
+							if (confirm(outcomeMappingRemoveConfirm)) {
+								removeOutcomeMapping(this);
+							}
 						});
 					});
 				}
Index: lams_tool_larsrc/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r7e71d3c117c81dda7bed5a8bfb1f3e01adc3c104 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_larsrc/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 7e71d3c117c81dda7bed5a8bfb1f3e01adc3c104)
+++ lams_tool_larsrc/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -5,7 +5,7 @@
 
 <lams:css suffix="jquery.jRating"/>
 <link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet"/>
-<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet" />
+<link type="text/css" href="${lams}css/free.ui.jqgrid.min.css" rel="stylesheet">
 <link type="text/css" href="<lams:WebAppURL/>css/monitor.css" rel="stylesheet" />
 
 <script type="text/javascript">
@@ -19,8 +19,7 @@
 <script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/rating.js"></script>
 
-<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/free.jquery.jqgrid.min.js"></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">
@@ -35,10 +34,13 @@
 		
 			jQuery("#group${groupSummary.sessionId}").jqGrid({
 				datatype: "local",
+				autoencode:false,
 				rowNum: 10000,
 				height: 'auto',
 				autowidth: true,
 				shrinkToFit: false,
+				guiStyle: "bootstrap",
+				iconSet: 'fontAwesome',
 			   	colNames:['#',
 						'itemUid',
 						"<fmt:message key="monitoring.label.title" />",
@@ -69,7 +71,6 @@
 			   		{name:'actions', index:'actions', width:120, align:"center"}		
 			   	],
 			   	<c:if test="${sessionsExist}">
-			   	// caption: "${groupSummary.sessionName}",
 				subGrid: true,
 				subGridRowExpanded: function(subgrid_id, row_id) {
 					var subgridTableId = subgrid_id+"_t";
@@ -87,6 +88,8 @@
 						rowList:[10,20,30,40,50,100],
 						rowNum:10,
 						viewrecords:true,
+						guiStyle: "bootstrap",
+						iconSet: 'fontAwesome',
 						colNames: [
 						   '',
 						   "<fmt:message key="monitoring.label.user.name"/>",
@@ -258,10 +261,8 @@
 	<!--For release marks feature-->
 	<lams:WaitingSpinner id="message-area-busy"/>
 	<div id="message-area"></div>
-
 </div>
 
-
 <c:if test="${sessionMap.isGroupedActivity}">
 <div class="accordian" id="accordionSessions" role="tablist" aria-multiselectable="true"> 
 </c:if>
@@ -295,8 +296,6 @@
 	
 </c:forEach>
 
- 
-
 <c:if test="${sessionMap.isGroupedActivity}">
 </div> <!--  end accordianSessions --> 
 </c:if>
Index: lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -46,9 +46,12 @@
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
 		
 		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
+		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
@@ -57,19 +60,40 @@
 			'minLength' : 2,
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
-				var index = ui.content.length;
+				var index = ui.content.length - 1,
+					// if result is empty, term and outcome add enabled come as objects (label, value)
+					// if there are results, they come as simple values
+					outcomeAddEnabled = ui.content[index] instanceof Object ? ui.content[index].label : ui.content[index],
+					// convert to boolean
+					outcomeAddEnabled = outcomeAddEnabled == 'true',
+					term = ui.content[index - 1] instanceof Object ? ui.content[index - 1].label : ui.content[index - 1],
+					sameNameFound = false;
+				index--;
+				ui.content.splice(index, 2);
 				while(index--) {
+					var label = ui.content[index].label;
+					if (label.split('(')[0].trim() == term) {
+						// do not offer to create an output which perfectly matches an existing one
+						sameNameFound = true;
+					}
 					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
 						ui.content.splice(index, 1);
 					}
 				}
+				if (outcomeAddEnabled && !sameNameFound) {
+					ui.content.push({
+						'label' : term + ' ' + outcomeCreateNewLabel
+					});
+				}
 			},
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
 					'data': $.extend({
-						'outcomeId' : ui.item.value
+						'outcomeId' : ui.item.value,
+						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
+						'name'		: ui.item.value ? null : ui.item.label.replace(outcomeCreateNewLabel, '')
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
 					'cache' : false,
@@ -109,10 +133,12 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
 												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
 						outcomeButton.click(function(){
-							removeOutcomeMapping(this);
+							if (confirm(outcomeMappingRemoveConfirm)) {
+								removeOutcomeMapping(this);
+							}
 						});
 					});
 				}
Index: lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -46,9 +46,12 @@
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
 		
 		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
+		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
@@ -57,19 +60,40 @@
 			'minLength' : 2,
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
-				var index = ui.content.length;
+				var index = ui.content.length - 1,
+					// if result is empty, term and outcome add enabled come as objects (label, value)
+					// if there are results, they come as simple values
+					outcomeAddEnabled = ui.content[index] instanceof Object ? ui.content[index].label : ui.content[index],
+					// convert to boolean
+					outcomeAddEnabled = outcomeAddEnabled == 'true',
+					term = ui.content[index - 1] instanceof Object ? ui.content[index - 1].label : ui.content[index - 1],
+					sameNameFound = false;
+				index--;
+				ui.content.splice(index, 2);
 				while(index--) {
+					var label = ui.content[index].label;
+					if (label.split('(')[0].trim() == term) {
+						// do not offer to create an output which perfectly matches an existing one
+						sameNameFound = true;
+					}
 					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
 						ui.content.splice(index, 1);
 					}
 				}
+				if (outcomeAddEnabled && !sameNameFound) {
+					ui.content.push({
+						'label' : term + ' ' + outcomeCreateNewLabel
+					});
+				}
 			},
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
 					'data': $.extend({
-						'outcomeId' : ui.item.value
+						'outcomeId' : ui.item.value,
+						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
+						'name'		: ui.item.value ? null : ui.item.label.replace(outcomeCreateNewLabel, '')
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
 					'cache' : false,
@@ -109,10 +133,12 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
 												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
 						outcomeButton.click(function(){
-							removeOutcomeMapping(this);
+							if (confirm(outcomeMappingRemoveConfirm)) {
+								removeOutcomeMapping(this);
+							}
 						});
 					});
 				}
Index: lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -46,9 +46,12 @@
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
 		
 		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
+		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
@@ -57,19 +60,40 @@
 			'minLength' : 2,
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
-				var index = ui.content.length;
+				var index = ui.content.length - 1,
+					// if result is empty, term and outcome add enabled come as objects (label, value)
+					// if there are results, they come as simple values
+					outcomeAddEnabled = ui.content[index] instanceof Object ? ui.content[index].label : ui.content[index],
+					// convert to boolean
+					outcomeAddEnabled = outcomeAddEnabled == 'true',
+					term = ui.content[index - 1] instanceof Object ? ui.content[index - 1].label : ui.content[index - 1],
+					sameNameFound = false;
+				index--;
+				ui.content.splice(index, 2);
 				while(index--) {
+					var label = ui.content[index].label;
+					if (label.split('(')[0].trim() == term) {
+						// do not offer to create an output which perfectly matches an existing one
+						sameNameFound = true;
+					}
 					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
 						ui.content.splice(index, 1);
 					}
 				}
+				if (outcomeAddEnabled && !sameNameFound) {
+					ui.content.push({
+						'label' : term + ' ' + outcomeCreateNewLabel
+					});
+				}
 			},
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
 					'data': $.extend({
-						'outcomeId' : ui.item.value
+						'outcomeId' : ui.item.value,
+						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
+						'name'		: ui.item.value ? null : ui.item.label.replace(outcomeCreateNewLabel, '')
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
 					'cache' : false,
@@ -109,10 +133,12 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
 												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
 						outcomeButton.click(function(){
-							removeOutcomeMapping(this);
+							if (confirm(outcomeMappingRemoveConfirm)) {
+								removeOutcomeMapping(this);
+							}
 						});
 					});
 				}
Index: lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -46,9 +46,12 @@
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
 		
 		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
+		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
@@ -57,19 +60,40 @@
 			'minLength' : 2,
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
-				var index = ui.content.length;
+				var index = ui.content.length - 1,
+					// if result is empty, term and outcome add enabled come as objects (label, value)
+					// if there are results, they come as simple values
+					outcomeAddEnabled = ui.content[index] instanceof Object ? ui.content[index].label : ui.content[index],
+					// convert to boolean
+					outcomeAddEnabled = outcomeAddEnabled == 'true',
+					term = ui.content[index - 1] instanceof Object ? ui.content[index - 1].label : ui.content[index - 1],
+					sameNameFound = false;
+				index--;
+				ui.content.splice(index, 2);
 				while(index--) {
+					var label = ui.content[index].label;
+					if (label.split('(')[0].trim() == term) {
+						// do not offer to create an output which perfectly matches an existing one
+						sameNameFound = true;
+					}
 					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
 						ui.content.splice(index, 1);
 					}
 				}
+				if (outcomeAddEnabled && !sameNameFound) {
+					ui.content.push({
+						'label' : term + ' ' + outcomeCreateNewLabel
+					});
+				}
 			},
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
 					'data': $.extend({
-						'outcomeId' : ui.item.value
+						'outcomeId' : ui.item.value,
+						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
+						'name'		: ui.item.value ? null : ui.item.label.replace(outcomeCreateNewLabel, '')
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
 					'cache' : false,
@@ -109,10 +133,12 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
 												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
 						outcomeButton.click(function(){
-							removeOutcomeMapping(this);
+							if (confirm(outcomeMappingRemoveConfirm)) {
+								removeOutcomeMapping(this);
+							}
 						});
 					});
 				}
Index: lams_tool_notebook/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_notebook/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_notebook/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -15,8 +15,7 @@
 		<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.timepicker.js"></script>
 		<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
 		
-		<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
-		<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/free.jquery.jqgrid.min.js"></script>
 		<script type="text/javascript" src="${lams}includes/javascript/jinplace-1.0.1.js"></script>
 		
 		<script type="text/javascript" src="${lams}includes/javascript/popper.min.js"></script>
@@ -30,6 +29,7 @@
 		
 		<script type="text/javascript" src="${tool}includes/javascript/monitoring.js"></script>
 	</lams:head>
+
 	<body class="stripes">
 		<script type="text/javascript">
 		var statisticsURL = "<c:url value='/monitoring/getStatistics.do' />?toolContentID="+${notebookDTO.toolContentId}+"&reqID=";
@@ -57,5 +57,3 @@
 		<div class="footer"></div>					
 	</body>
 </lams:html>
-
-
Index: lams_tool_notebook/web/pages/monitoring/summary.jsp
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_notebook/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_notebook/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -3,23 +3,16 @@
 <c:set scope="request" var="tool"><lams:WebAppURL/></c:set>
 
 <link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet"/>
+<link type="text/css" href="${lams}css/free.ui.jqgrid.min.css" rel="stylesheet">
 <link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet"/>
-<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet"/>
-
-<style media="screen,projection" type="text/css">
-	 .ui-jqgrid {
-		border-left-style: none !important;
-		border-right-style: none !important;
-		border-bottom-style: none !important;
+<style>
+	/* remove jqGrid border radius */
+	.ui-jqgrid.ui-jqgrid-bootstrap {
+	    border-radius:0;
+	    -moz-border-radius:0;
+	    -webkit-border-radius:0;
+	    -khtml-border-radius:0;
 	}
-	
-	.ui-jqgrid tr {
-		border-left-style: none !important;
-	}
-	
-	.ui-jqgrid td {
-		border-style: none !important;
-	}
 </style>
 
 <script type="text/javascript">
@@ -36,33 +29,65 @@
 	};
 
 	$(document).ready(function(){
- 
+		
 		<c:forEach var="sessionEntry" items="${notebookDTO.sessions}">
 			<c:set var="sessionId" value ="${sessionEntry.key}"/>
 			<c:set var="sessionName" value ="${sessionEntry.value}"/>
 			
 			jQuery("#group${sessionId}").jqGrid({
-			
-				url: "<c:url value='/monitoring/getUsers.do?toolSessionID=${sessionId}'/>",
 				datatype: 'json',
+				url: "<c:url value='/monitoring/getUsers.do?toolSessionID=${sessionId}'/>",
+				autoencode:false,
+				pager : '#group${sessionId}pager',
+				pagerpos: "left",
+				rowNum: 10,
+				rowList:[10,20,30,40,50,100],
+				height: 'auto',
+				autowidth: true,
+				shrinkToFit: false,
+			   	multiselect: false,
+				guiStyle: "bootstrap",
+				iconSet: 'fontAwesome',
+			   	colNames:['#',
+						'userUid',
+ 						"<fmt:message key="label.user.name" />",
+ 					    "<fmt:message key="label.lastModified" />",
+					    "<fmt:message key="label.lastModified" />",
+					    "<fmt:message key="label.lastModified" />",
+	 				    'entry',
+					    "<fmt:message key="label.comment" />",  // comment summary for sorting
+					    'actualComment',
+	 					'userId',
+						'portraitId'
+				],
+			   	colModel:[
+			   		{name:'id',index:'id', width:10, hidden: true, search: false},
+			   		{name:'userUid',index:'userUid', width:0, hidden: true, search: false},
+ 			   		{name:'userName',index:'userName', width:200, formatter:userNameFormatter},
+ 			   		{name:'lastEdited',index:'lastEdited', hidden: true, width:0, search: false},		
+			   		{name:'lastEditedTimeago',index:'lastEditedTimeago', hidden: true, width:0,  search: false},		
+			   		{name:'lastEditedTimeagoOutput',index:'lastEditedTimeagoOutput', width:120, search: false},		
+ 			   		{name:'entry',index:'entry', hidden: true, width:0, search: false},	
+			   		{name:'commentsort',index:'commentsort', width:40, search: false },
+			   		{name:'comment',index:'comment', hidden: true, width:0, search: false},
+ 			   		{name:'userId',index:'userId', width:0, hidden: true, search: false},
+			   		{name:'portraitId',index:'portraitId', width:0, hidden: true, search: false}
+			   	],
 				jsonReader : {
 				     root: "rows",
 				     page: "page",
 				     total: "total",
 				     records: "total_rows",
 				     repeatitems: false,
 				     id: "id",
-				   },
-				   
+				},
 				loadError: function(xhr, status, error){ 
 					alert("Error has occured "+error);
 				},	
-				
  				subGrid: true,
 			    subGridOptions: {
 			        reloadOnExpand: false, // Prevent jqGrid from wiping out the subgrid data.
 			    },
-
  				gridComplete: function() {	
   					initializePortraitPopover('${lams}');
 					var dop = $("#group${sessionId}");
@@ -124,44 +149,7 @@
  					    okButton: "<fmt:message key='button.ok' />",
  					    cancelButton: "<fmt:message key='button.cancel' />"
  					});
- 				},
- 
-				pager : '#group${sessionId}pager',
-				pagerpos: "left",
-				rowNum: 10,
-				rowList:[10,20,30,40,50,100],
-				
-				height: 'auto',
-				autowidth: true,
-				shrinkToFit: false,
-				
-			   	colNames:['#',
-						'userUid',
- 						"<fmt:message key="label.user.name" />",
- 					    "<fmt:message key="label.lastModified" />",
-					    "<fmt:message key="label.lastModified" />",
-					    "<fmt:message key="label.lastModified" />",
-	 				    'entry',
-					    "<fmt:message key="label.comment" />",  // comment summary for sorting
-					    'actualComment',
-	 					'userId',
-						'portraitId'],
-					    
-			   	colModel:[
-			   		{name:'id',index:'id', width:10, hidden: true, search: false},
-			   		{name:'userUid',index:'userUid', width:0, hidden: true, search: false},
- 			   		{name:'userName',index:'userName', width:200, formatter:userNameFormatter},
- 			   		{name:'lastEdited',index:'lastEdited', hidden: true, width:0, search: false},		
-			   		{name:'lastEditedTimeago',index:'lastEditedTimeago', hidden: true, width:0,  search: false},		
-			   		{name:'lastEditedTimeagoOutput',index:'lastEditedTimeagoOutput', width:120, search: false},		
- 			   		{name:'entry',index:'entry', hidden: true, width:0, search: false},	
-			   		{name:'commentsort',index:'commentsort', width:40, search: false },
-			   		{name:'comment',index:'comment', hidden: true, width:0, search: false},
- 			   		{name:'userId',index:'userId', width:0, hidden: true, search: false},
-			   		{name:'portraitId',index:'portraitId', width:0, hidden: true, search: false}
-			   	],
-			   	
-			   	multiselect: false,
+ 				}
 			}).jqGrid('filterToolbar',{searchOnEnter: false});
 		</c:forEach>
 		 
@@ -186,8 +174,8 @@
         setTimeout(function(){ window.dispatchEvent(new Event('resize')); }, 300);
 
         function userNameFormatter (cellvalue, options, rowObject) {
-    			return definePortraitPopover(rowObject.portraitId, rowObject.userId,  rowObject.userName);
-	    	}
+    		return definePortraitPopover(rowObject.portraitId, rowObject.userId,  rowObject.userName);
+	    }
 	});
 
 </script>
Index: lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -46,9 +46,12 @@
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
 		
 		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
+		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
@@ -57,19 +60,40 @@
 			'minLength' : 2,
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
-				var index = ui.content.length;
+				var index = ui.content.length - 1,
+					// if result is empty, term and outcome add enabled come as objects (label, value)
+					// if there are results, they come as simple values
+					outcomeAddEnabled = ui.content[index] instanceof Object ? ui.content[index].label : ui.content[index],
+					// convert to boolean
+					outcomeAddEnabled = outcomeAddEnabled == 'true',
+					term = ui.content[index - 1] instanceof Object ? ui.content[index - 1].label : ui.content[index - 1],
+					sameNameFound = false;
+				index--;
+				ui.content.splice(index, 2);
 				while(index--) {
+					var label = ui.content[index].label;
+					if (label.split('(')[0].trim() == term) {
+						// do not offer to create an output which perfectly matches an existing one
+						sameNameFound = true;
+					}
 					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
 						ui.content.splice(index, 1);
 					}
 				}
+				if (outcomeAddEnabled && !sameNameFound) {
+					ui.content.push({
+						'label' : term + ' ' + outcomeCreateNewLabel
+					});
+				}
 			},
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
 					'data': $.extend({
-						'outcomeId' : ui.item.value
+						'outcomeId' : ui.item.value,
+						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
+						'name'		: ui.item.value ? null : ui.item.label.replace(outcomeCreateNewLabel, '')
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
 					'cache' : false,
@@ -109,10 +133,12 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
 												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
 						outcomeButton.click(function(){
-							removeOutcomeMapping(this);
+							if (confirm(outcomeMappingRemoveConfirm)) {
+								removeOutcomeMapping(this);
+							}
 						});
 					});
 				}
Index: lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -46,9 +46,12 @@
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
 		
 		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
+		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
@@ -57,19 +60,40 @@
 			'minLength' : 2,
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
-				var index = ui.content.length;
+				var index = ui.content.length - 1,
+					// if result is empty, term and outcome add enabled come as objects (label, value)
+					// if there are results, they come as simple values
+					outcomeAddEnabled = ui.content[index] instanceof Object ? ui.content[index].label : ui.content[index],
+					// convert to boolean
+					outcomeAddEnabled = outcomeAddEnabled == 'true',
+					term = ui.content[index - 1] instanceof Object ? ui.content[index - 1].label : ui.content[index - 1],
+					sameNameFound = false;
+				index--;
+				ui.content.splice(index, 2);
 				while(index--) {
+					var label = ui.content[index].label;
+					if (label.split('(')[0].trim() == term) {
+						// do not offer to create an output which perfectly matches an existing one
+						sameNameFound = true;
+					}
 					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
 						ui.content.splice(index, 1);
 					}
 				}
+				if (outcomeAddEnabled && !sameNameFound) {
+					ui.content.push({
+						'label' : term + ' ' + outcomeCreateNewLabel
+					});
+				}
 			},
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
 					'data': $.extend({
-						'outcomeId' : ui.item.value
+						'outcomeId' : ui.item.value,
+						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
+						'name'		: ui.item.value ? null : ui.item.label.replace(outcomeCreateNewLabel, '')
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
 					'cache' : false,
@@ -109,10 +133,12 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
 												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
 						outcomeButton.click(function(){
-							removeOutcomeMapping(this);
+							if (confirm(outcomeMappingRemoveConfirm)) {
+								removeOutcomeMapping(this);
+							}
 						});
 					});
 				}
Index: lams_tool_preview/web/includes/css/learning.scss
===================================================================
diff -u -r4d710be17dc384e90d10a8a57c9fe2f7c77c88e2 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_preview/web/includes/css/learning.scss	(.../learning.scss)	(revision 4d710be17dc384e90d10a8a57c9fe2f7c77c88e2)
+++ lams_tool_preview/web/includes/css/learning.scss	(.../learning.scss)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -48,7 +48,6 @@
 
 .ui-jqgrid tr.jqgrow td {
 	padding: 8px 8px 8px 8px;
-	white-space: normal !important;
 }
 
 .ui-jqgrid .ui-jqgrid-view {
Index: lams_tool_preview/web/pages/monitoring/criteria.jsp
===================================================================
diff -u -r7e71d3c117c81dda7bed5a8bfb1f3e01adc3c104 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_preview/web/pages/monitoring/criteria.jsp	(.../criteria.jsp)	(revision 7e71d3c117c81dda7bed5a8bfb1f3e01adc3c104)
+++ lams_tool_preview/web/pages/monitoring/criteria.jsp	(.../criteria.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -7,50 +7,52 @@
 
 <lams:html>
 <lams:head>
-	<title><fmt:message key="label.monitoring.heading" />
-	</title>
+	<title><fmt:message key="label.monitoring.heading" /></title>
 	<lams:headItems minimal="true"/>
+
 	<lams:css suffix="jquery.jRating"/>
 	<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
-	<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet" />
+	<link type="text/css" href="${lams}css/free.ui.jqgrid.min.css" rel="stylesheet">
 	<link type="text/css" href="<lams:WebAppURL/>includes/css/learning.css" rel="stylesheet" >
+	<style>
+		.tablediv {
+		    padding: 5px;
+		}
+	</style>
 
-<script type="text/javascript">
-	//var for jquery.jRating.js
-	var pathToImageFolder = "${lams}images/css/";
-		
-	//vars for rating.js
-	var MAX_RATES = 0,
-	MIN_RATES = 0,
-	COMMENTS_MIN_WORDS_LIMIT = 0,
-	MAX_RATINGS_FOR_ITEM = 0,
-	LAMS_URL = '',
-	COUNT_RATED_ITEMS = 0,
-	COMMENT_TEXTAREA_TIP_LABEL = '',
-	WARN_COMMENTS_IS_BLANK_LABEL = '',
-	WARN_MIN_NUMBER_WORDS_LABEL = '';
-</script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/bootstrap-material-design.min.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/monitorToolSummaryAdvanced.js" ></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/rating.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/portrait.js"></script>
-
+	<script type="text/javascript">
+		//var for jquery.jRating.js
+		var pathToImageFolder = "${lams}images/css/";
+			
+		//vars for rating.js
+		var MAX_RATES = 0,
+		MIN_RATES = 0,
+		COMMENTS_MIN_WORDS_LIMIT = 0,
+		MAX_RATINGS_FOR_ITEM = 0,
+		LAMS_URL = '',
+		COUNT_RATED_ITEMS = 0,
+		COMMENT_TEXTAREA_TIP_LABEL = '',
+		WARN_COMMENTS_IS_BLANK_LABEL = '',
+		WARN_MIN_NUMBER_WORDS_LABEL = '';
+	</script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/free.jquery.jqgrid.min.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/monitorToolSummaryAdvanced.js" ></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/rating.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/portrait.js"></script>
 </lams:head>
-<body class="stripes">
 
+<body class="stripes">
 	<lams:Page type="monitor" title="${criteria.title}">
 		<%@ include file="criteriapart.jsp" %>
- 		<span onclick="window.close()" class="btn btn-default voffset5 pull-right"><fmt:message key="label.close"/></span>
+		
+ 		<span onclick="window.close()" class="btn btn-default voffset20 pull-right">
+ 			<fmt:message key="label.close"/>
+ 		</span>
 	</lams:Page>
-	<!--closes content-->
 
-	<div id="footer">
-	</div>
-	<!--closes footer-->
-
+	<div id="footer"></div>
 </body>
 </lams:html>
\ No newline at end of file
Index: lams_tool_preview/web/pages/monitoring/criteriapart.jsp
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_preview/web/pages/monitoring/criteriapart.jsp	(.../criteriapart.jsp)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_preview/web/pages/monitoring/criteriapart.jsp	(.../criteriapart.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -21,9 +21,12 @@
 		jQuery("#group${toolSessionId}").jqGrid({
 		   	url: "<c:url value='/monitoring/getUsers.do'/>?toolContentId=${sessionMap.toolContentID}&toolSessionId=${toolSessionId}&criteriaId=${criteria.ratingCriteriaId}",
 			datatype: "json",
+			autoencode: false,
 			height: 'auto',
 			autowidth: true,
 			shrinkToFit: false,
+			guiStyle: "bootstrap",
+			iconSet: 'fontAwesome',
 		   	colNames:[
 				'itemId',
 				'<fmt:message key="label.user.name" />',
@@ -69,13 +72,8 @@
 							groupField : ['criteriaId'],
 							groupColumnShow : [false]
 						},
-						loadComplete: function(){
-							//remove empty subgrids
-					        var table_value = $('#'+subgridTableId).getGridParam('records');
-					        if(table_value === 0){
-					            $('#'+subgrid_id).parent().unbind('click').html('<fmt:message key="label.no.ratings.left" />');
-					        }
-						},
+						guiStyle: "bootstrap",
+						iconSet: 'fontAwesome',
 						colNames:[
 							'id',
 							'<fmt:message key="label.user.name" />',
@@ -88,6 +86,13 @@
 						   {name:'rating', index:'rating', width:200, align:"center",  title:false},
 						   {name:'criteriaId', width:0, hidden:true}
 						],
+						loadComplete: function(){
+							//remove empty subgrids
+					        var table_value = $('#'+subgridTableId).getGridParam('records');
+					        if(table_value === 0){
+					            $('#'+subgrid_id).parent().unbind('click').html('<fmt:message key="label.no.ratings.left" />');
+					        }
+						},
 						loadError: function(xhr,st,err) {
 					    	jQuery("#"+subgridTableId).clearGridData();
 					    	info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="gradebook.error.loaderror"/>", "<fmt:message key="label.ok"/>");
Index: lams_tool_preview/web/pages/monitoring/manageUsers.jsp
===================================================================
diff -u -r7e71d3c117c81dda7bed5a8bfb1f3e01adc3c104 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_preview/web/pages/monitoring/manageUsers.jsp	(.../manageUsers.jsp)	(revision 7e71d3c117c81dda7bed5a8bfb1f3e01adc3c104)
+++ lams_tool_preview/web/pages/monitoring/manageUsers.jsp	(.../manageUsers.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -9,7 +9,7 @@
 	<title><fmt:message key="label.monitoring.heading" /></title>
 	<lams:headItems minimal="true"/>
 	<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
-	<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet" />
+	<link type="text/css" href="${lams}css/free.ui.jqgrid.min.css" rel="stylesheet">
 	<link type="text/css" href="<lams:WebAppURL/>includes/css/learning.css" rel="stylesheet" />
 	<style type="text/css">
 		.ui-jqgrid-labels {
@@ -20,8 +20,7 @@
 		}	
 	</style>
 
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/free.jquery.jqgrid.min.js"></script>
 	<script type="text/javascript">
 	$(document).ready(function(){
 
@@ -35,6 +34,8 @@
 				height: 'auto',
 				autowidth: true,
 				shrinkToFit: false,
+				guiStyle: "bootstrap",
+				iconSet: 'fontAwesome',
 			   	colNames:[
 					'userUid',
 			   		'<fmt:message key="label.user.hidden" />',
Index: lams_tool_preview/web/pages/monitoring/reflections.jsp
===================================================================
diff -u -r7e71d3c117c81dda7bed5a8bfb1f3e01adc3c104 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_preview/web/pages/monitoring/reflections.jsp	(.../reflections.jsp)	(revision 7e71d3c117c81dda7bed5a8bfb1f3e01adc3c104)
+++ lams_tool_preview/web/pages/monitoring/reflections.jsp	(.../reflections.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -9,23 +9,17 @@
 
 <lams:html>
 <lams:head>
-	<title><fmt:message key="label.monitoring.heading" />
-	</title>
+	<title><fmt:message key="label.monitoring.heading" /></title>
 	<lams:headItems minimal="true"/>
 	
 	<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
-	<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet" />
-	<link type="text/css" href="<lams:WebAppURL/>includes/css/learning.css" rel="stylesheet" />
+	<link type="text/css" href="${lams}css/free.ui.jqgrid.min.css" rel="stylesheet">
 	
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
-
+	<script type="text/javascript" src="${lams}includes/javascript/free.jquery.jqgrid.min.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.timeago.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/timeagoi18n/jquery.timeago.${fn:toLowerCase(localeLanguage)}.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/portrait.js"></script>
-
 	<script type="text/javascript">
-	
 	$(document).ready(function(){
 
 			jQuery("#group${toolSessionId}").jqGrid({
@@ -34,6 +28,8 @@
 				height: 'auto',
 				autowidth: true,
 				shrinkToFit: false,
+				guiStyle: "bootstrap",
+				iconSet: 'fontAwesome',
 			   	colNames:[
 						'itemId',
 						'<fmt:message key="label.user.name" />',
@@ -88,10 +84,9 @@
 		}
 
 	});
-	
     </script>
-        
 </lams:head>
+
 <body class="stripes">
 
 	<c:set var="title"><fmt:message key="title.reflection"/></c:set>
Index: lams_tool_preview/web/pages/monitoring/summary.jsp
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_preview/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_preview/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -1,12 +1,10 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="webapp"><lams:WebAppURL/></c:set>
-
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 <c:set var="summaryList" value="${sessionMap.summaryList}"/>
 
 <link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
-<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet" />
 <lams:css suffix="jquery.jRating"/>
 <link type="text/css" href="${webapp}includes/css/learning.css" rel="stylesheet" >
 <style type="text/css">
@@ -32,7 +30,15 @@
 	COMMENT_TEXTAREA_TIP_LABEL = '',
 	WARN_COMMENTS_IS_BLANK_LABEL = '',
 	WARN_MIN_NUMBER_WORDS_LABEL = '';
-	
+</script>
+<script type="text/javascript" src="${lams}includes/javascript/monitorToolSummaryAdvanced.js" ></script>
+<script src="${lams}includes/javascript/download.js" type="text/javascript" ></script>
+<script src="${lams}includes/javascript/portrait.js" type="text/javascript" ></script>
+<script type="text/javascript">
+	function exportResults() {
+		var exportExcelUrl = '<c:url value="/monitoring/exportTeamReport.do"/>?sessionMapID=${sessionMapID}&toolSessionId=${groupSummary.sessionId}&toolContentID=${sessionMap.toolContentID}';
+		return downloadFile(exportExcelUrl, 'messageArea_Busy', '<fmt:message key="label.file.downloaded"/>', 'messageArea', 'btn-disable-on-submit');
+	}
 	function sendResults(sessionId) {
 		var url = "<c:url value="/monitoring/sendResultsToSessionUsers.do"/>";
 		$("#messageArea").html("");
@@ -53,23 +59,8 @@
 		);
 		return false;
 	}
-	
 </script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/monitorToolSummaryAdvanced.js" ></script>
-<script src="${lams}includes/javascript/jquery.jRating.js" type="text/javascript"></script>
-<script src="${lams}includes/javascript/rating.js" type="text/javascript" ></script>
-<script src="${lams}includes/javascript/download.js" type="text/javascript" ></script>
-<script src="${lams}includes/javascript/portrait.js" type="text/javascript" ></script>
 
-<script type="text/javascript">
-	function exportResults() {
-		var exportExcelUrl = '<c:url value="/monitoring/exportTeamReport.do"/>?sessionMapID=${sessionMapID}&toolSessionId=${groupSummary.sessionId}&toolContentID=${sessionMap.toolContentID}';
-		return downloadFile(exportExcelUrl, 'messageArea_Busy', '<fmt:message key="label.file.downloaded"/>', 'messageArea', 'btn-disable-on-submit');
-	}
-</script>
-
 <div class="card card-no-border">
 	<h4>
 	    <c:out value="${sessionMap.peerreview.title}" escapeXml="true"/>
Index: lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -46,9 +46,12 @@
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
 		
 		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
+		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
@@ -57,19 +60,40 @@
 			'minLength' : 2,
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
-				var index = ui.content.length;
+				var index = ui.content.length - 1,
+					// if result is empty, term and outcome add enabled come as objects (label, value)
+					// if there are results, they come as simple values
+					outcomeAddEnabled = ui.content[index] instanceof Object ? ui.content[index].label : ui.content[index],
+					// convert to boolean
+					outcomeAddEnabled = outcomeAddEnabled == 'true',
+					term = ui.content[index - 1] instanceof Object ? ui.content[index - 1].label : ui.content[index - 1],
+					sameNameFound = false;
+				index--;
+				ui.content.splice(index, 2);
 				while(index--) {
+					var label = ui.content[index].label;
+					if (label.split('(')[0].trim() == term) {
+						// do not offer to create an output which perfectly matches an existing one
+						sameNameFound = true;
+					}
 					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
 						ui.content.splice(index, 1);
 					}
 				}
+				if (outcomeAddEnabled && !sameNameFound) {
+					ui.content.push({
+						'label' : term + ' ' + outcomeCreateNewLabel
+					});
+				}
 			},
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
 					'data': $.extend({
-						'outcomeId' : ui.item.value
+						'outcomeId' : ui.item.value,
+						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
+						'name'		: ui.item.value ? null : ui.item.label.replace(outcomeCreateNewLabel, '')
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
 					'cache' : false,
@@ -109,10 +133,12 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
 												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
 						outcomeButton.click(function(){
-							removeOutcomeMapping(this);
+							if (confirm(outcomeMappingRemoveConfirm)) {
+								removeOutcomeMapping(this);
+							}
 						});
 					});
 				}
Index: lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -46,9 +46,12 @@
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
 		
 		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
+		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
@@ -57,19 +60,40 @@
 			'minLength' : 2,
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
-				var index = ui.content.length;
+				var index = ui.content.length - 1,
+					// if result is empty, term and outcome add enabled come as objects (label, value)
+					// if there are results, they come as simple values
+					outcomeAddEnabled = ui.content[index] instanceof Object ? ui.content[index].label : ui.content[index],
+					// convert to boolean
+					outcomeAddEnabled = outcomeAddEnabled == 'true',
+					term = ui.content[index - 1] instanceof Object ? ui.content[index - 1].label : ui.content[index - 1],
+					sameNameFound = false;
+				index--;
+				ui.content.splice(index, 2);
 				while(index--) {
+					var label = ui.content[index].label;
+					if (label.split('(')[0].trim() == term) {
+						// do not offer to create an output which perfectly matches an existing one
+						sameNameFound = true;
+					}
 					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
 						ui.content.splice(index, 1);
 					}
 				}
+				if (outcomeAddEnabled && !sameNameFound) {
+					ui.content.push({
+						'label' : term + ' ' + outcomeCreateNewLabel
+					});
+				}
 			},
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
 					'data': $.extend({
-						'outcomeId' : ui.item.value
+						'outcomeId' : ui.item.value,
+						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
+						'name'		: ui.item.value ? null : ui.item.label.replace(outcomeCreateNewLabel, '')
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
 					'cache' : false,
@@ -109,10 +133,12 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
 												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
 						outcomeButton.click(function(){
-							removeOutcomeMapping(this);
+							if (confirm(outcomeMappingRemoveConfirm)) {
+								removeOutcomeMapping(this);
+							}
 						});
 					});
 				}
Index: lams_tool_scratchie/web/includes/css/scratchie-learning.scss
===================================================================
diff -u -r4d710be17dc384e90d10a8a57c9fe2f7c77c88e2 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_scratchie/web/includes/css/scratchie-learning.scss	(.../scratchie-learning.scss)	(revision 4d710be17dc384e90d10a8a57c9fe2f7c77c88e2)
+++ lams_tool_scratchie/web/includes/css/scratchie-learning.scss	(.../scratchie-learning.scss)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -33,4 +33,56 @@
 .jGrowl-message {
 	padding-left: 60px;
 	padding-top: 5px;
+}
+
+.burning-question-container {
+	padding: 0 15px;
+}
+.answer-description {
+	margin-right: 20px;
+}
+.answer-with-confidence-level-portrait {
+	align-items: center;
+}
+.c100.small {
+	font-size: 41px;
+	margin-right: 5px;
+	margin-bottom: 23px;
+}
+.confidence-level-percentage {
+	font-size: 13px;
+    margin-top: 43px;
+    text-align: center;
+}
+hr.hr-confidence-level {
+    border-top: dotted 1px;
+    border-color: #ccc;
+    margin-top: 10px;
+    margin-bottom: 15px;
+}
+.lead {
+	margin-top: 30px;
+}
+[data-toggle="collapse"].collapsed .if-not-collapsed {
+  display: none;
+}
+[data-toggle="collapse"]:not(.collapsed) .if-collapsed {
+  display: none;
+}
+	
+/* confidence levels tooltips */
+.tooltip.top .tooltip-inner {
+    background-color:white;
+    color:black;
+    border:  1px solid #ddd;
+}
+.tooltip.top .tooltip-arrow {
+      border-top-color:grey;
+      color:black;
+}
+.tooltip {
+background-color: transparent;
+border: none;
+color:black;
+box-shadow:none;
 }
\ No newline at end of file
Index: lams_tool_scratchie/web/pages/authoring/parts/additem.jsp
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_scratchie/web/pages/authoring/parts/additem.jsp	(.../additem.jsp)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_scratchie/web/pages/authoring/parts/additem.jsp	(.../additem.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -233,7 +233,7 @@
 
 				<div class="form-group">
 					<label for="description"><fmt:message key="label.authoring.basic.question.text" /></label>
-					<lams:CKEditor id="description" value="${authoringForm.description}" contentFolderID="${authoringForm.contentFolderID}"></lams:CKEditor>
+					<lams:CKEditor id="description" value="${scratchieItemForm.description}" contentFolderID="${authoringForm.contentFolderID}"></lams:CKEditor>
 				</div>
 
 				<label for="hasAnswerFilled" class="error" style="display: none;"></label>
Index: lams_tool_scratchie/web/pages/learning/learning.jsp
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="lams">
-	<lams:LAMSURL />
-</c:set>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+<c:set var="tool"><lams:WebAppURL/></c:set>
+<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
 <%-- param has higher level for request attribute --%>
 <c:if test="${not empty param.sessionMapID}">
 	<c:set var="sessionMapID" value="${param.sessionMapID}" />
@@ -18,51 +18,41 @@
 <lams:html>
 <lams:head>
 	<title><fmt:message key="label.learning.title" /></title>
-	<%@ include file="/common/header.jsp"%>
+
+	<!-- ********************  CSS ********************** -->
+	<lams:css />
+	<link href="<lams:WebAppURL/>includes/css/scratchie.css" rel="stylesheet" type="text/css">
 	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.countdown.css" />
 	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.jgrowl.css" />
 	<link rel="stylesheet" type="text/css" href="${lams}css/circle.css" />
 	<link rel="stylesheet" type="text/css" href="<lams:WebAppURL/>includes/css/scratchie-learning.css" />
 	<style type="text/css">
-		.burning-question-container {
-			padding: 0 15px;
-		}
-		.answer-description {
-			margin-right: 20px;
-		}
-		.answer-with-confidence-level-portrait {
-			display: flex;
-			flex-wrap: wrap;
-   			align-items: center;
-		}
-		.c100.small {
-			font-size: 41px;
-			margin-right: 5px;
-			margin-bottom: 23px;
-		}
-		.confidence-level-percentage {
-			font-size: 13px;
-		    margin-top: 43px;
-		    text-align: center;
-		}
-		.lead {
-			margin-top: 30px;
-		}
-		[data-toggle="collapse"].collapsed .if-not-collapsed {
-		  display: none;
-		}
-		[data-toggle="collapse"]:not(.collapsed) .if-collapsed {
-		  display: none;
-		}
+
 	</style>
 
+	<!-- ********************  javascript ********************** -->
+	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
+	<script>
+		//Resolve name collision between jQuery UI and Twitter Bootstrap
+		$.widget.bridge('uitooltip', $.ui.tooltip);
+	</script>
+	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.timeago.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.plugin.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.countdown.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.jgrowl.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.form.js"></script>
 	<script type="text/javascript">
+
+		$(document).ready(function(){
+			//initialize tooltips showing user names next to confidence levels
+			$('[data-toggle="tooltip"]').tooltip();
+		});
+	
 		function scratchImage(itemUid, answerUid, isCorrect) {
 			// first show animation, then put static image
 			var imageSuffix = isCorrect ? 'correct' : 'wrong';
Index: lams_tool_scratchie/web/pages/learning/results.jsp
===================================================================
diff -u -r6e5015d036550bcae770b2125000995c79c3dea2 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_scratchie/web/pages/learning/results.jsp	(.../results.jsp)	(revision 6e5015d036550bcae770b2125000995c79c3dea2)
+++ lams_tool_scratchie/web/pages/learning/results.jsp	(.../results.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -28,18 +28,6 @@
 		.burning-question-dto {
 			padding-bottom: 5px; 
 		}
-	    .ui-jqgrid tr.jqgrow td {
-	        word-wrap: break-word; /* IE 5.5+ and CSS3 */
-	        white-space: pre-wrap; /* CSS3 */
-	        white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
-	        white-space: -pre-wrap; /* Opera 4-6 */
-	        white-space: -o-pre-wrap; /* Opera 7 */
-	        overflow: hidden;
-	        height: auto;
-	        vertical-align: middle;
-	        padding-top: 3px;
-	        padding-bottom: 3px
-	    }
 	    
 	    /* when item is editable - show pencil icon on hover */
 	    .burning-question-text:hover +span+ i, /* when link is hovered select i */
Index: lams_tool_scratchie/web/pages/learning/scratchies.jsp
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_scratchie/web/pages/learning/scratchies.jsp	(.../scratchies.jsp)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_scratchie/web/pages/learning/scratchies.jsp	(.../scratchies.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -1,4 +1,4 @@
-<c:forEach var="item" items="${sessionMap.itemList}" varStatus="status">
+<c:forEach var="item" items="${sessionMap.itemList}">
 	<div class="lead">
         <a name="${item.title}" style="text-decoration:none;color:black"><c:out value="${item.title}" escapeXml="true" /></a>
 	</div>
@@ -41,32 +41,36 @@
 					</c:if>
 				</td>
 
-				<td 
+				<td
 					<c:if test="${fn:length(answer.confidenceLevelDtos) > 0}">class="answer-with-confidence-level-portrait"</c:if>
 				>
 					<div class="answer-description">
 						<c:out value="${answer.description}" escapeXml="false" />
 					</div>
 					
-					<c:if test="${scratchie.confidenceLevelsActivityUiid != null}">
+					<c:if test="${fn:length(answer.confidenceLevelDtos) > 0}">
+						<hr class="hr-confidence-level" />
+					
 						<div>
-							<c:forEach var="confidenceLevelDto" items="${answer.confidenceLevelDtos}" varStatus="status">
-							
-								<div class="c100 p${confidenceLevelDto.level}0 small">
+							<c:forEach var="confidenceLevelDto" items="${answer.confidenceLevelDtos}">
+
+								<div class="c100 p${confidenceLevelDto.level}0 small" data-toggle="tooltip" data-placement="top" title="${confidenceLevelDto.userName}">
 									<span>
 										<c:choose>
-										<c:when test="${confidenceLevelDto.portraitUuid == null}">
-											<div class="portrait-generic-sm portrait-color-${confidenceLevelDto.userId % 7}"></div>
-										</c:when>
-										<c:otherwise>
+											<c:when test="${confidenceLevelDto.portraitUuid == null}">
+												<div class="portrait-generic-sm portrait-color-${confidenceLevelDto.userId % 7}"></div>
+											</c:when>
+											<c:otherwise>
 			    								<img class="portrait-sm portrait-round" src="${lams}download/?uuid=${confidenceLevelDto.portraitUuid}&preferDownload=false&version=4" alt="">
-										</c:otherwise>
+											</c:otherwise>
 										</c:choose>
 									</span>
+									
 									<div class="slice">
 										<div class="bar"></div>
 										<div class="fill"></div>
 									</div>
+									
 									<div class="confidence-level-percentage">
 										${confidenceLevelDto.level}0%
 									</div>
Index: lams_tool_scratchie/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_scratchie/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_scratchie/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -12,17 +12,16 @@
 	<lams:css/>
 	<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
 	<link type="text/css" href="${lams}css/thickbox.css" rel="stylesheet"  media="screen">
-	<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet" />
 	<link href="${lams}css/jquery-ui.timepicker.css" rel="stylesheet" type="text/css" >
+	<link href="${lams}css/free.ui.jqgrid.min.css" rel="stylesheet" type="text/css">
 	<lams:css suffix="chart"/>
 		
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.timepicker.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/free.jquery.jqgrid.min.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/thickbox.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/popper.min.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/bootstrap-material-design.min.js"></script>
Index: lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp	(.../itemSummary.jsp)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp	(.../itemSummary.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -9,35 +9,44 @@
 		<%@ include file="/common/header.jsp"%>
 		
 		<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
-		<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet" />
+		<link href="${lams}css/free.ui.jqgrid.min.css" rel="stylesheet" type="text/css">
 		<style type="text/css">
+			/* remove jqGrid borders */
 			.ui-jqgrid {
 				border-left-style: none !important;
 				border-right-style: none !important;
 				border-bottom-style: none !important;
 			}
-			
 			.ui-jqgrid tr {
 				border-left-style: none !important;
 			}
-			
 			.ui-jqgrid td {
 				border-style: none !important;
 			}
+			
+			/* remove jqGrid border radius */
+			.ui-jqgrid.ui-jqgrid-bootstrap {
+			    border-radius:0;
+			    -moz-border-radius:0;
+			    -webkit-border-radius:0;
+			    -khtml-border-radius:0;
+			}
 		</style>
 		
 		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
- 		<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
- 		<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
+ 		<script type="text/javascript" src="${lams}includes/javascript/free.jquery.jqgrid.min.js"></script>
   	    <script>
 	  	  	$(document).ready(function(){
 	  			<c:forEach var="summary" items="${summaryList}" varStatus="status">
 		  			
 	  				jQuery("#session${summary.sessionId}").jqGrid({
 	  					datatype: "local",
+	  					autoencode:false,
 	  					rowNum: 10000,
 	  					height: 'auto',
 	  					width: '100%',
+	  					guiStyle: "bootstrap",
+	  					iconSet: 'fontAwesome',
 	  				   	colNames:["<fmt:message key="label.monitoring.summary.answer" />"
 		  			  	   	        <c:forEach var="answer" items="${summary.answers}" varStatus="i">
 		  			  	   	 			,"<fmt:message key="label.monitoring.summary.choice" />&nbsp;${i.index + 1}"
Index: lams_tool_scratchie/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rd333f87f1b5deb8fff4c4ee1325ed4d4d36b03cf -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_scratchie/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision d333f87f1b5deb8fff4c4ee1325ed4d4d36b03cf)
+++ lams_tool_scratchie/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -4,8 +4,9 @@
 <c:set var="summaryList" value="${sessionMap.summaryList}"/>
 <c:set var="scratchie" value="${sessionMap.scratchie}"/>
 
-<style media="screen,projection" type="text/css">
-	 .ui-jqgrid {
+<style type="text/css">
+	/* remove jqGrid borders */
+	.ui-jqgrid {
 		border-left-style: none !important;
 		border-right-style: none !important;
 		border-bottom-style: none !important;
@@ -16,15 +17,21 @@
 	.ui-jqgrid td {
 		border-style: none !important;
 	}
+	
 	.ui-jqgrid tr.jqgrow td {
-	    white-space: normal !important;
-	    height:auto;
-	    vertical-align:text-top;
 	    padding-top:2px;
 	}
 	.ui-jqgrid tr.jqgrow td {
 		vertical-align:middle !important
 	}
+	
+	/* remove jqGrid border radius */
+	.ui-jqgrid.ui-jqgrid-bootstrap {
+	    border-radius:0;
+	    -moz-border-radius:0;
+	    -webkit-border-radius:0;
+	    -khtml-border-radius:0;
+	}
 </style>
 
 <script type="text/javascript">
@@ -39,13 +46,8 @@
 				height: 'auto',
 				autowidth: true,
 				shrinkToFit: false,
-			   	ondblClickRow: function(rowid) {
-			   		var userId = jQuery("#list${summary.sessionId}").getCell(rowid, 'userId');
-			   		var toolSessionId = jQuery("#list${summary.sessionId}").getCell(rowid, 'sessionId');
-
-			   		var userSummaryUrl = "<c:url value='/learning/start.do'/>?userID=" + userId + "&toolSessionID=" + toolSessionId + "&mode=teacher&reqId=" + (new Date()).getTime();
-					launchPopup(userSummaryUrl, "MonitoringReview");		
-			  	},
+				guiStyle: "bootstrap",
+				iconSet: 'fontAwesome',
 			   	colNames:[
 				   	'#',
 					'userId',
@@ -64,6 +66,13 @@
 			   		{name:'mark', index:'mark', width:100, align:"right", sorttype:"int", editable:true, editoptions: {size:4, maxlength: 4}},
 			   		{name:'portraitId', index:'portraitId', width:0, hidden: true},
 			   	],
+			   	ondblClickRow: function(rowid) {
+			   		var userId = jQuery("#list${summary.sessionId}").getCell(rowid, 'userId');
+			   		var toolSessionId = jQuery("#list${summary.sessionId}").getCell(rowid, 'sessionId');
+
+			   		var userSummaryUrl = "<c:url value='/learning/start.do'/>?userID=" + userId + "&toolSessionID=" + toolSessionId + "&mode=teacher&reqId=" + (new Date()).getTime();
+					launchPopup(userSummaryUrl, "MonitoringReview");		
+			  	},
 			   	// caption: "${summary.sessionName}",
 				cellurl: '<c:url value="/monitoring/saveUserMark.do"/>',
   				cellEdit: true,
@@ -114,6 +123,8 @@
 				height: 'auto',
 				autowidth: true,
 				shrinkToFit: false,
+				guiStyle: "bootstrap",
+				iconSet: 'fontAwesome',
 			   	colNames:['#',
 						"<fmt:message key='label.monitoring.summary.user.name' />",
 					    "<fmt:message key='label.burning.questions' />",
@@ -124,8 +135,7 @@
 			   		{name:'groupName', index:'groupName', width:150},
 			   		{name:'feedback', index:'feedback', width:520},
 			   		{name:'count', index:'count', align:"right", width:70}
-			   	],
-			   	// caption: "${scratchieItem.title}"
+			   	]
 			});
 			
 			<c:forEach var="burningQuestionDto" items="${burningQuestionItemDto.burningQuestionDtos}" varStatus="i">
Index: lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp	(.../burningQuestions.jsp)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp	(.../burningQuestions.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -1,8 +1,49 @@
-<%@ include file="/common/taglibs.jsp"%>         
+<%@ include file="/common/taglibs.jsp"%>
+<script>
+	$(document).ready(function(){
+		//handler for expand/collapse all button
+		$("#toggle-burning-questions-button").click(function() {
+			var isExpanded = eval($(this).data("expanded"));
+				
+			//fire the actual buttons so burning questions can be closed/expanded
+			if (isExpanded) {
+				$(".burning-question-title:not('.collapsed')").each(function() {
+					this.click();
+				});
+								
+			} else {
+				$(".burning-question-title.collapsed").each(function() {
+					this.click();
+				});					
+			}
 
+			//change button label
+			var newButtonLabel = isExpanded ? "<fmt:message key='label.expand.all' />" : "<fmt:message key='label.collapse.all' />";
+			$(".hidden-xs", $(this)).text(newButtonLabel);
+
+			//change button icon
+			if (isExpanded) {
+				$(".fa", $(this)).removeClass("fa-minus-circle").addClass("fa-plus-circle");
+			} else {
+				$(".fa", $(this)).removeClass("fa-plus-circle").addClass("fa-minus-circle");
+			}
+
+			//change button's data-expanded attribute
+			$(this).data("expanded", !isExpanded);
+		});
+	});
+</script>
+
 <!-- Header -->
 <div class="row no-gutter">
-	<div class="col-xs-12 col-md-12 col-lg-8">
+	<div class="col-xs-12">
+        <button type="button" id="toggle-burning-questions-button" class="btn btn-sm btn-default pull-right voffset20" data-expanded="false">
+           	<i class="fa fa-plus-circle"></i> 
+           	<span class="hidden-xs">
+           		<fmt:message key='label.expand.all' />
+           	</span>
+        </button>
+            
 		<h3>
 			<fmt:message key="label.burning.questions"/>
 		</h3>
@@ -11,7 +52,7 @@
 <!-- End header -->              
 
 <!-- Tables -->
-<div class="row no-gutter">
+<div class="row no-gutter voffset10">
 <div class="col-xs-12 col-md-12 col-lg-12">
 
 	<c:forEach var="burningQuestionItemDto" items="${burningQuestionItemDtos}" varStatus="i">
@@ -21,49 +62,63 @@
 		<div class="card card-plain">
 			<div class="card-header">
 				<h4 class="card-title card-collapse">
+					
+					<!-- Don't display number prior to general burning question -->
+					<c:set var="itemTitle">
+						<c:choose>
+							<c:when test="${burningQuestionItemDto.scratchieItem.uid == 0}">
+								<c:out value="${item.title}" escapeXml="false"/>
+							</c:when>
+							<c:otherwise>
+								Q${i.index+1}) <c:out value="${item.title}" escapeXml="false"/> 
+							</c:otherwise>
+						</c:choose>
+					</c:set>
+				
 					<c:choose>
-						<c:when test="${burningQsCount != 0}">
+						<c:when test="${burningQsCount > 0}">
 							<a data-toggle="collapse" data-itemuid="${item.uid}" class="collapsed burning-question-title">
-								Q${i.index+1}) <c:out value="${item.title}" escapeXml="false"/>
+								${itemTitle}
 							</a>
+							
+							<span class="badge pull-right" style="margin-right: 4px">${burningQsCount}</span>
 						</c:when>
 						<c:otherwise>
-							Q${i.index+1}) <c:out value="${item.title}" escapeXml="false"/> 
+							${itemTitle} 
 						</c:otherwise>
 					</c:choose>
-					<span class="burning-question-description">
-						<c:out value="${item.description}" escapeXml="false"/> 
-					</span>
-                    <c:if test="${burningQsCount > 0}">
-					   <span class="badge pull-right" style="margin-right: 4px">${burningQsCount}</span>
-                    </c:if>    
 				</h4>
 			</div>
 		
 			<c:if test="${burningQsCount > 0}">
 				<div id="collapse-${item.uid}" class="card-collapse collapse">
 				<div class="card-body">
-				<div class="table-responsive">
-					<table class="table table-striped table-bordered table-hover">
-						<tbody>
-							<c:forEach var="burningQuestionDto" items="${burningQuestionItemDto.burningQuestionDtos}">
-								<tr>
-									<td class="text-nowrap">
-										<c:out value="${burningQuestionDto.sessionName}" escapeXml="false"/>
-									</td>
-									<td>
-										${burningQuestionDto.escapedBurningQuestion}
-									</td>
-									<td class="text-nowrap">
-										<span class="badge">${burningQuestionDto.likeCount}</span> &nbsp; <i class="fa fa-thumbs-o-up" style="color:darkblue"></i>
-									</td>
-								</tr>
-							</c:forEach>
-						</tbody>
-					</table>
+				
+					<span class="burning-question-description">
+						<c:out value="${item.description}" escapeXml="false"/> 
+					</span>
+					
+					<div class="table-responsive">
+						<table class="table table-striped table-bordered table-hover">
+							<tbody>
+								<c:forEach var="burningQuestionDto" items="${burningQuestionItemDto.burningQuestionDtos}">
+									<tr>
+										<td class="text-nowrap">
+											<c:out value="${burningQuestionDto.sessionName}" escapeXml="false"/>
+										</td>
+										<td>
+											${burningQuestionDto.escapedBurningQuestion}
+										</td>
+										<td class="text-nowrap">
+											<span class="badge">${burningQuestionDto.likeCount}</span> &nbsp; <i class="fa fa-thumbs-o-up" style="color:darkblue"></i>
+										</td>
+									</tr>
+								</c:forEach>
+							</tbody>
+						</table>
+					</div>
 				</div>
 				</div>
-				</div>
 			</c:if>
 			
 		</div>
Index: lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp	(.../tra.jsp)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp	(.../tra.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -1,4 +1,10 @@
 <%@ include file="/common/taglibs.jsp"%>
+<style>
+	#barChart {
+		width: 515px !important; 
+		height: 240px !important;
+	}
+</style>
 
 <!-- ChartJS. Colour used is brand-primary for purple skin. -->
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/chartjs.js"></script>
@@ -115,7 +121,7 @@
 			</div>
 			
 			<div class="card-body">
-				<canvas id="barChart" height="240" width="515" style="width: 515px; height: 240px;"></canvas>
+				<canvas id="barChart" height="240" width="515"></canvas>
 			</div>
 		</div>  
 	</div>
Index: lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp	(.../traStudentChoices.jsp)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp	(.../traStudentChoices.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -1,4 +1,10 @@
 <%@ include file="/common/taglibs.jsp"%>
+<style>
+	/* show horizontal scroller for iPads */
+	body {
+	    -webkit-overflow-scrolling: touch;
+	}
+</style>
 
 <script>
 	function exportExcel(){
Index: lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -46,9 +46,12 @@
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
 		
 		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
+		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
@@ -57,19 +60,40 @@
 			'minLength' : 2,
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
-				var index = ui.content.length;
+				var index = ui.content.length - 1,
+					// if result is empty, term and outcome add enabled come as objects (label, value)
+					// if there are results, they come as simple values
+					outcomeAddEnabled = ui.content[index] instanceof Object ? ui.content[index].label : ui.content[index],
+					// convert to boolean
+					outcomeAddEnabled = outcomeAddEnabled == 'true',
+					term = ui.content[index - 1] instanceof Object ? ui.content[index - 1].label : ui.content[index - 1],
+					sameNameFound = false;
+				index--;
+				ui.content.splice(index, 2);
 				while(index--) {
+					var label = ui.content[index].label;
+					if (label.split('(')[0].trim() == term) {
+						// do not offer to create an output which perfectly matches an existing one
+						sameNameFound = true;
+					}
 					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
 						ui.content.splice(index, 1);
 					}
 				}
+				if (outcomeAddEnabled && !sameNameFound) {
+					ui.content.push({
+						'label' : term + ' ' + outcomeCreateNewLabel
+					});
+				}
 			},
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
 					'data': $.extend({
-						'outcomeId' : ui.item.value
+						'outcomeId' : ui.item.value,
+						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
+						'name'		: ui.item.value ? null : ui.item.label.replace(outcomeCreateNewLabel, '')
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
 					'cache' : false,
@@ -109,10 +133,12 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
 												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
 						outcomeButton.click(function(){
-							removeOutcomeMapping(this);
+							if (confirm(outcomeMappingRemoveConfirm)) {
+								removeOutcomeMapping(this);
+							}
 						});
 					});
 				}
Index: lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -46,9 +46,12 @@
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
 		
 		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
+		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
@@ -57,19 +60,40 @@
 			'minLength' : 2,
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
-				var index = ui.content.length;
+				var index = ui.content.length - 1,
+					// if result is empty, term and outcome add enabled come as objects (label, value)
+					// if there are results, they come as simple values
+					outcomeAddEnabled = ui.content[index] instanceof Object ? ui.content[index].label : ui.content[index],
+					// convert to boolean
+					outcomeAddEnabled = outcomeAddEnabled == 'true',
+					term = ui.content[index - 1] instanceof Object ? ui.content[index - 1].label : ui.content[index - 1],
+					sameNameFound = false;
+				index--;
+				ui.content.splice(index, 2);
 				while(index--) {
+					var label = ui.content[index].label;
+					if (label.split('(')[0].trim() == term) {
+						// do not offer to create an output which perfectly matches an existing one
+						sameNameFound = true;
+					}
 					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
 						ui.content.splice(index, 1);
 					}
 				}
+				if (outcomeAddEnabled && !sameNameFound) {
+					ui.content.push({
+						'label' : term + ' ' + outcomeCreateNewLabel
+					});
+				}
 			},
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
 					'data': $.extend({
-						'outcomeId' : ui.item.value
+						'outcomeId' : ui.item.value,
+						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
+						'name'		: ui.item.value ? null : ui.item.label.replace(outcomeCreateNewLabel, '')
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
 					'cache' : false,
@@ -109,10 +133,12 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
 												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
 						outcomeButton.click(function(){
-							removeOutcomeMapping(this);
+							if (confirm(outcomeMappingRemoveConfirm)) {
+								removeOutcomeMapping(this);
+							}
 						});
 					});
 				}
Index: lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -46,9 +46,12 @@
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
 		
 		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
+		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
@@ -57,19 +60,40 @@
 			'minLength' : 2,
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
-				var index = ui.content.length;
+				var index = ui.content.length - 1,
+					// if result is empty, term and outcome add enabled come as objects (label, value)
+					// if there are results, they come as simple values
+					outcomeAddEnabled = ui.content[index] instanceof Object ? ui.content[index].label : ui.content[index],
+					// convert to boolean
+					outcomeAddEnabled = outcomeAddEnabled == 'true',
+					term = ui.content[index - 1] instanceof Object ? ui.content[index - 1].label : ui.content[index - 1],
+					sameNameFound = false;
+				index--;
+				ui.content.splice(index, 2);
 				while(index--) {
+					var label = ui.content[index].label;
+					if (label.split('(')[0].trim() == term) {
+						// do not offer to create an output which perfectly matches an existing one
+						sameNameFound = true;
+					}
 					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
 						ui.content.splice(index, 1);
 					}
 				}
+				if (outcomeAddEnabled && !sameNameFound) {
+					ui.content.push({
+						'label' : term + ' ' + outcomeCreateNewLabel
+					});
+				}
 			},
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
 					'data': $.extend({
-						'outcomeId' : ui.item.value
+						'outcomeId' : ui.item.value,
+						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
+						'name'		: ui.item.value ? null : ui.item.label.replace(outcomeCreateNewLabel, '')
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
 					'cache' : false,
@@ -109,10 +133,12 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
 												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
 						outcomeButton.click(function(){
-							removeOutcomeMapping(this);
+							if (confirm(outcomeMappingRemoveConfirm)) {
+								removeOutcomeMapping(this);
+							}
 						});
 					});
 				}
Index: lams_tool_survey/web/pages/learning/resultOtherUsers.jsp
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_survey/web/pages/learning/resultOtherUsers.jsp	(.../resultOtherUsers.jsp)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_survey/web/pages/learning/resultOtherUsers.jsp	(.../resultOtherUsers.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -15,7 +15,7 @@
 	<%@ include file="/common/header.jsp"%>
 	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme.bootstrap.css">
 	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.pager.css">
-	<link type="text/css" href="${lams}/css/chart.css" rel="stylesheet" />
+	<link type="text/css" href="${lams}/css/defaultHTML_chart.css" rel="stylesheet" />
 	<style media="screen,projection" type="text/css">
 table.alternative-color td:first-child {
 	width: 25%;
Index: lams_tool_survey/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_survey/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_survey/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -42,7 +42,7 @@
 
 	<link type="text/css" href="${lams}/css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
 	<link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet"> 
-	<link type="text/css" href="${lams}/css/chart.css" rel="stylesheet" />
+	<link type="text/css" href="${lams}/css/defaultHTML_chart.css" rel="stylesheet" />
 		
 	 <script>
 			var initialTabId = "${initialTabId}";
Index: lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -46,9 +46,12 @@
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
 		
 		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
+		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
@@ -57,19 +60,40 @@
 			'minLength' : 2,
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
-				var index = ui.content.length;
+				var index = ui.content.length - 1,
+					// if result is empty, term and outcome add enabled come as objects (label, value)
+					// if there are results, they come as simple values
+					outcomeAddEnabled = ui.content[index] instanceof Object ? ui.content[index].label : ui.content[index],
+					// convert to boolean
+					outcomeAddEnabled = outcomeAddEnabled == 'true',
+					term = ui.content[index - 1] instanceof Object ? ui.content[index - 1].label : ui.content[index - 1],
+					sameNameFound = false;
+				index--;
+				ui.content.splice(index, 2);
 				while(index--) {
+					var label = ui.content[index].label;
+					if (label.split('(')[0].trim() == term) {
+						// do not offer to create an output which perfectly matches an existing one
+						sameNameFound = true;
+					}
 					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
 						ui.content.splice(index, 1);
 					}
 				}
+				if (outcomeAddEnabled && !sameNameFound) {
+					ui.content.push({
+						'label' : term + ' ' + outcomeCreateNewLabel
+					});
+				}
 			},
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
 					'data': $.extend({
-						'outcomeId' : ui.item.value
+						'outcomeId' : ui.item.value,
+						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
+						'name'		: ui.item.value ? null : ui.item.label.replace(outcomeCreateNewLabel, '')
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
 					'cache' : false,
@@ -109,10 +133,12 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
 												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
 						outcomeButton.click(function(){
-							removeOutcomeMapping(this);
+							if (confirm(outcomeMappingRemoveConfirm)) {
+								removeOutcomeMapping(this);
+							}
 						});
 					});
 				}
Index: lams_tool_task/web/common/monitorheader.jsp
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_task/web/common/monitorheader.jsp	(.../monitorheader.jsp)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_task/web/common/monitorheader.jsp	(.../monitorheader.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -7,8 +7,8 @@
 <link href="<lams:WebAppURL/>includes/css/taskList.css" rel="stylesheet" type="text/css">
 <lams:css/>
 <link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
+<link type="text/css" href="${lams}css/free.ui.jqgrid.min.css" rel="stylesheet">
 <link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet">
-<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet"/>
 
 <!-- ********************  javascript ********************** -->
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
@@ -17,10 +17,9 @@
 <script type="text/javascript" src="${lams}includes/javascript/jquery-ui.timepicker.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
 <script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/popper.min.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/bootstrap-material-design.min.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/free.jquery.jqgrid.min.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/portrait.js"></script>
 	
Index: lams_tool_task/web/pages/monitoring/itemsummary.jsp
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_task/web/pages/monitoring/itemsummary.jsp	(.../itemsummary.jsp)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_task/web/pages/monitoring/itemsummary.jsp	(.../itemsummary.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -9,30 +9,15 @@
 <lams:head>
 	<title><fmt:message key="label.learning.title" /></title>
 	<%@ include file="/common/monitorheader.jsp"%>
-
-	<style media="screen,projection" type="text/css">
-		 .ui-jqgrid {
-			border-left-style: none !important;
-			border-right-style: none !important;
-			border-bottom-style: none !important;
-		}
 		
-		.ui-jqgrid tr {
-			border-left-style: none !important;
-		}
-		
-		.ui-jqgrid td {
-			border-style: none !important;
-		}
-	</style>
-		
 	<script type="text/javascript">
 		$(document).ready(function(){
 			<c:forEach var="sessionDto" items="${sessionDtos}">
 				
 				jQuery("#group${sessionDto.sessionId}").jqGrid({
 					datatype: "json",
 					url: "<c:url value='/monitoring/getPagedUsersByItem.do'/>?sessionMapID=${sessionMapID}&toolSessionID=${sessionDto.sessionId}&itemUid=${item.uid}",
+					autoencode:false,
 					height: 'auto',
 					autowidth: true,
 					shrinkToFit: true,
@@ -41,7 +26,8 @@
 					rowList:[10,20,30,40,50,100],
 					rowNum:10,
 					viewrecords:true,
-				   	caption: "${sessionDto.sessionName}",
+				   	guiStyle: "bootstrap",
+					iconSet: 'fontAwesome',
 				   	colNames:[
 							"<fmt:message key="label.monitoring.tasksummary.user" />",
 							"<fmt:message key="label.monitoring.tasksummary.completed" />",
@@ -95,10 +81,8 @@
 	
 <body class="stripes">
 
-	<c:set var="title"><fmt:message key="label.monitoring.tasksummary.task.summary" /></c:set>
+	<c:set var="title"><c:out value="${item.title}" escapeXml="true"/></c:set>
 	<lams:Page type="admin" title="${title}">
-
-		<h4><c:out value="${item.title}" escapeXml="true"/></h4>
 				
 		<c:if test="${item.required}">
 		<div><em><fmt:message key="label.monitoring.tasksummary.task.required.to.finish" /></em></div>
Index: lams_tool_task/web/pages/monitoring/summary.jsp
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_task/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_task/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -12,14 +12,16 @@
 			jQuery("#group${sessionDto.sessionId}").jqGrid({
 				datatype: "json",
 				url: "<c:url value='/monitoring/getPagedUsers.do'/>?sessionMapID=${sessionMapID}&toolSessionID=${sessionDto.sessionId}",
+				autoencode:false,
 				height: '100%',
 				autowidth: true,
 				shrinkToFit: false,
 				pager: 'pager-${sessionDto.sessionId}',
 				rowList:[10,20,30,40,50,100],
 				rowNum:10,
 				viewrecords:true,
-//			   	caption: "${sessionDto.sessionName}",
+				guiStyle: "bootstrap",
+				iconSet: 'fontAwesome',
 			   	colNames:[
 						'userUid'
 						,"<fmt:message key="label.monitoring.summary.user" />"
@@ -30,7 +32,7 @@
 							,'<fmt:message key="label.monitoring.summary.confirm.completion" />'
 						</c:if>
 						,'portraitId'
-						],
+				],
 			   	colModel:[
 			   		{name:'userUid',index:'userUid', width:0, hidden: true}
 			   		,{name:'userName',index:'userName', width:200, searchoptions: { clearSearch: false }, formatter:userNameFormatter}
@@ -48,7 +50,7 @@
 			   	},
 			    loadComplete: function () {
 			   	 	initializePortraitPopover('<lams:LAMSURL/>');
-			    	}
+			    }
 			})
 			.jqGrid('filterToolbar', { 
  	 			searchOnEnter: false
@@ -87,7 +89,6 @@
 	}
 	
 	function setVerifiedByMonitor(link, userUid) {
-
 		$.ajax({
 			type: "POST",
 			url: '<c:url value="/monitoring/setVerifiedByMonitor.do"/>',
@@ -114,16 +115,13 @@
 			 <fmt:message key="message.monitoring.summary.no.session" />
 		</lams:Alert>
 	</c:if>
-	
 </div>
 
-
 <%-- Summary list  --%>
 <c:if test="${sessionMap.isGroupedActivity}">
 <div class="card-group" id="accordionSessions" role="tablist" aria-multiselectable="true"> 
 </c:if>
 
-
 <c:forEach var="sessionDto" items="${sessionDtos}" varStatus="status">
 			
 	<c:if test="${sessionMap.isGroupedActivity}">	
@@ -139,8 +137,8 @@
 	       <div id="collapse${sessionDto.sessionId}" class="card-collapse collapse ${status.first ? 'in' : ''}" role="tabcard" aria-labelledby="heading${sessionDto.sessionId}">
 	</c:if>
 			
-		<table id="group${sessionDto.sessionId}"></table>
-		<div id="pager-${sessionDto.sessionId}"></div>
+	<table id="group${sessionDto.sessionId}"></table>
+	<div id="pager-${sessionDto.sessionId}"></div>
 
 	<c:if test="${sessionMap.isGroupedActivity}">
 		</div> <!-- end collapse area  -->
Index: lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -46,9 +46,12 @@
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
 		
 		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
+		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
@@ -57,19 +60,40 @@
 			'minLength' : 2,
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
-				var index = ui.content.length;
+				var index = ui.content.length - 1,
+					// if result is empty, term and outcome add enabled come as objects (label, value)
+					// if there are results, they come as simple values
+					outcomeAddEnabled = ui.content[index] instanceof Object ? ui.content[index].label : ui.content[index],
+					// convert to boolean
+					outcomeAddEnabled = outcomeAddEnabled == 'true',
+					term = ui.content[index - 1] instanceof Object ? ui.content[index - 1].label : ui.content[index - 1],
+					sameNameFound = false;
+				index--;
+				ui.content.splice(index, 2);
 				while(index--) {
+					var label = ui.content[index].label;
+					if (label.split('(')[0].trim() == term) {
+						// do not offer to create an output which perfectly matches an existing one
+						sameNameFound = true;
+					}
 					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
 						ui.content.splice(index, 1);
 					}
 				}
+				if (outcomeAddEnabled && !sameNameFound) {
+					ui.content.push({
+						'label' : term + ' ' + outcomeCreateNewLabel
+					});
+				}
 			},
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
 					'data': $.extend({
-						'outcomeId' : ui.item.value
+						'outcomeId' : ui.item.value,
+						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
+						'name'		: ui.item.value ? null : ui.item.label.replace(outcomeCreateNewLabel, '')
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
 					'cache' : false,
@@ -109,10 +133,12 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
 												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
 						outcomeButton.click(function(){
-							removeOutcomeMapping(this);
+							if (confirm(outcomeMappingRemoveConfirm)) {
+								removeOutcomeMapping(this);
+							}
 						});
 					});
 				}
Index: lams_tool_vote/web/monitoring/AllSessionsSummary.jsp
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_vote/web/monitoring/AllSessionsSummary.jsp	(.../AllSessionsSummary.jsp)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_vote/web/monitoring/AllSessionsSummary.jsp	(.../AllSessionsSummary.jsp)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -38,8 +38,10 @@
   	    	<span class="card-title  collapsable-icon-left">
   	    	<a class="${status.first ? '' : 'collapsed'}" role="button" data-toggle="collapse" href="#collapse${sessionUid}" 
 				aria-expanded="${status.first ? 'false' : 'true'}" aria-controls="collapse${sessionUid}" >
-		<c:out value="${sessionDto.sessionName}"/></a>
-		</span>  ${buttonbar}
+				<c:out value="${sessionDto.sessionName}"/>
+			</a>
+			</span>  
+			${buttonbar}
        </div>
        
        <div id="collapse${sessionUid}" class="card-collapse collapse ${status.first ? 'in' : ''}" role="tabcard" aria-labelledby="heading${sessionUid}">
@@ -61,9 +63,9 @@
 						
 				<td  valign=top class="align-left">				  	 		
 					<c:set var="viewVotesURL">
-					<lams:WebAppURL/>monitoring.do?dispatch=getVoteNomination&questionUid=${questionUid}&sessionUid=${sessionUid}
+						<lams:WebAppURL/>monitoring/getVoteNomination.do?questionUid=${questionUid}&sessionUid=${sessionUid}
 					</c:set>
-					<a href="javascript:launchInstructionsPopup('<c:out value='${viewVotesURL}' escapeXml='false'/>')">
+					<a href="javascript:launchInstructionsPopup('${viewVotesURL}')">
 						<c:out value="${currentNomination.numberOfVotes}"/>  
 					</a>
 					&nbsp;(<fmt:formatNumber type="number" maxFractionDigits="2" value="${currentNomination.percentageOfVotes}" /><fmt:message key="label.percent"/>) 
@@ -79,9 +81,9 @@
 						
 				<td  valign=top class="align-left">				  	 		
 					<c:set var="viewVotesURL">
-					<lams:WebAppURL/>monitoring/OtherTextNominationViewer.jsp?&toolContentUID=${toolContentID}&sessionUid=${sessionUid}
+						<lams:WebAppURL/>monitoring/OtherTextNominationViewer.jsp?&toolContentUID=${toolContentID}&sessionUid=${sessionUid}
 					</c:set>
-					<a href="javascript:launchInstructionsPopup('<c:out value='${viewVotesURL}' escapeXml='false'/>')">
+					<a href="javascript:launchInstructionsPopup('${viewVotesURL}')">
 						<c:out value="${sessionDto.openTextNumberOfVotes}"/>  
 					</a>
 					&nbsp(<fmt:formatNumber type="number" maxFractionDigits="2" value="${sessionDto.openTextPercentageOfVotes}" />  <fmt:message key="label.percent"/>) 
Index: lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -46,9 +46,12 @@
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
 		
 		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
+		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
@@ -57,19 +60,40 @@
 			'minLength' : 2,
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
-				var index = ui.content.length;
+				var index = ui.content.length - 1,
+					// if result is empty, term and outcome add enabled come as objects (label, value)
+					// if there are results, they come as simple values
+					outcomeAddEnabled = ui.content[index] instanceof Object ? ui.content[index].label : ui.content[index],
+					// convert to boolean
+					outcomeAddEnabled = outcomeAddEnabled == 'true',
+					term = ui.content[index - 1] instanceof Object ? ui.content[index - 1].label : ui.content[index - 1],
+					sameNameFound = false;
+				index--;
+				ui.content.splice(index, 2);
 				while(index--) {
+					var label = ui.content[index].label;
+					if (label.split('(')[0].trim() == term) {
+						// do not offer to create an output which perfectly matches an existing one
+						sameNameFound = true;
+					}
 					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
 						ui.content.splice(index, 1);
 					}
 				}
+				if (outcomeAddEnabled && !sameNameFound) {
+					ui.content.push({
+						'label' : term + ' ' + outcomeCreateNewLabel
+					});
+				}
 			},
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
 					'data': $.extend({
-						'outcomeId' : ui.item.value
+						'outcomeId' : ui.item.value,
+						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
+						'name'		: ui.item.value ? null : ui.item.label.replace(outcomeCreateNewLabel, '')
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
 					'cache' : false,
@@ -109,10 +133,12 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
 												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
 						outcomeButton.click(function(){
-							removeOutcomeMapping(this);
+							if (confirm(outcomeMappingRemoveConfirm)) {
+								removeOutcomeMapping(this);
+							}
 						});
 					});
 				}
Index: lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -46,9 +46,12 @@
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
 		
 		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
+		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
@@ -57,19 +60,40 @@
 			'minLength' : 2,
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
-				var index = ui.content.length;
+				var index = ui.content.length - 1,
+					// if result is empty, term and outcome add enabled come as objects (label, value)
+					// if there are results, they come as simple values
+					outcomeAddEnabled = ui.content[index] instanceof Object ? ui.content[index].label : ui.content[index],
+					// convert to boolean
+					outcomeAddEnabled = outcomeAddEnabled == 'true',
+					term = ui.content[index - 1] instanceof Object ? ui.content[index - 1].label : ui.content[index - 1],
+					sameNameFound = false;
+				index--;
+				ui.content.splice(index, 2);
 				while(index--) {
+					var label = ui.content[index].label;
+					if (label.split('(')[0].trim() == term) {
+						// do not offer to create an output which perfectly matches an existing one
+						sameNameFound = true;
+					}
 					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
 						ui.content.splice(index, 1);
 					}
 				}
+				if (outcomeAddEnabled && !sameNameFound) {
+					ui.content.push({
+						'label' : term + ' ' + outcomeCreateNewLabel
+					});
+				}
 			},
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
 					'data': $.extend({
-						'outcomeId' : ui.item.value
+						'outcomeId' : ui.item.value,
+						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
+						'name'		: ui.item.value ? null : ui.item.label.replace(outcomeCreateNewLabel, '')
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
 					'cache' : false,
@@ -109,10 +133,12 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
 												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
 						outcomeButton.click(function(){
-							removeOutcomeMapping(this);
+							if (confirm(outcomeMappingRemoveConfirm)) {
+								removeOutcomeMapping(this);
+							}
 						});
 					});
 				}
Index: lams_www/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r7584e0047537ac0e15b56eb9829b035e02b458d7 -rdd8758e2e6d773e610086c90370c6e25e925de34
--- lams_www/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
+++ lams_www/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision dd8758e2e6d773e610086c90370c6e25e925de34)
@@ -46,9 +46,12 @@
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
 		
 		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
+		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
@@ -57,19 +60,40 @@
 			'minLength' : 2,
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
-				var index = ui.content.length;
+				var index = ui.content.length - 1,
+					// if result is empty, term and outcome add enabled come as objects (label, value)
+					// if there are results, they come as simple values
+					outcomeAddEnabled = ui.content[index] instanceof Object ? ui.content[index].label : ui.content[index],
+					// convert to boolean
+					outcomeAddEnabled = outcomeAddEnabled == 'true',
+					term = ui.content[index - 1] instanceof Object ? ui.content[index - 1].label : ui.content[index - 1],
+					sameNameFound = false;
+				index--;
+				ui.content.splice(index, 2);
 				while(index--) {
+					var label = ui.content[index].label;
+					if (label.split('(')[0].trim() == term) {
+						// do not offer to create an output which perfectly matches an existing one
+						sameNameFound = true;
+					}
 					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
 						ui.content.splice(index, 1);
 					}
 				}
+				if (outcomeAddEnabled && !sameNameFound) {
+					ui.content.push({
+						'label' : term + ' ' + outcomeCreateNewLabel
+					});
+				}
 			},
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
 					'data': $.extend({
-						'outcomeId' : ui.item.value
+						'outcomeId' : ui.item.value,
+						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
+						'name'		: ui.item.value ? null : ui.item.label.replace(outcomeCreateNewLabel, '')
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
 					'cache' : false,
@@ -109,10 +133,12 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
 												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
 						outcomeButton.click(function(){
-							removeOutcomeMapping(this);
+							if (confirm(outcomeMappingRemoveConfirm)) {
+								removeOutcomeMapping(this);
+							}
 						});
 					});
 				}