Index: lams_tool_lamc/web/authoring/candidateAnswersList.jsp
===================================================================
diff -u -r8e97adb8dda2f984a9b43f71eacd9a5033244bff -r73db6f5aae9d7fdaf209abcf1967d3fd96e6954f
--- lams_tool_lamc/web/authoring/candidateAnswersList.jsp	(.../candidateAnswersList.jsp)	(revision 8e97adb8dda2f984a9b43f71eacd9a5033244bff)
+++ lams_tool_lamc/web/authoring/candidateAnswersList.jsp	(.../candidateAnswersList.jsp)	(revision 73db6f5aae9d7fdaf209abcf1967d3fd96e6954f)
@@ -60,12 +60,12 @@
 				 		<c:if test="${optionsCount != 1}"> 		
 				 		
 							<c:if test="${optionIndex != 1}">
-								<lams:Arrow state="up" title="<fmt:message key='label.tip.moveCandidateUp'/>" 
+								<lams:Arrow state="up" titleKey="label.tip.moveCandidateUp" 
 									onclick="javascript:submitModifyCandidate('${optionIndex}', 'moveCandidateUp');"/>
 							</c:if>
 
 							<c:if test="${optionIndex != optionsCount}">
-								<lams:Arrow state="down" title="<fmt:message key='label.tip.moveCandidateDown'/>" 
+								<lams:Arrow state="down" titleKey="label.tip.moveCandidateDown" 
 									onclick="javascript:submitModifyCandidate('${optionIndex}', 'moveCandidateDown');"/>
 							</c:if>
 						
Index: lams_tool_laqa/web/authoring/itemlist.jsp
===================================================================
diff -u -rb19b1766bda6ae9634e07b9046948df7d2d2caca -r73db6f5aae9d7fdaf209abcf1967d3fd96e6954f
--- lams_tool_laqa/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision b19b1766bda6ae9634e07b9046948df7d2d2caca)
+++ lams_tool_laqa/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision 73db6f5aae9d7fdaf209abcf1967d3fd96e6954f)
@@ -41,12 +41,12 @@
 				<td class="arrows" style="width:5%">
 					<!-- Don't display up icon if first line -->
 					<c:if test="${not status.first}">
-		 				<lams:Arrow state="up" title="<fmt:message key='label.tip.moveQuestionUp'/>"
+		 				<lams:Arrow state="up" titleKey="label.tip.moveQuestionUp"
 		 							onclick="javascript:moveQuestion(${status.index},'moveQuestionUp')" />
 		 			</c:if>
 					<!-- Don't display down icon if last line -->
 					<c:if test="${not status.last}">
-						<lams:Arrow state="down" title="<fmt:message key='label.tip.moveQuestionDown'/>"
+						<lams:Arrow state="down" titleKey="label.tip.moveQuestionDown"
 									onclick="javascript:moveQuestion(${status.index},'moveQuestionDown') "/>
 		 			</c:if>
 				</td>
Index: lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -r05c00f92856ef13cd90d6fce06acb069418c2512 -r73db6f5aae9d7fdaf209abcf1967d3fd96e6954f
--- lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 05c00f92856ef13cd90d6fce06acb069418c2512)
+++ lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 73db6f5aae9d7fdaf209abcf1967d3fd96e6954f)
@@ -64,11 +64,11 @@
 				<c:if test="${!isAuthoringRestricted}">
 					<td class="arrows" style="width:5%">
 						<c:if test="${not status.first}">
-							<lams:Arrow state="up" title="<fmt:message key='label.authoring.basic.up'/>" onclick="return upItem(${status.index})"/>
+							<lams:Arrow state="up" titleKey="label.up" onclick="return upItem(${status.index})"/>
 						</c:if>
 			
 						<c:if test="${not status.last}">
-							<lams:Arrow state="down" title="<fmt:message key='label.authoring.basic.down'/>" onclick="return downItem(${status.index})"/>
+							<lams:Arrow state="down" titleKey="label.down" onclick="return downItem(${status.index})"/>
 						</c:if>
 					</td>
 				</c:if>
Index: lams_tool_scratchie/web/pages/authoring/parts/optionlist.jsp
===================================================================
diff -u -re8a7110708b15579af2c6b31ac52a6da427fef6d -r73db6f5aae9d7fdaf209abcf1967d3fd96e6954f
--- lams_tool_scratchie/web/pages/authoring/parts/optionlist.jsp	(.../optionlist.jsp)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
+++ lams_tool_scratchie/web/pages/authoring/parts/optionlist.jsp	(.../optionlist.jsp)	(revision 73db6f5aae9d7fdaf209abcf1967d3fd96e6954f)
@@ -24,10 +24,10 @@
 				<c:if test="${!isAuthoringRestricted}">
 					<td class="arrows" style="width:5%">
 						<c:if test="${not status.first}">
-							<lams:Arrow state="up" title="<fmt:message key='label.up'/>" onclick="upAnswer(${status.index})"/>
+							<lams:Arrow state="up" titleKey="label.up" onclick="upAnswer(${status.index})"/>
 						</c:if>
 						<c:if test="${not status.last}">
-							<lams:Arrow state="down" title="<fmt:message key='label.down'/>" onclick="downAnswer(${status.index})"/>
+							<lams:Arrow state="down" titleKey="label.down" onclick="downAnswer(${status.index})"/>
 						</c:if>
 					</td>