Index: lams_central/web/css/components.css
===================================================================
diff -u -ra92b50b99f081e14a2af12a814e6760bcedc3db6 -r023e019feae586433ba4b9086294aab7a424d1f9
--- lams_central/web/css/components.css	(.../components.css)	(revision a92b50b99f081e14a2af12a814e6760bcedc3db6)
+++ lams_central/web/css/components.css	(.../components.css)	(revision 023e019feae586433ba4b9086294aab7a424d1f9)
@@ -392,11 +392,6 @@
 }
 
 /* Switch */
-.switch {
-	font-size: 1rem;
-	position: relative;
-	padding-left: 15px;
-}
 
 .switch input {
 	position: absolute;
Index: lams_tool_assessment/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u -r6713e2b8cbe5e01402cf4909ae929b252bab3297 -r023e019feae586433ba4b9086294aab7a424d1f9
--- lams_tool_assessment/web/WEB-INF/tags/Dropdown.tag	(.../Dropdown.tag)	(revision 6713e2b8cbe5e01402cf4909ae929b252bab3297)
+++ lams_tool_assessment/web/WEB-INF/tags/Dropdown.tag	(.../Dropdown.tag)	(revision 023e019feae586433ba4b9086294aab7a424d1f9)
@@ -23,7 +23,7 @@
 <c:set var="id" value="${empty id ? name : id}" />
 <c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
 
-<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="switch switch-sm ${inputCellClass}"
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end ${inputCellClass}"
 			tooltipKey="${tooltipKey}" tooltipDescriptionKey="${tooltipDescriptionKey}">
 	<c:choose>
    		<c:when test="${useSpringForm}">
Index: lams_tool_assessment/web/WEB-INF/tags/Input.tag
===================================================================
diff -u -r967256b088ed091ec9bfd98b25bdb6028879827f -r023e019feae586433ba4b9086294aab7a424d1f9
--- lams_tool_assessment/web/WEB-INF/tags/Input.tag	(.../Input.tag)	(revision 967256b088ed091ec9bfd98b25bdb6028879827f)
+++ lams_tool_assessment/web/WEB-INF/tags/Input.tag	(.../Input.tag)	(revision 023e019feae586433ba4b9086294aab7a424d1f9)
@@ -13,11 +13,15 @@
 <%@ attribute name="labelKey" required="true" rtexprvalue="true" %>
 
 <%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
+<%@ attribute name="labelCellSize" required="false" rtexprvalue="true" %>
 <%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
 <%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
 
+<c:set var="inputCellClass" value=" ${empty inputCellClass ? 'd-flex justify-content-end' : inputCellClass}" />
+<c:set var="labelCellSize" value="${empty labelCellSize ? 8 : labelCellSize}" />
+
 <div class="form-group row">
-	<label class="col-sm-8 col-form-label" for="${id}">
+	<label class="col-sm-${labelCellSize} col-form-label" for="${id}">
 		<fmt:message key="${labelKey}" />
 		
 		<c:if test="${not empty tooltipKey}">
@@ -31,7 +35,7 @@
 		</c:if>
 	</label>
 	
-    <div class="col-sm-4 justify-content-end d-flex ${inputCellClass}">
+    <div class="col-sm-${12 - labelCellSize} ${inputCellClass}">
     	<jsp:doBody />
     </div>
 </div>
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor5.tag
===================================================================
diff -u
--- lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor5.tag	(revision 0)
+++ lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor5.tag	(revision 023e019feae586433ba4b9086294aab7a424d1f9)
@@ -0,0 +1,202 @@
+<% 
+ /**
+  * OutcomeAuthor.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="csrfguard" prefix="csrf" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
+<%@ attribute name="inPanel" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style>
+	#outcomeAuthor${outcomeTagId} .outcomeMappings div {
+		display: inline-block;
+	}
+	
+	#outcomeAuthor${outcomeTagId} input {
+		margin-bottom: 0 !important;
+	}
+	
+	.ui-autocomplete .ui-menu-item {
+		cursor: pointer;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		outcomeAddEnabled = true,
+		
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
+		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({
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
+			'delay'  : 700,
+			'minLength' : 2,
+			'open'	: function(event, ui){
+				$('.ui-autocomplete').addClass('dropdown-menu');
+				$('.ui-menu-item').addClass('dropdown-item');
+			},
+			'classes' : {
+				'ui-autocomplete' : 'dropdown-menu',
+				'ui-menu-item'    : 'dropdown-item'
+			},
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				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?<csrf:token/>',
+					'dataType' : 'text',
+					'data': $.extend({
+						'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,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
+			'data'	   : outcomeData,
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="mr-2 mt-2 btn btn-sm btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome/outcomeRemoveMapping.do',
+			'data': {
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'type'  : 'post',
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<div id="outcomeAuthor${outcomeTagId}">
+	<lams:Input id="outcomeSearchInput${outcomeTagId}" labelCellSize="3" labelKey="outcome.authoring.title" inputCellClass="justify-content-start flex-wrap">
+		<div class="input-group">
+			<div class="input-group-prepend">
+		    	<span class="input-group-text"><i class="fa fa-search"></i></span>
+		    </div>
+		    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="form-control" 
+		    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+		</div>
+		<div class="outcomeMappings">
+			<div class="mt-2 mr-2"><fmt:message key="outcome.authoring.existing" />: </div><div id="outcomeMappings${outcomeTagId}"></div>
+		</div>
+	</lams:Input>
+</div>
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tags/Switch.tag
===================================================================
diff -u -r6713e2b8cbe5e01402cf4909ae929b252bab3297 -r023e019feae586433ba4b9086294aab7a424d1f9
--- lams_tool_assessment/web/WEB-INF/tags/Switch.tag	(.../Switch.tag)	(revision 6713e2b8cbe5e01402cf4909ae929b252bab3297)
+++ lams_tool_assessment/web/WEB-INF/tags/Switch.tag	(.../Switch.tag)	(revision 023e019feae586433ba4b9086294aab7a424d1f9)
@@ -25,7 +25,7 @@
 <c:set var="id" value="${empty id ? name : id}" />
 <c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
 
-<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="switch switch-sm ${inputCellClass}"
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="d-flex justify-content-end switch switch-sm ${inputCellClass}"
 		    tooltipKey="${tooltipKey}" tooltipDescriptionKey="${tooltipDescriptionKey}" >
     <c:choose>
    		<c:when test="${useSpringForm}">
Index: lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r967256b088ed091ec9bfd98b25bdb6028879827f -r023e019feae586433ba4b9086294aab7a424d1f9
--- lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 967256b088ed091ec9bfd98b25bdb6028879827f)
+++ lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 023e019feae586433ba4b9086294aab7a424d1f9)
@@ -429,4 +429,8 @@
 	    <name>Input</name>
 		<path>/WEB-INF/tags/Input.tag</path>
    	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor5</name>
+       <path>/WEB-INF/tags/OutcomeAuthor5.tag</path>
+   	</tag-file> 
 </taglib>
Index: lams_tool_assessment/web/pages/authoring/authoring5.jsp
===================================================================
diff -u -r970d31830c85b6f6cd3e28b96c6c894617873c64 -r023e019feae586433ba4b9086294aab7a424d1f9
--- lams_tool_assessment/web/pages/authoring/authoring5.jsp	(.../authoring5.jsp)	(revision 970d31830c85b6f6cd3e28b96c6c894617873c64)
+++ lams_tool_assessment/web/pages/authoring/authoring5.jsp	(.../authoring5.jsp)	(revision 023e019feae586433ba4b9086294aab7a424d1f9)
@@ -13,11 +13,11 @@
 	
 	<title><fmt:message key="label.author.title" /></title>
 	
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/thickbox.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap4.min.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome/css/font-awesome.min.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery.tablesorter.theme.bootstrap.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery.tablesorter.custom.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/thickbox.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/components-responsive.css">
 	<link rel="stylesheet" href="<lams:WebAppURL/>includes/css/assessment.css">
@@ -114,6 +114,7 @@
 			</c:if>
 			
 			//automatically turn on refect option if there are text input in refect instruction area
+			/*
 			var ra = document.getElementById("reflectInstructions");
 			var rao = document.getElementById("reflectOnActivity");
 			function turnOnRefect(){
@@ -127,6 +128,7 @@
 			}
 			
 			ra.onkeyup=turnOnRefect;
+			*/
 		});
 	</script>
 </head>
Index: lams_tool_assessment/web/pages/authoring/reflection5.jsp
===================================================================
diff -u -rde980140fbbf28ae1a30f50e14268aec4c8f1e42 -r023e019feae586433ba4b9086294aab7a424d1f9
--- lams_tool_assessment/web/pages/authoring/reflection5.jsp	(.../reflection5.jsp)	(revision de980140fbbf28ae1a30f50e14268aec4c8f1e42)
+++ lams_tool_assessment/web/pages/authoring/reflection5.jsp	(.../reflection5.jsp)	(revision 023e019feae586433ba4b9086294aab7a424d1f9)
@@ -1,7 +1,7 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <div class="col-12 p-0">
-	<lams:OutcomeAuthor toolContentId="${assessmentForm.assessment.contentId}" />
+	<lams:OutcomeAuthor5 toolContentId="${assessmentForm.assessment.contentId}" />
 	
 	<lams:Switch name="assessment.reflectOnActivity" id="reflectOnActivity"
 		useSpringForm="true"