Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r9f984a5496c4434f9c6835464d139526fe9d58a0 -rf5c2b497bbe9917df1d7e3f9e6467e6865fe2f65
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 9f984a5496c4434f9c6835464d139526fe9d58a0)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f5c2b497bbe9917df1d7e3f9e6467e6865fe2f65)
@@ -236,8 +236,8 @@
 label.authoring.advance.display.summary = Display all questions and answers once the learner finishes.
 label.authoring.basic.import.qti = IMS QTI
 advanced.reflectOnActivity = Add a notebook at end of Assessment with the following instructions:
-advanced.reflectOnActivity.tip = After students finish the activity, you can ask them to reflect on the activity that they have just completed. Write a meaningful question for students to reflect on.
-monitor.summary.td.addNotebook = Add a notebook at end of Assessment
+label.advanced.reflectOnActivity.tip.1 = After students finish the activity, you can ask them to reflect on the activity that they have just completed.
+label.advanced.reflectOnActivity.tip.2 = Write a meaningful question for students to reflect on.monitor.summary.td.addNotebook = Add a notebook at end of Assessment
 monitor.summary.td.notebookInstructions = Notebook instructions
 label.export.reflection = Notebook Entries
 label.continue = Continue
@@ -248,7 +248,7 @@
 label.waiting.for.leader = Please, wait while somebody will become a group leader and enter this activity.
 label.users.from.group = Other learners in your group:
 label.use.select.leader.tool.output = Only the leader submits answers on behalf of the team/group.
-label.use.select.leader.tool.output.tip = If you want only one student (the group leader) to submit answers on behalf of the group/team, make sure that you have a Leader Selection activity prior and this activity is grouped.
+label.use.select.leader.tool.output.tip.1 = If you want only one student (the group leader) to submit answers on behalf of the group/team, make sure that you have a Leader Selection activity prior and this activity is grouped.
 label.group.leader = Group leader: {0}
 label.refresh = Refresh
 label.display.name.column = Display name column
@@ -329,7 +329,8 @@
 label.prefix.sequential.letters.for.each.answer = Prefix sequential letters for each answer
 label.edit.in.monitor.warning = Attention: while you edit this assessment students don't have access to it. You must save your changes so students can re-attempt this assessment again.
 outcome.authoring.title = Learning outcomes
-outcome.authoring.title.tip = Map learning outcomes to this activity. 
+outcome.authoring.title.tip.1 = Learning outcomes are skills and knowledge students should possess and can demonstrate upon completion of a learning experience.
+outcome.authoring.title.tip.2 = You can reuse tags to group activities with similar learning outcomes.
 outcome.authoring.input = Search and select by outcome name or code
 outcome.authoring.existing = Added outcomes
 outcome.authoring.existing.none = none
Index: lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r9f984a5496c4434f9c6835464d139526fe9d58a0 -rf5c2b497bbe9917df1d7e3f9e6467e6865fe2f65
--- lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 9f984a5496c4434f9c6835464d139526fe9d58a0)
+++ lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision f5c2b497bbe9917df1d7e3f9e6467e6865fe2f65)
@@ -191,16 +191,16 @@
 	</c:when>
 	<c:otherwise>
 		<div class="form-group row">
-			<div class="col-sm-2">
-		    	<label for="outcomeSearchInput${outcomeTagId}">
-		    		<fmt:message key="outcome.authoring.title" />
-		    	</label>
-            	<lams:Popover>
-                	<fmt:message key="outcome.authoring.title.tip" />
-            	</lams:Popover>	
-			</div>
-		    
-		    <div class="col-sm-10">
+			<div class="col-sm-3">
+			    <label for="outcomeSearchInput${outcomeTagId}">
+			    	<fmt:message key="outcome.authoring.title" />
+			    </label>
+				<lams:Popover titleKey="outcome.authoring.title">
+					<fmt:message key="outcome.authoring.title.tip.1" /><br>
+					<fmt:message key="outcome.authoring.title.tip.2" />
+				</lams:Popover>
+		    </div>
+		    <div class="col-sm-9">
 		    	<div class="input-group">
 				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
 				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
Index: lams_tool_assessment/web/pages/authoring/advance.jsp
===================================================================
diff -u -r9f984a5496c4434f9c6835464d139526fe9d58a0 -rf5c2b497bbe9917df1d7e3f9e6467e6865fe2f65
--- lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 9f984a5496c4434f9c6835464d139526fe9d58a0)
+++ lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision f5c2b497bbe9917df1d7e3f9e6467e6865fe2f65)
@@ -73,9 +73,9 @@
 		<form:checkbox path="assessment.useSelectLeaderToolOuput" value="1" id="useSelectLeaderToolOuput"/>
 		<fmt:message key="label.use.select.leader.tool.output" />
 	</label>
-		<lams:Popover>
-			<fmt:message key="label.use.select.leader.tool.output.tip" /><br>
-		 </lams:Popover>
+	<lams:Popover>
+		<fmt:message key="label.use.select.leader.tool.output.tip.1" /><br>
+	</lams:Popover>
 </div>
 
 <c:if test="${sessionMap.isQuestionEtherpadEnabled}">
@@ -307,8 +307,9 @@
 		<fmt:message key="advanced.reflectOnActivity" />
 	</label>
 	<lams:Popover>
-		<fmt:message key="advanced.reflectOnActivity.tip" /><br>
-	 </lams:Popover>
+		<fmt:message key="label.advanced.reflectOnActivity.tip.1" /><br>
+		<fmt:message key="label.advanced.reflectOnActivity.tip.2" />
+	</lams:Popover>
 </div>
 
 <div class="form-group">
Index: lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp
===================================================================
diff -u -r8ffb8a4e0269d5abfca9f435911e6b38c5287bdb -rf5c2b497bbe9917df1d7e3f9e6467e6865fe2f65
--- lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp	(.../advanceoptions.jsp)	(revision 8ffb8a4e0269d5abfca9f435911e6b38c5287bdb)
+++ lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp	(.../advanceoptions.jsp)	(revision f5c2b497bbe9917df1d7e3f9e6467e6865fe2f65)
@@ -7,6 +7,9 @@
 		<tr>
 			<td>
 				<fmt:message key="label.use.select.leader.tool.output" />
+				<lams:Popover>
+					<fmt:message key="label.use.select.leader.tool.output.tip.1" /><br>
+				</lams:Popover>
 			</td>
 			
 			<td>
@@ -282,6 +285,10 @@
 		<tr>
 			<td>
 				<fmt:message key="monitor.summary.td.addNotebook" />
+				<lams:Popover>
+					<fmt:message key="label.advanced.reflectOnActivity.tip.1" /><br>
+					<fmt:message key="label.advanced.reflectOnActivity.tip.2" />
+				</lams:Popover>
 			</td>
 			
 			<td>
Index: lams_tool_chat/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r9aed012878df5e7d233c949fa7c37919b6eda50a -rf5c2b497bbe9917df1d7e3f9e6467e6865fe2f65
--- lams_tool_chat/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 9aed012878df5e7d233c949fa7c37919b6eda50a)
+++ lams_tool_chat/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f5c2b497bbe9917df1d7e3f9e6467e6865fe2f65)
@@ -10,10 +10,10 @@
 label.authoring.basic.content = Content:
 label.authoring.basic.instructions = Instructions:
 advanced.lockOnFinished = Lock when finished
-advanced.lockOnFinished.tooltip.1 = Learners will not be able to participate in the Chat once they finish the activity and come back later.
+label.advanced.lockOnFinished.tip.1 = When students finish the activity, they will be  able to come back and view the activity, but no longer add, modify or participate in it.
 advanced.filteringEnabled = Filter messages
-advanced.filteringEnabled.tooltip.1 = Separate each filtered word with a comma, i.e.: word1, word2. etc.
-advanced.filteringEnabled.tooltip.2 = These words will be commented out with asterisks in learner messages. 
+advanced.filteringEnabled.tip.1 = Separate each filtered word with a comma, i.e.: word1, word2. etc.
+advanced.filteringEnabled.tip.2 = These words will be commented out with asterisks in learner messages. 
 label.filename = Filename
 label.type = Type
 link.view = View
@@ -57,8 +57,8 @@
 pageTitle.monitoring.chatHistory = Chat History
 button.try.again = Try again
 advanced.reflectOnActivity = Reflection notebook
-advanced.reflectOnActivity.tooltip.1 = Adds a notebook displayed after a learner finishes the Chat activity, whit instructions as typed in the text area.
-advanced.reflectOnActivity.tooltip.2 = You can use it to ask learners about their experience of the activity.
+label.advanced.reflectOnActivity.tip.1 = After students finish the activity, you can ask them to reflect on the activity that they have just completed.
+label.advanced.reflectOnActivity.tip.2 = Write a meaningful question for students to reflect on.
 button.reflect = Reflect on chat
 button.continue = Continue
 heading.numPosts = No. of posts
@@ -79,8 +79,8 @@
 button.conditions = Conditions
 label.authoring.heading.conditions = Conditions
 label.authoring.conditions.add.condition = Add condition
-label.authoring.conditions.add.condition.tooltip.1 = Set up conditions based on learner participation in the Chat.
-label.authoring.conditions.add.condition.tooltip.2 = These conditions can then be used to open a gate for particular learners, to direct them to specific branches in Branching activity etc.
+label.authoring.conditions.add.condition.tip.1 = Set up conditions based on learner participation in the Chat.
+label.authoring.conditions.add.condition.tip.2 = These conditions can then be used to open a gate for particular learners, to direct them to specific branches in Branching activity etc.
 label.authoring.conditions.list.title = Conditions
 label.authoring.conditions.order = Order
 label.authoring.conditions.empty.condition.list = There are no conditions
@@ -119,5 +119,5 @@
 outcome.authoring.existing = Added outcomes
 outcome.authoring.existing.none = none
 outcome.authoring.remove.confirm = Are you sure you want to remove this learning outcome?
-outcome.authoring.tooltip.1 = Learning outcomes are skills and knowledge students should possess and can demonstrate upon completion of a learning experience.
-outcome.authoring.tooltip.2 = You can reuse tags to group activities with similar learning outcomes.
+outcome.authoring.title.tip.1 = Learning outcomes are skills and knowledge students should possess and can demonstrate upon completion of a learning experience.
+outcome.authoring.title.tip.2 = You can reuse tags to group activities with similar learning outcomes.
Index: lams_tool_chat/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r9aed012878df5e7d233c949fa7c37919b6eda50a -rf5c2b497bbe9917df1d7e3f9e6467e6865fe2f65
--- lams_tool_chat/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 9aed012878df5e7d233c949fa7c37919b6eda50a)
+++ lams_tool_chat/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision f5c2b497bbe9917df1d7e3f9e6467e6865fe2f65)
@@ -10,10 +10,10 @@
 label.authoring.basic.content = Content:
 label.authoring.basic.instructions = Instructions:
 advanced.lockOnFinished = Lock when finished
-advanced.lockOnFinished.tooltip.1 = Learners will not be able to participate in the Chat once they finish the activity and come back later.
+label.advanced.lockOnFinished.tip.1 = When students finish the activity, they will be  able to come back and view the activity, but no longer add, modify or participate in it.
 advanced.filteringEnabled = Filter messages
-advanced.filteringEnabled.tooltip.1 = Separate each filtered word with a comma, i.e.: word1, word2. etc.
-advanced.filteringEnabled.tooltip.2 = These words will be commented out with asterisks in learner messages. 
+advanced.filteringEnabled.tip.1 = Separate each filtered word with a comma, i.e.: word1, word2. etc.
+advanced.filteringEnabled.tip.2 = These words will be commented out with asterisks in learner messages. 
 label.filename = Filename
 label.type = Type
 link.view = View
@@ -57,9 +57,8 @@
 pageTitle.monitoring.chatHistory = Chat History
 button.try.again = Try again
 advanced.reflectOnActivity = Reflection notebook
-advanced.reflectOnActivity.tooltip.1 = Adds a notebook displayed after a learner finishes the Chat activity, whit instructions as typed in the text area.
-advanced.reflectOnActivity.tooltip.2 = You can use it to ask learners about their experience of the activity.
-button.reflect = Reflect on chat
+label.advanced.reflectOnActivity.tip.1 = After students finish the activity, you can ask them to reflect on the activity that they have just completed.
+label.advanced.reflectOnActivity.tip.2 = Write a meaningful question for students to reflect on.button.reflect = Reflect on chat
 button.continue = Continue
 heading.numPosts = No. of posts
 heading.learner = Learner
@@ -79,8 +78,8 @@
 button.conditions = Conditions
 label.authoring.heading.conditions = Conditions
 label.authoring.conditions.add.condition = Add condition
-label.authoring.conditions.add.condition.tooltip.1 = Set up conditions based on learner participation in the Chat.
-label.authoring.conditions.add.condition.tooltip.2 = These conditions can then be used to open a gate for particular learners, to direct them to specific branches in Branching activity etc.
+label.authoring.conditions.add.condition.tip.1 = Set up conditions based on learner participation in the Chat.
+label.authoring.conditions.add.condition.tip.2 = These conditions can then be used to open a gate for particular learners, to direct them to specific branches in Branching activity etc.
 label.authoring.conditions.list.title = Conditions
 label.authoring.conditions.order = Order
 label.authoring.conditions.empty.condition.list = There are no conditions
@@ -119,5 +118,5 @@
 outcome.authoring.existing = Added outcomes
 outcome.authoring.existing.none = none
 outcome.authoring.remove.confirm = Are you sure you want to remove this learning outcome?
-outcome.authoring.tooltip.1 = Learning outcomes are skills and knowledge students should possess and can demonstrate upon completion of a learning experience.
-outcome.authoring.tooltip.2 = You can reuse tags to group activities with similar learning outcomes.
+outcome.authoring.title.tip.1 = Learning outcomes are skills and knowledge students should possess and can demonstrate upon completion of a learning experience.
+outcome.authoring.title.tip.2 = You can reuse tags to group activities with similar learning outcomes.
Index: lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r9aed012878df5e7d233c949fa7c37919b6eda50a -rf5c2b497bbe9917df1d7e3f9e6467e6865fe2f65
--- lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 9aed012878df5e7d233c949fa7c37919b6eda50a)
+++ lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision f5c2b497bbe9917df1d7e3f9e6467e6865fe2f65)
@@ -196,8 +196,8 @@
 			    	<fmt:message key="outcome.authoring.title" />
 			    </label>
 				<lams:Popover titleKey="outcome.authoring.title">
-					<fmt:message key="outcome.authoring.tooltip.1" /><br>
-					<fmt:message key="outcome.authoring.tooltip.2" />
+					<fmt:message key="outcome.authoring.title.tip.1" /><br>
+					<fmt:message key="outcome.authoring.title.tip.2" />
 				</lams:Popover>
 		    </div>
 		    <div class="col-sm-9">
Index: lams_tool_chat/web/pages/authoring/advanced.jsp
===================================================================
diff -u -r20cd76e0afac4040c6d8cbfde5f1f51f2288312c -rf5c2b497bbe9917df1d7e3f9e6467e6865fe2f65
--- lams_tool_chat/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 20cd76e0afac4040c6d8cbfde5f1f51f2288312c)
+++ lams_tool_chat/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision f5c2b497bbe9917df1d7e3f9e6467e6865fe2f65)
@@ -8,8 +8,8 @@
 		<fmt:message key="advanced.filteringEnabled" />
 	</label>
 	<lams:Popover>
-		<fmt:message key="advanced.filteringEnabled.tooltip.1" /><br>
-		<fmt:message key="advanced.filteringEnabled.tooltip.2" />
+		<fmt:message key="advanced.filteringEnabled.tip.1" /><br>
+		<fmt:message key="advanced.filteringEnabled.tip.2" />
 	</lams:Popover>
 </div>
 <div class="form-group">
@@ -26,7 +26,7 @@
 		<fmt:message key="advanced.lockOnFinished" />
 	</label>
 	<lams:Popover>
-		<fmt:message key="advanced.lockOnFinished.tooltip.1" />
+		<fmt:message key="label.advanced.lockOnFinished.tip.1" />
 	</lams:Popover>
 </div>
 
@@ -36,8 +36,8 @@
 		<fmt:message key="advanced.reflectOnActivity" />
 	</label>
 	<lams:Popover>
-		<fmt:message key="advanced.reflectOnActivity.tooltip.1" /><br>
-		<fmt:message key="advanced.reflectOnActivity.tooltip.2" />
+		<fmt:message key="label.advanced.reflectOnActivity.tip.1" /><br>
+		<fmt:message key="label.advanced.reflectOnActivity.tip.2" />
 	</lams:Popover>
 </div>
 
Index: lams_tool_chat/web/pages/authoring/conditions.jsp
===================================================================
diff -u -r9aed012878df5e7d233c949fa7c37919b6eda50a -rf5c2b497bbe9917df1d7e3f9e6467e6865fe2f65
--- lams_tool_chat/web/pages/authoring/conditions.jsp	(.../conditions.jsp)	(revision 9aed012878df5e7d233c949fa7c37919b6eda50a)
+++ lams_tool_chat/web/pages/authoring/conditions.jsp	(.../conditions.jsp)	(revision f5c2b497bbe9917df1d7e3f9e6467e6865fe2f65)
@@ -60,8 +60,8 @@
 	<a href="javascript:showConditionMessage('<lams:WebAppURL />authoringCondition/newConditionInit.do?sessionMapID=${authoringForm.sessionMapID}');" 
 		class="btn btn-default btn-sm"><i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.authoring.conditions.add.condition" /></a> 
 	<lams:Popover titleKey="label.authoring.heading.conditions">
-		<fmt:message key="label.authoring.conditions.add.condition.tooltip.1" /><br>
-		<fmt:message key="label.authoring.conditions.add.condition.tooltip.2" />
+		<fmt:message key="label.authoring.conditions.add.condition.tip.1" /><br>
+		<fmt:message key="label.authoring.conditions.add.condition.tip.2" />
 	</lams:Popover>
 </div>
 
Index: lams_tool_chat/web/pages/monitoring/advanceOptions.jsp
===================================================================
diff -u -r20cd76e0afac4040c6d8cbfde5f1f51f2288312c -rf5c2b497bbe9917df1d7e3f9e6467e6865fe2f65
--- lams_tool_chat/web/pages/monitoring/advanceOptions.jsp	(.../advanceOptions.jsp)	(revision 20cd76e0afac4040c6d8cbfde5f1f51f2288312c)
+++ lams_tool_chat/web/pages/monitoring/advanceOptions.jsp	(.../advanceOptions.jsp)	(revision f5c2b497bbe9917df1d7e3f9e6467e6865fe2f65)
@@ -6,7 +6,7 @@
 		<td>
 			<fmt:message key="advanced.lockOnFinished" />
 			<lams:Popover>
-				<fmt:message key="advanced.lockOnFinished.tooltip.1" />
+				<fmt:message key="label.advanced.lockOnFinished.tip.1" />
 			</lams:Popover>
 		</td>
 		
@@ -26,8 +26,8 @@
 		<td>
 			<fmt:message key="monitor.summary.td.addNotebook" />
 			<lams:Popover>
-				<fmt:message key="advanced.reflectOnActivity.tooltip.1" /><br>
-				<fmt:message key="advanced.reflectOnActivity.tooltip.2" />
+				<fmt:message key="label.advanced.reflectOnActivity.tip.1" /><br>
+				<fmt:message key="label.advanced.reflectOnActivity.tip.2" />
 			</lams:Popover>
 		</td>
 		
@@ -60,8 +60,8 @@
 		<td>
 			<fmt:message key="advanced.filteringEnabled" />
 			<lams:Popover>
-				<fmt:message key="advanced.filteringEnabled.tooltip.1" /><br>
-				<fmt:message key="advanced.filteringEnabled.tooltip.2" />
+				<fmt:message key="advanced.filteringEnabled.tip.1" /><br>
+				<fmt:message key="advanced.filteringEnabled.tip.2" />
 			</lams:Popover>
 		</td>
 		
Index: lams_tool_laqa/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -read05808ad0c2adefb5c5dbb181a1cf20236e0d0 -rf5c2b497bbe9917df1d7e3f9e6467e6865fe2f65
--- lams_tool_laqa/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision ead05808ad0c2adefb5c5dbb181a1cf20236e0d0)
+++ lams_tool_laqa/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f5c2b497bbe9917df1d7e3f9e6467e6865fe2f65)
@@ -88,8 +88,8 @@
 label.tooltip.tick = Save changes
 label.continue = Continue
 label.reflect = Add a notebook at end of Q&A with the following instructions:
-label.reflect.tip = After students finish the activity, you can ask them to reflect on the activity that they have just completed. Write a meaningful question for students to reflect on. 
-label.responses.locked = Note: after completing the activity, you will not be able to make changes to your answers.
+label.advanced.reflectOnActivity.tip.1 = After students finish the activity, you can ask them to reflect on the activity that they have just completed.
+label.advanced.reflectOnActivity.tip.2 = Write a meaningful question for students to reflect on.label.responses.locked = Note: after completing the activity, you will not be able to make changes to your answers.
 label.notebook.entries = Notebook entries
 label.reflection = Notebook entry
 label.learner = Learner
@@ -114,11 +114,11 @@
 label.questions.remaining = Remaining question count:
 label.end.questions = End of the questions.
 label.lockWhenFinished = Lock when finished
-label.lockWhenFinished.tip = When students finish the activity, they will be  able to come back and view the activity, but no longer add, modify or participate in it.
+label.advanced.lockOnFinished.tip.1 = When students finish the activity, they will be  able to come back and view the activity, but no longer add, modify or participate in it.
 label.learner.answer = Show answers from other learners
-label.learner.answer.tip = After a student submits answer(s), the student is able to see their peer's answers. 
+label.learner.answer.tip.1 = After a student submits answer(s), the student is able to see their peer's answers. 
 label.show.names = Show names of other learners
-label.show.names.tip = If this option is checked, then the students' name will show next to their answers. Otherwise only answers will show with no names (anonymous). 
+label.show.names.tip.1 = If this option is checked, then the students' name will show next to their answers. Otherwise only answers will show with no names (anonymous). 
 warning.empty.answers = One or more question(s) are not answered.  Do you want to continue anyway?
 label.on = On
 label.off = Off
@@ -155,7 +155,7 @@
 error.required = You must answer Question {0}.
 label.learning.number.of.votes = {0} / {1} votes
 label.authoring.allow.rate.answers = Allow learners to rate each other's answers
-label.authoring.allow.rate.answers.tip = Create a set of criteria for students to rate each other's answers.
+label.authoring.allow.rate.answers.tip.1 = Create a set of criteria for students to rate each other's answers.
 label.learning.draft.autosaved = Draft autosaved
 monitor.summary.date.restriction = Date and time restriction
 monitor.summary.when.date.restriction.is.set = If a date and time restriction is set, learners will not be able to answer questions after this date.
@@ -176,7 +176,7 @@
 label.waiting.for.leader = Please, wait while somebody will become a group leader and enter this activity.
 label.users.from.group = Other learners in your group:
 label.use.select.leader.tool.output = Only the leader submits answers on behalf of the team/group.
-label.use.select.leader.tool.output.tip = If you want only one student (the group leader) to submit answers on behalf of the group/team, make sure that you have a Leader Selection activity prior and this activity is grouped.
+label.use.select.leader.tool.output.tip.1 = If you want only one student (the group leader) to submit answers on behalf of the group/team, make sure that you have a Leader Selection activity prior and this activity is grouped.
 label.group.leader = Group leader: {0}
 label.modify.users.response = Modify learner's response
 label.info.use.select.leader.outputs = Group leader option is enabled
@@ -204,7 +204,7 @@
 warning.minimum.number.words = There is a minimum required number of words in a comment: {0}. So far you''ve entered {1} word(s).
 warning.comment.blank = Comment can not be blank.
 label.no.reedit.allowed = No re-edit allowed
-label.no.reedit.allowed.tip = After a student submits an answer it cannot longer edit it. 
+label.no.reedit.allowed.tip.1 = After a student submits an answer it cannot longer edit it. 
 label.search = Search...
 label.posted.by = {0} on {1}
 label.noredo.enabled = Note: after answer these questions, no changes are allowed.
@@ -218,7 +218,8 @@
 label.username = Username
 label.fullname = Fullname
 outcome.authoring.title = Learning outcomes
-outcome.authoring.title.tip = Map learning outcomes to this activity.
+outcome.authoring.title.tip.1 = Learning outcomes are skills and knowledge students should possess and can demonstrate upon completion of a learning experience.
+outcome.authoring.title.tip.2 = You can reuse tags to group activities with similar learning outcomes.
 outcome.authoring.input = Search and select by outcome name or code
 outcome.authoring.existing = Added outcomes
 outcome.authoring.existing.none = none
Index: lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rb003752c42c93ded494be5749f088998a6167395 -rf5c2b497bbe9917df1d7e3f9e6467e6865fe2f65
--- lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision b003752c42c93ded494be5749f088998a6167395)
+++ lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision f5c2b497bbe9917df1d7e3f9e6467e6865fe2f65)
@@ -191,15 +191,16 @@
 	</c:when>
 	<c:otherwise>
 		<div class="form-group row">
-			<div class="col-sm-2">
-		    	<label for="outcomeSearchInput${outcomeTagId}">
-		    		<fmt:message key="outcome.authoring.title" />
-		    	</label>
-            	<lams:Popover>
-                 	<fmt:message key="outcome.authoring.title.tip" />
-            	</lams:Popover>
+			<div class="col-sm-3">
+			    <label for="outcomeSearchInput${outcomeTagId}">
+			    	<fmt:message key="outcome.authoring.title" />
+			    </label>
+				<lams:Popover titleKey="outcome.authoring.title">
+					<fmt:message key="outcome.authoring.title.tip.1" /><br>
+					<fmt:message key="outcome.authoring.title.tip.2" />
+				</lams:Popover>
 		    </div>
-		    <div class="col-sm-10">
+		    <div class="col-sm-9">
 		    	<div class="input-group">
 				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
 				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
Index: lams_tool_laqa/web/authoring/AdvancedContent.jsp
===================================================================
diff -u -rb003752c42c93ded494be5749f088998a6167395 -rf5c2b497bbe9917df1d7e3f9e6467e6865fe2f65
--- lams_tool_laqa/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision b003752c42c93ded494be5749f088998a6167395)
+++ lams_tool_laqa/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision f5c2b497bbe9917df1d7e3f9e6467e6865fe2f65)
@@ -50,8 +50,8 @@
 			<fmt:message key="label.use.select.leader.tool.output" />
 		</label>
 		<lams:Popover>
-			<fmt:message key="label.use.select.leader.tool.output.tip" /><br>
-		 </lams:Popover>
+			<fmt:message key="label.use.select.leader.tool.output.tip.1" /><br>
+		</lams:Popover>
 	</div>
 </lams:SimplePanel>
 
@@ -77,7 +77,7 @@
 			<fmt:message key="label.no.reedit.allowed" />
 		</label>
         <lams:Popover>
-            <fmt:message key="label.no.reedit.allowed.tip" /><br>
+            <fmt:message key="label.no.reedit.allowed.tip.1" /><br>
          </lams:Popover>
 	</div>
 
@@ -87,7 +87,7 @@
 			<fmt:message key="label.learner.answer" />
 		</label>
         <lams:Popover>
-            <fmt:message key="label.learner.answer.tip" /><br>
+            <fmt:message key="label.learner.answer.tip.1" /><br>
          </lams:Popover>
 	</div>
 
@@ -98,7 +98,7 @@
 				<fmt:message key="label.show.names" />
 			</label>
         <lams:Popover>
-            <fmt:message key="label.show.names.tip" /><br>
+            <fmt:message key="label.show.names.tip.1" /><br>
          </lams:Popover>
 		</div>
 		
@@ -108,7 +108,7 @@
 				<fmt:message key="label.authoring.allow.rate.answers" />
 			</label>
         <lams:Popover>
-            <fmt:message key="label.authoring.allow.rate.answers.tip" /><br>
+            <fmt:message key="label.authoring.allow.rate.answers.tip.1" /><br>
          </lams:Popover>
 		</div>
 	
@@ -139,7 +139,7 @@
 			<fmt:message key="label.lockWhenFinished" />
 		</label>
 		<lams:Popover>
-			<fmt:message key="label.lockWhenFinished.tip" /><br>
+			<fmt:message key="label.advanced.lockOnFinished.tip.1" /><br>
 		 </lams:Popover>
 	</div>
 
@@ -148,9 +148,10 @@
 			<form:checkbox path="qa.reflect" id="reflect"/>
 			<fmt:message key="label.reflect" />
 		</label>
-        <lams:Popover>
-            <fmt:message key="label.reflect.tip" /><br>
-         </lams:Popover>
+    	<lams:Popover>
+			<fmt:message key="label.advanced.reflectOnActivity.tip.1" /><br>
+			<fmt:message key="label.advanced.reflectOnActivity.tip.2" />
+		</lams:Popover>
 	</div>
 	
 	<div id="reflectionInstructions" class="form-group">
Index: lams_tool_laqa/web/monitoring/AdvanceOptions.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rf5c2b497bbe9917df1d7e3f9e6467e6865fe2f65
--- lams_tool_laqa/web/monitoring/AdvanceOptions.jsp	(.../AdvanceOptions.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/monitoring/AdvanceOptions.jsp	(.../AdvanceOptions.jsp)	(revision f5c2b497bbe9917df1d7e3f9e6467e6865fe2f65)
@@ -7,6 +7,9 @@
 	<tr>
 		<td>
 			<fmt:message key="label.learner.answer" />
+			<lams:Popover>
+	            <fmt:message key="label.learner.answer.tip.1" /><br>
+	        </lams:Popover>
 		</td>
 		
 		<td>
@@ -24,6 +27,9 @@
 	<tr>
 		<td>
 			<fmt:message key="label.show.names" />
+			<lams:Popover>
+	        	<fmt:message key="label.show.names.tip.1" /><br>
+	        </lams:Popover>
 		</td>
 		
 		<td>
@@ -58,6 +64,9 @@
 	<tr>
 		<td>
 			<fmt:message key="label.authoring.allow.rate.answers" />
+			<lams:Popover>
+	            <fmt:message key="label.authoring.allow.rate.answers.tip.1" /><br>
+	        </lams:Popover>
 		</td>
 		
 		<td>
@@ -75,6 +84,10 @@
 	<tr>
 		<td>
 			<fmt:message key="monitor.summary.td.addNotebook" />
+			<lams:Popover>
+				<fmt:message key="label.advanced.reflectOnActivity.tip.1" /><br>
+				<fmt:message key="label.advanced.reflectOnActivity.tip.2" />
+			</lams:Popover>
 		</td>
 		
 		<td>
@@ -122,6 +135,9 @@
 	<tr>
 		<td>
 			<fmt:message key="label.lockWhenFinished" />
+			<lams:Popover>
+				<fmt:message key="label.advanced.lockOnFinished.tip.1" /><br>
+			</lams:Popover>
 		</td>
 		
 		<td>
@@ -152,10 +168,33 @@
 			</c:choose>	
 		</td>
 	</tr>
-
+	
 	<tr>
 		<td>
+			<fmt:message key="label.no.reedit.allowed" />
+			<lams:Popover>
+	            <fmt:message key="label.no.reedit.allowed.tip.1" /><br>
+	        </lams:Popover>
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${content.noReeditAllowed}">
+					<fmt:message key="label.on" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>
+	
+	<tr>
+		<td>
 			<fmt:message key="label.use.select.leader.tool.output" />
+			<lams:Popover>
+				<fmt:message key="label.use.select.leader.tool.output.tip.1" /><br>
+			</lams:Popover>
 		</td>
 		
 		<td>
Index: lams_tool_leader/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r3c09c7a0aa7bfd44dc93f167e5b28e465cb00cd3 -rf5c2b497bbe9917df1d7e3f9e6467e6865fe2f65
--- lams_tool_leader/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 3c09c7a0aa7bfd44dc93f167e5b28e465cb00cd3)
+++ lams_tool_leader/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f5c2b497bbe9917df1d7e3f9e6467e6865fe2f65)
@@ -53,7 +53,8 @@
 label.no.leader.yet.body = Once a leader is selected, you will be able to continue to the next activity
 output.desc.leader.user.id = User ID
 outcome.authoring.title = Learning outcomes
-outcome.authoring.title.tip = Map learning outcomes to this activity.
+outcome.authoring.title.tip.1 = Learning outcomes are skills and knowledge students should possess and can demonstrate upon completion of a learning experience.
+outcome.authoring.title.tip.2 = You can reuse tags to group activities with similar learning outcomes.
 outcome.authoring.input = Search and select by outcome name or code
 outcome.authoring.existing = Added outcomes
 outcome.authoring.existing.none = none
Index: lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r3c09c7a0aa7bfd44dc93f167e5b28e465cb00cd3 -rf5c2b497bbe9917df1d7e3f9e6467e6865fe2f65
--- lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 3c09c7a0aa7bfd44dc93f167e5b28e465cb00cd3)
+++ lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision f5c2b497bbe9917df1d7e3f9e6467e6865fe2f65)
@@ -191,15 +191,16 @@
 	</c:when>
 	<c:otherwise>
 		<div class="form-group row">
-			<div class="col-sm-2">
-		    	<label for="outcomeSearchInput${outcomeTagId}">
-		    		<fmt:message key="outcome.authoring.title" />
-		    	</label>
-            	<lams:Popover>
-                	<fmt:message key="outcome.authoring.title.tip" />
-            	</lams:Popover>	
+			<div class="col-sm-3">
+			    <label for="outcomeSearchInput${outcomeTagId}">
+			    	<fmt:message key="outcome.authoring.title" />
+			    </label>
+				<lams:Popover titleKey="outcome.authoring.title">
+					<fmt:message key="outcome.authoring.title.tip.1" /><br>
+					<fmt:message key="outcome.authoring.title.tip.2" />
+				</lams:Popover>
 		    </div>
-		    <div class="col-sm-10">
+		    <div class="col-sm-9">
 		    	<div class="input-group">
 				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
 				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
Index: lams_tool_notebook/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r021e17ddf062815f91ea08b94546ae76ccabd975 -rf5c2b497bbe9917df1d7e3f9e6467e6865fe2f65
--- lams_tool_notebook/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 021e17ddf062815f91ea08b94546ae76ccabd975)
+++ lams_tool_notebook/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f5c2b497bbe9917df1d7e3f9e6467e6865fe2f65)
@@ -10,7 +10,7 @@
 label.authoring.basic.content = Content:
 label.authoring.basic.instructions = Instructions:
 advanced.lockOnFinished = Lock when finished
-advanced.lockOnFinished.tip = When students finish the activity, they will be  able to come back and view the activity, but no longer add, modify or participate in it.
+label.advanced.lockOnFinished.tip.1 = When students finish the activity, they will be  able to come back and view the activity, but no longer add, modify or participate in it.
 advanced.allowRichEditor = Enable rich text editor
 label.filename = Filename
 label.type = Type
@@ -117,7 +117,8 @@
 message.learner.blank.alertforceResponse = Response is required
 advanced.enable.anonymous.posts = Enable anonymous posts
 outcome.authoring.title = Learning outcomes
-outcome.authoring.title.tip = Map learning outcomes to this activity.
+outcome.authoring.title.tip.1 = Learning outcomes are skills and knowledge students should possess and can demonstrate upon completion of a learning experience.
+outcome.authoring.title.tip.2 = You can reuse tags to group activities with similar learning outcomes.
 outcome.authoring.input = Search and select by outcome name or code
 outcome.authoring.existing = Added outcomes
 outcome.authoring.existing.none = none
Index: lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r021e17ddf062815f91ea08b94546ae76ccabd975 -rf5c2b497bbe9917df1d7e3f9e6467e6865fe2f65
--- lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 021e17ddf062815f91ea08b94546ae76ccabd975)
+++ lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision f5c2b497bbe9917df1d7e3f9e6467e6865fe2f65)
@@ -191,15 +191,16 @@
 	</c:when>
 	<c:otherwise>
 		<div class="form-group row">
-			<div class="col-sm-2">
-		    	<label for="outcomeSearchInput${outcomeTagId}">
-		    		<fmt:message key="outcome.authoring.title" />
-		    	</label>
-            	<lams:Popover>
-                	<fmt:message key="outcome.authoring.title.tip" />
-            	</lams:Popover>	
+			<div class="col-sm-3">
+			    <label for="outcomeSearchInput${outcomeTagId}">
+			    	<fmt:message key="outcome.authoring.title" />
+			    </label>
+				<lams:Popover titleKey="outcome.authoring.title">
+					<fmt:message key="outcome.authoring.title.tip.1" /><br>
+					<fmt:message key="outcome.authoring.title.tip.2" />
+				</lams:Popover>
 		    </div>
-		    <div class="col-sm-10">
+		    <div class="col-sm-9">
 		    	<div class="input-group">
 				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
 				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
Index: lams_tool_notebook/web/pages/authoring/advanced.jsp
===================================================================
diff -u -r021e17ddf062815f91ea08b94546ae76ccabd975 -rf5c2b497bbe9917df1d7e3f9e6467e6865fe2f65
--- lams_tool_notebook/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 021e17ddf062815f91ea08b94546ae76ccabd975)
+++ lams_tool_notebook/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision f5c2b497bbe9917df1d7e3f9e6467e6865fe2f65)
@@ -21,7 +21,7 @@
 		<fmt:message key="advanced.lockOnFinished" />
 	</label>
 	<lams:Popover>
-		<fmt:message key="advanced.lockOnFinished.tip" /><br>
+		<fmt:message key="label.advanced.lockOnFinished.tip.1" /><br>
 	</lams:Popover>
 </div>
 </lams:SimplePanel>
Index: lams_tool_notebook/web/pages/monitoring/advanceOptions.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rf5c2b497bbe9917df1d7e3f9e6467e6865fe2f65
--- lams_tool_notebook/web/pages/monitoring/advanceOptions.jsp	(.../advanceOptions.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_notebook/web/pages/monitoring/advanceOptions.jsp	(.../advanceOptions.jsp)	(revision f5c2b497bbe9917df1d7e3f9e6467e6865fe2f65)
@@ -6,6 +6,9 @@
 			<tr>
 				<td>
 					<fmt:message key="advanced.lockOnFinished" />
+					<lams:Popover>
+						<fmt:message key="label.advanced.lockOnFinished.tip.1" /><br>
+					</lams:Popover>
 				</td>
 				
 				<td>
Index: lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r0306947a9fa783f12b8ec160a5a52d994b2b8501 -rf5c2b497bbe9917df1d7e3f9e6467e6865fe2f65
--- lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 0306947a9fa783f12b8ec160a5a52d994b2b8501)
+++ lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f5c2b497bbe9917df1d7e3f9e6467e6865fe2f65)
@@ -15,7 +15,7 @@
 label.authoring.basic.title = Title
 label.authoring.basic.instruction = Instructions
 label.authoring.advance.lock.on.finished = Lock when finished
-label.authoring.advance.lock.on.finished.tip = When students finish the activity, they will be  able to come back and view the activity, but no longer add, modify or participate in it.  
+label.advanced.lockOnFinished.tip.1 = When students finish the activity, they will be  able to come back and view the activity, but no longer add, modify or participate in it.
 label.authoring.save.button = Save
 label.authoring.cancel.button = Cancel
 authoring.exception = There is a problem submitting content, the reason is {0}
@@ -76,8 +76,8 @@
 msg.mark.released = Marks in {0} have been released.
 error.title.blank = Title can not be blank.
 label.authoring.advanced.reflectOnActivity = Add a notebook at end of Submit Files with the following instructions:
-label.authoring.advanced.reflectOnActivity.tip = After students finish the activity, you can ask them to reflect on the activity that they have just completed. Write a meaningful question for students to reflect on. 
-error.reflection.emtpy = Please input Notebook entry
+label.advanced.reflectOnActivity.tip.1 = After students finish the activity, you can ask them to reflect on the activity that they have just completed.
+label.advanced.reflectOnActivity.tip.2 = Write a meaningful question for students to reflect on.error.reflection.emtpy = Please input Notebook entry
 title.reflection = Notebook Entry
 label.continue = Continue
 monitoring.user.fullname = Name
@@ -157,7 +157,8 @@
 label.use.select.leader.tool.output = Only the leader submits files on behalf of the team/group.
 label.marks.released = Marks have been released
 outcome.authoring.title = Learning outcomes
-outcome.authoring.title.tip = Map learning outcomes to this activity. 
+outcome.authoring.title.tip.1 = Learning outcomes are skills and knowledge students should possess and can demonstrate upon completion of a learning experience.
+outcome.authoring.title.tip.2 = You can reuse tags to group activities with similar learning outcomes.
 outcome.authoring.input = Search and select by outcome name or code
 outcome.authoring.existing = Added outcomes
 outcome.authoring.existing.none = none
@@ -169,4 +170,4 @@
 label.monitoring.change.leader = Change leader
 label.monitoring.leader.successfully.changed = Leader changed
 label.monitoring.leader.not.changed = Leader was not changed
-advanced.select.leader.tip = If you want only one student (the group leader) to submit a file(s) on behalf of the group/team, make sure that you have a Leader Selection activity prior and this activity is grouped.
+advanced.select.leader.tip.1 = If you want only one student (the group leader) to submit a file(s) on behalf of the group/team, make sure that you have a Leader Selection activity prior and this activity is grouped.
Index: lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r0306947a9fa783f12b8ec160a5a52d994b2b8501 -rf5c2b497bbe9917df1d7e3f9e6467e6865fe2f65
--- lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 0306947a9fa783f12b8ec160a5a52d994b2b8501)
+++ lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision f5c2b497bbe9917df1d7e3f9e6467e6865fe2f65)
@@ -190,17 +190,17 @@
 		</lams:SimplePanel>
 	</c:when>
 	<c:otherwise>
-		<div class="form-group row" >
-			<div class="col-sm-2">
-		    	<label for="outcomeSearchInput${outcomeTagId}">
-		    		<fmt:message key="outcome.authoring.title" />
-            		<lams:Popover>
-                 		<fmt:message key="outcome.authoring.title.tip" />
-            		</lams:Popover>				
-		    	</label>
-			</div>
-		    
-		    <div class="col-sm-10">
+		<div class="form-group row">
+			<div class="col-sm-3">
+			    <label for="outcomeSearchInput${outcomeTagId}">
+			    	<fmt:message key="outcome.authoring.title" />
+			    </label>
+				<lams:Popover titleKey="outcome.authoring.title">
+					<fmt:message key="outcome.authoring.title.tip.1" /><br>
+					<fmt:message key="outcome.authoring.title.tip.2" />
+				</lams:Popover>
+		    </div>
+		    <div class="col-sm-9">
 		    	<div class="input-group">
 				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
 				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
Index: lams_tool_sbmt/web/authoring/advance.jsp
===================================================================
diff -u -r0306947a9fa783f12b8ec160a5a52d994b2b8501 -rf5c2b497bbe9917df1d7e3f9e6467e6865fe2f65
--- lams_tool_sbmt/web/authoring/advance.jsp	(.../advance.jsp)	(revision 0306947a9fa783f12b8ec160a5a52d994b2b8501)
+++ lams_tool_sbmt/web/authoring/advance.jsp	(.../advance.jsp)	(revision f5c2b497bbe9917df1d7e3f9e6467e6865fe2f65)
@@ -69,8 +69,8 @@
 			<fmt:message key="label.use.select.leader.tool.output" />
 		</label>
 		<lams:Popover>
-			<fmt:message key="advanced.select.leader.tip" /><br>
-		 </lams:Popover>
+			<fmt:message key="advanced.select.leader.tip.1" /><br>
+		</lams:Popover>
 	</div>
 </lams:SimplePanel>
 
@@ -137,7 +137,7 @@
 			<fmt:message key="label.authoring.advance.lock.on.finished" />
 		</label>
         <lams:Popover>
-            <fmt:message key="label.authoring.advance.lock.on.finished.tip" /><br>
+            <fmt:message key="label.advanced.lockOnFinished.tip.1" /><br>
          </lams:Popover>		
 	</div>
 	
@@ -146,9 +146,10 @@
 			<form:checkbox path="reflectOnActivity" id="reflectOnActivity" />
 			<fmt:message key="label.authoring.advanced.reflectOnActivity" />
 		</label>
-        <lams:Popover>
-            <fmt:message key="label.authoring.advanced.reflectOnActivity.tip" /><br>
-         </lams:Popover>		
+		<lams:Popover>
+			<fmt:message key="label.advanced.reflectOnActivity.tip.1" /><br>
+			<fmt:message key="label.advanced.reflectOnActivity.tip.2" />
+		</lams:Popover>	
 	</div>
 	
 	<div class="form-group">
Index: lams_tool_sbmt/web/monitoring/parts/advanceoptions.jsp
===================================================================
diff -u -re34c7b767eb34caebbfa0c9bdfb50d771d3b9d95 -rf5c2b497bbe9917df1d7e3f9e6467e6865fe2f65
--- lams_tool_sbmt/web/monitoring/parts/advanceoptions.jsp	(.../advanceoptions.jsp)	(revision e34c7b767eb34caebbfa0c9bdfb50d771d3b9d95)
+++ lams_tool_sbmt/web/monitoring/parts/advanceoptions.jsp	(.../advanceoptions.jsp)	(revision f5c2b497bbe9917df1d7e3f9e6467e6865fe2f65)
@@ -6,6 +6,9 @@
 	<tr>
 		<td>
 			<fmt:message key="label.use.select.leader.tool.output" />
+			<lams:Popover>
+				<fmt:message key="advanced.select.leader.tip.1" /><br>
+			</lams:Popover>
 		</td>
 		
 		<td>
@@ -23,6 +26,9 @@
 	<tr>
 		<td>
 			<fmt:message key="label.authoring.advance.lock.on.finished" />
+			<lams:Popover>
+	            <fmt:message key="label.advanced.lockOnFinished.tip.1" /><br>
+	        </lams:Popover>
 		</td>
 		
 		<td>
@@ -108,6 +114,10 @@
 	<tr>
 		<td>
 			<fmt:message key="monitor.summary.td.addNotebook" />
+			<lams:Popover>
+				<fmt:message key="label.advanced.reflectOnActivity.tip.1" /><br>
+				<fmt:message key="label.advanced.reflectOnActivity.tip.2" />
+			</lams:Popover>	
 		</td>
 		
 		<td>
Index: lams_tool_survey/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r76f86debc5af6991364b2425db778b8e792693f8 -rf5c2b497bbe9917df1d7e3f9e6467e6865fe2f65
--- lams_tool_survey/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 76f86debc5af6991364b2425db778b8e792693f8)
+++ lams_tool_survey/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f5c2b497bbe9917df1d7e3f9e6467e6865fe2f65)
@@ -28,7 +28,7 @@
 label.authoring.basic.survey.delete = Delete
 label.authoring.basic.survey.title.input = Title
 label.authoring.advance.lock.on.finished = Lock when finished
-label.authoring.advance.lock.on.finished.tip = When students finish the activity, they will be  able to come back and view the activity, but no longer add, modify or participate in it.
+label.advanced.lockOnFinished.tip.1 = When students finish the activity, they will be  able to come back and view the activity, but no longer add, modify or participate in it.
 label.authoring.advance.show.on.one.page = Show all survey questions in one page
 label.authoring.save.button = Save
 label.authoring.cancel.button = Cancel
@@ -88,8 +88,8 @@
 label.down = Down
 label.monitoring.heading.access = Learners list
 label.authoring.advanced.reflectOnActivity = Add a notebook at end of Survey with the following instructions:
-label.authoring.advanced.reflectOnActivity.tip = After students finish the activity, you can ask them to reflect on the activity that they have just completed. Write a meaningful question for students to reflect on. 
-error.reflection.emtpy = Please input Notebook entry
+label.advanced.reflectOnActivity.tip.1 = After students finish the activity, you can ask them to reflect on the activity that they have just completed.
+label.advanced.reflectOnActivity.tip.2 = Write a meaningful question for students to reflect on.error.reflection.emtpy = Please input Notebook entry
 title.reflection = Notebook entry
 label.continue = Continue
 monitoring.user.fullname = Name
@@ -162,7 +162,7 @@
 label.submit = Finish
 label.monitoring.heading = Survey Monitoring
 label.show.answers.from.other.users = After submission, display survey results
-label.show.answers.from.other.users.tip = After the student submits his/her survey answers, the student is presented with the survey results.
+label.show.answers.from.other.users.tip.1 = After the student submits his/her survey answers, the student is presented with the survey results.
 label.view.all.responses = View all responses
 label.sort.by.answer = Sort by answer
 label.other.answers = Answers from other Learners
@@ -176,7 +176,8 @@
 label.summary.downloaded = =Report Downloaded
 label.timestamp = Date/time
 outcome.authoring.title = Learning outcomes
-outcome.authoring.title.tip = Map learning outcomes to this activity.
+outcome.authoring.title.tip.1 = Learning outcomes are skills and knowledge students should possess and can demonstrate upon completion of a learning experience.
+outcome.authoring.title.tip.2 = You can reuse tags to group activities with similar learning outcomes.
 outcome.authoring.input = Search and select by outcome name or code
 outcome.authoring.existing = Added outcomes
 outcome.authoring.existing.none = none
Index: lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r76f86debc5af6991364b2425db778b8e792693f8 -rf5c2b497bbe9917df1d7e3f9e6467e6865fe2f65
--- lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 76f86debc5af6991364b2425db778b8e792693f8)
+++ lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision f5c2b497bbe9917df1d7e3f9e6467e6865fe2f65)
@@ -191,15 +191,16 @@
 	</c:when>
 	<c:otherwise>
 		<div class="form-group row">
-			<div class="col-sm-2">
-		    	<label for="outcomeSearchInput${outcomeTagId}">
-		    		<fmt:message key="outcome.authoring.title" />
-		    	</label>
-            	<lams:Popover>
-                	<fmt:message key="outcome.authoring.title.tip" />
-            	</lams:Popover>	
+			<div class="col-sm-3">
+			    <label for="outcomeSearchInput${outcomeTagId}">
+			    	<fmt:message key="outcome.authoring.title" />
+			    </label>
+				<lams:Popover titleKey="outcome.authoring.title">
+					<fmt:message key="outcome.authoring.title.tip.1" /><br>
+					<fmt:message key="outcome.authoring.title.tip.2" />
+				</lams:Popover>
 		    </div>
-		    <div class="col-sm-10">
+		    <div class="col-sm-9">
 		    	<div class="input-group">
 				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
 				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
Index: lams_tool_survey/web/pages/authoring/advance.jsp
===================================================================
diff -u -r76f86debc5af6991364b2425db778b8e792693f8 -rf5c2b497bbe9917df1d7e3f9e6467e6865fe2f65
--- lams_tool_survey/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 76f86debc5af6991364b2425db778b8e792693f8)
+++ lams_tool_survey/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision f5c2b497bbe9917df1d7e3f9e6467e6865fe2f65)
@@ -17,8 +17,8 @@
 			<fmt:message key="label.show.answers.from.other.users" />
 		</label>
 		<lams:Popover>
-			<fmt:message key="label.show.answers.from.other.users.tip" /><br>
-		 </lams:Popover>
+			<fmt:message key="label.show.answers.from.other.users.tip.1" /><br>
+		</lams:Popover>
 	</div>
 
 </lams:SimplePanel>
@@ -44,7 +44,7 @@
 			<fmt:message key="label.authoring.advance.lock.on.finished" />
 		</label>
 		<lams:Popover>
-			<fmt:message key="label.authoring.advance.lock.on.finished.tip" /><br>
+			<fmt:message key="label.advanced.lockOnFinished.tip.1" /><br>
 		 </lams:Popover>
 	</div>
 	
@@ -54,8 +54,9 @@
 			<fmt:message key="label.authoring.advanced.reflectOnActivity" />
 		</label>
 		<lams:Popover>
-			<fmt:message key="label.authoring.advanced.reflectOnActivity.tip" /><br>
-		 </lams:Popover>
+			<fmt:message key="label.advanced.reflectOnActivity.tip.1" /><br>
+			<fmt:message key="label.advanced.reflectOnActivity.tip.2" />
+		</lams:Popover>
 	</div>
 	
 	<div class="form-group">
Index: lams_tool_survey/web/pages/monitoring/advanceoptions.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rf5c2b497bbe9917df1d7e3f9e6467e6865fe2f65
--- lams_tool_survey/web/pages/monitoring/advanceoptions.jsp	(.../advanceoptions.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_survey/web/pages/monitoring/advanceoptions.jsp	(.../advanceoptions.jsp)	(revision f5c2b497bbe9917df1d7e3f9e6467e6865fe2f65)
@@ -5,6 +5,9 @@
 		<tr>
 			<td>
 				<fmt:message key="label.authoring.advance.lock.on.finished" />
+				<lams:Popover>
+					<fmt:message key="label.advanced.lockOnFinished.tip.1" /><br>
+				</lams:Popover>
 			</td>
 			
 			<td>
@@ -39,6 +42,9 @@
 		<tr>
 			<td>
 				<fmt:message key="label.show.answers.from.other.users" />
+				<lams:Popover>
+					<fmt:message key="label.show.answers.from.other.users.tip.1" /><br>
+				</lams:Popover>
 			</td>
 			
 			<td>
@@ -74,6 +80,10 @@
 		<tr>
 			<td>
 				<fmt:message key="monitor.summary.td.addNotebook" />
+				<lams:Popover>
+					<fmt:message key="label.advanced.reflectOnActivity.tip.1" /><br>
+					<fmt:message key="label.advanced.reflectOnActivity.tip.2" />
+				</lams:Popover>
 			</td>
 			
 			<td>
Index: lams_tool_vote/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r76f86debc5af6991364b2425db778b8e792693f8 -rf5c2b497bbe9917df1d7e3f9e6467e6865fe2f65
--- lams_tool_vote/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 76f86debc5af6991364b2425db778b8e792693f8)
+++ lams_tool_vote/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f5c2b497bbe9917df1d7e3f9e6467e6865fe2f65)
@@ -15,12 +15,12 @@
 label.authoring.vote.basic = Please define the nominations
 label.monitoring = Voting Monitoring
 label.allowText = Add free text nomination
-label.allowText.tip = Include an additional input entry where students can insert their text nomination. 
+label.allowText.tip.1 = Include an additional input entry where students can insert their text nomination. 
 label.maxNomCount = Maximum votes
 label.vote.nominations = Nominations
 label.nomination = Nomination
 label.vote.lockedOnFinish = Lock when finished
-label.vote.lockedOnFinish.tip = When students finish the activity, they will be  able to come back and view the activity, but no longer add, modify or participate in it.  
+label.advanced.lockOnFinished.tip.1 = When students finish the activity, they will be  able to come back and view the activity, but no longer add, modify or participate in it.
 label.authoring.title = Title
 label.authoring.instructions = Instructions
 label.moveDown = Down
@@ -92,8 +92,8 @@
 label.refresh = Refresh
 label.continue = Continue
 label.reflect = Add a notebook at end of Voting with the following instructions:
-label.reflect.tip = After students finish the activity, you can ask them to reflect on the activity that they have just completed. Write a meaningful question for students to reflect on. 
-label.notebook.entries = Notebook entries
+label.advanced.reflectOnActivity.tip.1 = After students finish the activity, you can ask them to reflect on the activity that they have just completed.
+label.advanced.reflectOnActivity.tip.2 = Write a meaningful question for students to reflect on.label.notebook.entries = Notebook entries
 label.reflection = Notebook entry
 label.learner = Learner
 label.view.reflection = Notebook entries
@@ -114,7 +114,7 @@
 error.empty.selection = Please select at least one nomination.
 output.desc.learner.selection = Learner selection
 label.show.results = After submission, display voting results
-label.show.results.tip = After the student submits his/her vote, the student is presented with the voting results.
+label.show.results.tip.1 = After the student submits his/her vote, the student is presented with the voting results.
 message.warnLockOnFinish = Note: You can redo your vote now. If you choose to continue, you won't be able to change your vote.
 message.activityLocked = The instructor has set this activity not to allow re-doing of votes after you have finished it.
 label.nominations.available = You have {0} vote(s), please choose your option(s)
@@ -139,7 +139,7 @@
 label.waiting.for.leader = Please, wait while somebody will become a group leader and enter this activity.
 label.users.from.group = Other learners in your group:
 label.use.select.leader.tool.output = Only the leader votes on behalf of the team/group.
-label.use.select.leader.tool.output.tip = If you want only one student (the group leader) to vote on behalf of the group/team, make sure that you have a Leader Selection activity prior and this activity is grouped.
+label.use.select.leader.tool.output.tip.1 = If you want only one student (the group leader) to vote on behalf of the group/team, make sure that you have a Leader Selection activity prior and this activity is grouped.
 label.group.leader = Group leader: {0}
 button.submitActivity = Finish
 label.total.number.students.voted = A total of {0} over {1} learners have voted
@@ -157,7 +157,8 @@
 label.search = Search...
 message.monitoring.edit.activity.warning = Warning: if you edit and modify a nomination that has already been selected, it would be reseted to zero -as the nomination has changed.
 outcome.authoring.title = Learning outcomes
-outcome.authoring.title.tip = Map learning outcomes to this activity. 
+outcome.authoring.title.tip.1 = Learning outcomes are skills and knowledge students should possess and can demonstrate upon completion of a learning experience.
+outcome.authoring.title.tip.2 = You can reuse tags to group activities with similar learning outcomes.
 outcome.authoring.input = Search and select by outcome name or code
 outcome.authoring.existing = Added outcomes
 outcome.authoring.existing.none = none
Index: lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r2d2e2ef4a7e40d7b123d71ee635b47bc2248b5ca -rf5c2b497bbe9917df1d7e3f9e6467e6865fe2f65
--- lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 2d2e2ef4a7e40d7b123d71ee635b47bc2248b5ca)
+++ lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision f5c2b497bbe9917df1d7e3f9e6467e6865fe2f65)
@@ -191,15 +191,16 @@
 	</c:when>
 	<c:otherwise>
 		<div class="form-group row">
-			<div class="col-sm-2">
-		    	<label for="outcomeSearchInput${outcomeTagId}">
-		    		<fmt:message key="outcome.authoring.title" />
-		    	</label>
-            	<lams:Popover>
-                	<fmt:message key="outcome.authoring.title.tip" />
-            	</lams:Popover>	
+			<div class="col-sm-3">
+			    <label for="outcomeSearchInput${outcomeTagId}">
+			    	<fmt:message key="outcome.authoring.title" />
+			    </label>
+				<lams:Popover titleKey="outcome.authoring.title">
+					<fmt:message key="outcome.authoring.title.tip.1" /><br>
+					<fmt:message key="outcome.authoring.title.tip.2" />
+				</lams:Popover>
 		    </div>
-		    <div class="col-sm-10">
+		    <div class="col-sm-9">
 		    	<div class="input-group">
 				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
 				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
Index: lams_tool_vote/web/authoring/AdvancedContent.jsp
===================================================================
diff -u -r2d2e2ef4a7e40d7b123d71ee635b47bc2248b5ca -rf5c2b497bbe9917df1d7e3f9e6467e6865fe2f65
--- lams_tool_vote/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 2d2e2ef4a7e40d7b123d71ee635b47bc2248b5ca)
+++ lams_tool_vote/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision f5c2b497bbe9917df1d7e3f9e6467e6865fe2f65)
@@ -15,7 +15,7 @@
 			<fmt:message key="label.use.select.leader.tool.output" />
 		</label>
 		<lams:Popover>
-			<fmt:message key="label.use.select.leader.tool.output.tip" /><br>
+			<fmt:message key="label.use.select.leader.tool.output.tip.1" /><br>
 		 </lams:Popover>
 	</div>
 	
@@ -28,9 +28,9 @@
 			<form:checkbox path="allowText" id="allowText" value="1" onchange="changeMinMaxVotes(-1, -1);" />
 			<fmt:message key="label.allowText" />
 		</label>
-        <lams:Popover>
+    	<lams:Popover>
             <fmt:message key="label.allowText.tip" /><br>
-         </lams:Popover>
+		</lams:Popover>
 	</div>
 	
 	<div class="form-group">
@@ -65,7 +65,7 @@
 			<fmt:message key="label.show.results" />
 		</label>
         <lams:Popover>
-            <fmt:message key="label.show.results.tip" /><br>
+            <fmt:message key="label.show.results.tip.1" /><br>
          </lams:Popover>
 	</div>
 
@@ -81,7 +81,7 @@
 			<fmt:message key="label.vote.lockedOnFinish" />
 		</label>
 		<lams:Popover>
-			<fmt:message key="label.vote.lockedOnFinish.tip" /><br>
+			<fmt:message key="label.advanced.lockOnFinished.tip.1" /><br>
 		 </lams:Popover>
 	</div>
 
@@ -91,8 +91,9 @@
 			<fmt:message key="label.reflect" />
 		</label>
         <lams:Popover>
-            <fmt:message key="label.reflect.tip" /><br>
-         </lams:Popover>
+            <fmt:message key="label.advanced.reflectOnActivity.tip.1" /><br>
+			<fmt:message key="label.advanced.reflectOnActivity.tip.2" />
+		</lams:Popover>
 	</div>
 	<div class="form-group">
 		<form:textarea rows="3" path="reflectionSubject" cssClass="form-control"></form:textarea> 
Index: lams_tool_vote/web/monitoring/AdvanceOptions.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rf5c2b497bbe9917df1d7e3f9e6467e6865fe2f65
--- lams_tool_vote/web/monitoring/AdvanceOptions.jsp	(.../AdvanceOptions.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_vote/web/monitoring/AdvanceOptions.jsp	(.../AdvanceOptions.jsp)	(revision f5c2b497bbe9917df1d7e3f9e6467e6865fe2f65)
@@ -6,6 +6,9 @@
 	<tr>
 		<td>
 			<fmt:message key="label.use.select.leader.tool.output" />
+			<lams:Popover>
+				<fmt:message key="label.use.select.leader.tool.output.tip.1" /><br>
+			 </lams:Popover>
 		</td>
 		
 		<td>
@@ -23,6 +26,9 @@
 	<tr>
 		<td>
 			<fmt:message key="label.vote.lockedOnFinish" />
+			 <lams:Popover>
+				<fmt:message key="label.advanced.lockOnFinished.tip.1" /><br>
+			 </lams:Popover>
 		</td>
 		<td>
 			<c:choose>
@@ -73,6 +79,9 @@
 	<tr>
 		<td>
 			<fmt:message key="label.show.results" />
+			<lams:Popover>
+	            <fmt:message key="label.show.results.tip.1" /><br>
+	         </lams:Popover>
 		</td>	
 		<td>
 			<c:choose>
@@ -89,6 +98,10 @@
 	<tr>
 		<td>
 			<fmt:message key="monitor.summary.td.addNotebook" />
+			<lams:Popover>
+	            <fmt:message key="label.advanced.reflectOnActivity.tip.1" /><br>
+				<fmt:message key="label.advanced.reflectOnActivity.tip.2" />
+			</lams:Popover>
 		</td>
 		<td>	
 			<c:choose>