Index: lams_tool_survey/conf/language/ApplicationResources.properties
===================================================================
diff -u -rda4922153c70143093722bbeefa326179417cf1f -r591901c172e777a18103d90746ac008c584e7793
--- lams_tool_survey/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision da4922153c70143093722bbeefa326179417cf1f)
+++ lams_tool_survey/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 591901c172e777a18103d90746ac008c584e7793)
@@ -11,7 +11,6 @@
 activity.helptext  =Answer surveys.
 tool.display.name  =Survey Tool
 tool.description  =Tool for survey.
-appName  =Survey
 errorPage.title  =Error page
 errorPage.heading  =Some error occurs when handling your request
 label.authoring.heading  =Survey
@@ -74,7 +73,6 @@
 label.of=of
 error.upload.failed  =Upload file failed: {0}
 error.msg.upload.file.not.found  =Could not find upload file {0}.
-error.msg.zip.file.exception  =Could not handle zip file when uploading file.
 error.msg.file.not.found  =File not found exception occurs when uploading file.
 error.msg.io.exception  =IOException occurs when uploading file.
 error.msg.invaid.param.upload  =InvalidParameterException occured while trying to upload File.
@@ -92,16 +90,11 @@
 monitoring.tab.instructions  =Instruction
 monitoring.tab.edit.activity  =Edit Activity
 monitoring.label.group  =Group
-monitoring.summary.note  =Note: number of learners is the number of learners who have viewed the survey.
 monitoring.label.type  =Type
 monitoring.label.title  =Title
-monitoring.label.suggest  =Suggested By
 monitoring.label.number.learners  =Number of Learners
-monitoring.label.hide  =Hide
-monitoring.label.show  =Show
 monitoring.label.user.loginname  =Login name
 monitoring.label.user.name  =Name
-monitoring.label.hidden  =Hidden
 label.monitoring.edit.activity.cancel  =Cancel
 label.monitoring.edit.activity.update  =Update
 label.monitoring.edit.activity.edit  =Edit
@@ -133,7 +126,6 @@
 run.offline.message  =This activity is not being done on the computer. Please see your instructor for details.
 message.monitoring.summary.no.survey.for.group  =No survey available for this group.
 button.try.again  =Try again
-open.in.new.window  =Open URL in pop-up
 label.up  =Move Up
 label.down  =Move down
 
@@ -144,11 +136,9 @@
 label.continue=Continue
 monitoring.user.fullname=Name
 monitoring.user.reflection=Refection
-page.title.monitoring.view.reflection=View Reflection
+page.title.monitoring.view.reflection=View reflection
 button.close=Close
 
-
-
 label.open.response=Open response
 piechart.title= Question {0} Pie Chart
 barchart.title= Question {0} Column Chart
Index: lams_tool_survey/web/pages/authoring/advance.jsp
===================================================================
diff -u -r0b9b61d67c2dcf6f83c513325afca117cb1967f2 -r591901c172e777a18103d90746ac008c584e7793
--- lams_tool_survey/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 0b9b61d67c2dcf6f83c513325afca117cb1967f2)
+++ lams_tool_survey/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 591901c172e777a18103d90746ac008c584e7793)
@@ -27,7 +27,7 @@
 		</tr>
 		<tr>
 			<td colspan="2">
-				<lams:STRUTS-textarea property="survey.reflectInstructions" styleId="reflectInstructions" cols="30" rows="3" />
+				<html:textarea property="survey.reflectInstructions" styleId="reflectInstructions" cols="30" rows="3" />
 			</td>
 		</tr>		
 	</table>
Index: lams_tool_survey/web/pages/learning/learning.jsp
===================================================================
diff -u -r825e32a1131e134c0e2d560418cc349973b3702f -r591901c172e777a18103d90746ac008c584e7793
--- lams_tool_survey/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
+++ lams_tool_survey/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 591901c172e777a18103d90746ac008c584e7793)
@@ -43,10 +43,7 @@
 			<h1>
 				${sessionMap.title}
 			</h1>
-
-			<h2>
-				${sessionMap.instructions}
-			</h2>
+				<h2><c:out value="${sessionMap.instructions}" escapeXml="false"/></h2>
 			<BR><BR>
 				<table cellpadding="0" cellspacing="0" class="alternative-color">
 					<c:choose>
@@ -92,9 +89,11 @@
 								</html:button> 
 							</span>
 							<span class="right-buttons">
-								<html:button property="NextButton"  onclick="nextQuestion()" styleClass="button"  disabled="${nextChecked}">
-									<fmt:message key="label.next" />
-								</html:button>
+								<c:if test="${position != 2}">
+									<html:button property="NextButton"  onclick="nextQuestion()" styleClass="button"  disabled="${nextChecked}">
+										<fmt:message key="label.next" />
+									</html:button>
+								</c:if>
 								<c:if test="${position == 2}">
 									<html:submit property="doSurvey"  disabled="${sessionMap.finishedLock}"  styleClass="button">
 										<fmt:message key="label.submit.survey" />
Index: lams_tool_survey/web/pages/learning/notebook.jsp
===================================================================
diff -u -r825e32a1131e134c0e2d560418cc349973b3702f -r591901c172e777a18103d90746ac008c584e7793
--- lams_tool_survey/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
+++ lams_tool_survey/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 591901c172e777a18103d90746ac008c584e7793)
@@ -28,7 +28,7 @@
 					</tr>
 					<tr>
 						<td>
-							${sessionMap.reflectInstructions}
+							<lams:out value="${sessionMap.reflectInstructions}"/>
 						</td>
 					</tr>
 		
Index: lams_tool_survey/web/pages/learning/result.jsp
===================================================================
diff -u -r825e32a1131e134c0e2d560418cc349973b3702f -r591901c172e777a18103d90746ac008c584e7793
--- lams_tool_survey/web/pages/learning/result.jsp	(.../result.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
+++ lams_tool_survey/web/pages/learning/result.jsp	(.../result.jsp)	(revision 591901c172e777a18103d90746ac008c584e7793)
@@ -38,7 +38,7 @@
 			${sessionMap.title}
 		</h1>
 			<h2>
-				${sessionMap.instructions}
+				<c:out value="${sessionMap.instructions}" escapeXml="false"/>
 			</h2>
 			<BR>
 			<BR>
Index: lams_tool_survey/web/pages/monitoring/notebook.jsp
===================================================================
diff -u -r825e32a1131e134c0e2d560418cc349973b3702f -r591901c172e777a18103d90746ac008c584e7793
--- lams_tool_survey/web/pages/monitoring/notebook.jsp	(.../notebook.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
+++ lams_tool_survey/web/pages/monitoring/notebook.jsp	(.../notebook.jsp)	(revision 591901c172e777a18103d90746ac008c584e7793)
@@ -13,24 +13,15 @@
 			<h1>
 				<fmt:message key="page.title.monitoring.view.reflection"/>
 			</h1>
-			
-				<table>
+				${userDTO.fullName}<BR><BR>
+				<table class="alternative-color">
 					<tr>
-						<td>
-							<h1>
-								${userDTO.fullName}
-							</h1>
-						</td>
+						<th class="first">
+							<lams:out value="${userDTO.reflectInstrctions}"/>
+						</th>
 					</tr>
 					<tr>
 						<td>
-							<h1>
-								${userDTO.reflectInstrctions}
-							</h1>
-						</td>
-					</tr>
-					<tr>
-						<td>
 							<c:choose>
 								<c:when test="${userDTO.finishReflection}">
 									<lams:out value="${userDTO.reflect}"/>