Index: lams_tool_survey/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -raa932dd995a61adeed918456c6257a4a9a9cea74 -r76f86debc5af6991364b2425db778b8e792693f8
--- lams_tool_survey/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision aa932dd995a61adeed918456c6257a4a9a9cea74)
+++ lams_tool_survey/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 76f86debc5af6991364b2425db778b8e792693f8)
@@ -28,7 +28,8 @@
 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.show.on.one.page = Show survey on one page
+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.authoring.advance.show.on.one.page = Show all survey questions in one page
 label.authoring.save.button = Save
 label.authoring.cancel.button = Cancel
 label.description = Description:
@@ -87,6 +88,7 @@
 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
 title.reflection = Notebook entry
 label.continue = Continue
@@ -159,7 +161,8 @@
 label.copy = Copy
 label.submit = Finish
 label.monitoring.heading = Survey Monitoring
-label.show.answers.from.other.users = Show answers from other learners
+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.view.all.responses = View all responses
 label.sort.by.answer = Sort by answer
 label.other.answers = Answers from other Learners
@@ -173,6 +176,7 @@
 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.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 -r6d2a3554753de6920d704a64c03dc48cc11599a8 -r76f86debc5af6991364b2425db778b8e792693f8
--- lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 6d2a3554753de6920d704a64c03dc48cc11599a8)
+++ lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 76f86debc5af6991364b2425db778b8e792693f8)
@@ -191,11 +191,15 @@
 	</c:when>
 	<c:otherwise>
 		<div class="form-group row">
-		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
-		    	<fmt:message key="outcome.authoring.title" />
-		    </label>
-		    
-		    <div class="col-sm-9">
+			<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="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 -r80821e9537b4e30c38b9ca656076f09d9bcbf316 -r76f86debc5af6991364b2425db778b8e792693f8
--- lams_tool_survey/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 80821e9537b4e30c38b9ca656076f09d9bcbf316)
+++ lams_tool_survey/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 76f86debc5af6991364b2425db778b8e792693f8)
@@ -16,6 +16,9 @@
 		<form:checkbox path="survey.showOtherUsersAnswers" id="showOtherUsersAnswers"/>
 			<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>
 	</div>
 
 </lams:SimplePanel>
@@ -40,13 +43,19 @@
 		<form:checkbox path="survey.lockWhenFinished" id="lockWhenFinished"/>
 			<fmt:message key="label.authoring.advance.lock.on.finished" />
 		</label>
+		<lams:Popover>
+			<fmt:message key="label.authoring.advance.lock.on.finished.tip" /><br>
+		 </lams:Popover>
 	</div>
 	
 	<div class="checkbox">
 		<label for="reflectOn">
 		<form:checkbox path="survey.reflectOnActivity" id="reflectOn"/>
 			<fmt:message key="label.authoring.advanced.reflectOnActivity" />
 		</label>
+		<lams:Popover>
+			<fmt:message key="label.authoring.advanced.reflectOnActivity.tip" /><br>
+		 </lams:Popover>
 	</div>
 	
 	<div class="form-group">
Index: lams_tool_vote/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r2d2e2ef4a7e40d7b123d71ee635b47bc2248b5ca -r76f86debc5af6991364b2425db778b8e792693f8
--- lams_tool_vote/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2d2e2ef4a7e40d7b123d71ee635b47bc2248b5ca)
+++ lams_tool_vote/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 76f86debc5af6991364b2425db778b8e792693f8)
@@ -113,7 +113,7 @@
 nominations.duplicate = There are duplicate nomination entries.
 error.empty.selection = Please select at least one nomination.
 output.desc.learner.selection = Learner selection
-label.show.results = Display voting results after submission
+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.
 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.