Index: lams_tool_assessment/web/WEB-INF/tags/Arrow.tag
===================================================================
diff -u
--- lams_tool_assessment/web/WEB-INF/tags/Arrow.tag	(revision 0)
+++ lams_tool_assessment/web/WEB-INF/tags/Arrow.tag	(revision 3a3e8d8da9a68a70d1e8c9d718346960d5d115a1)
@@ -0,0 +1,35 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%-- state = up: up arrow;  state = down: down arrow --%>
+<%@ attribute name="state" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="onclick" required="false" rtexprvalue="true"%>
+
+<c:choose>
+	<c:when test="${not empty title}">
+		<c:set var="fullTitle">title="${title}"</c:set>
+	</c:when>
+	<c:otherwise>
+		<c:set var="fullTitle" value=""/>
+	</c:otherwise>
+</c:choose>
+
+<c:choose>
+	<c:when test="${not empty onclick}">
+		<c:set var="fullOnclick">onclick="${onclick}"</c:set>
+	</c:when>
+	<c:otherwise>
+		<c:set var="fullOnclick" value=""/>
+	</c:otherwise>
+</c:choose>
+
+<c:choose>
+	<c:when test="${fn:containsIgnoreCase(state, 'up')}">
+		<i class="fa fa-long-arrow-up fa-pull-left" ${fullTitle} ${fullOnclick}></i>
+	</c:when>
+	<c:otherwise>
+		<i class="fa fa-long-arrow-down fa-pull-right"  ${fullTitle} ${fullOnclick}></i>
+	</c:otherwise>
+</c:choose>
Index: lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r3900618a37feede0762b63edea137223d4f19721 -r3a3e8d8da9a68a70d1e8c9d718346960d5d115a1
--- lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3900618a37feede0762b63edea137223d4f19721)
+++ lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3a3e8d8da9a68a70d1e8c9d718346960d5d115a1)
@@ -440,6 +440,10 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
Index: lams_tool_assessment/web/pages/learning/parts/allquestions.jsp
===================================================================
diff -u -rdbc7ce0bc9f424c489eea4f884879f052dd867f2 -r3a3e8d8da9a68a70d1e8c9d718346960d5d115a1
--- lams_tool_assessment/web/pages/learning/parts/allquestions.jsp	(.../allquestions.jsp)	(revision dbc7ce0bc9f424c489eea4f884879f052dd867f2)
+++ lams_tool_assessment/web/pages/learning/parts/allquestions.jsp	(.../allquestions.jsp)	(revision 3a3e8d8da9a68a70d1e8c9d718346960d5d115a1)
@@ -18,6 +18,10 @@
 							</span>
 						</c:if>
 							
+						<c:if test="${empty question.question}">
+							<!--  must have something here otherwise the question-numbers span does not float properly -->
+							&nbsp;
+						</c:if>
 						${question.question}
 					</div>
 					
Index: lams_tool_assessment/web/pages/learning/parts/ordering.jsp
===================================================================
diff -u -rdbc7ce0bc9f424c489eea4f884879f052dd867f2 -r3a3e8d8da9a68a70d1e8c9d718346960d5d115a1
--- lams_tool_assessment/web/pages/learning/parts/ordering.jsp	(.../ordering.jsp)	(revision dbc7ce0bc9f424c489eea4f884879f052dd867f2)
+++ lams_tool_assessment/web/pages/learning/parts/ordering.jsp	(.../ordering.jsp)	(revision 3a3e8d8da9a68a70d1e8c9d718346960d5d115a1)
@@ -32,17 +32,17 @@
 					<input type="hidden" name="question${status.index}_${option.sequenceId}" value="${option.sequenceId}" />
 					<c:out value="${option.optionString}" escapeXml="false" />
 				</td>
-				
+								
 				<c:if test="${(mode != 'teacher') || !hasEditRight}">
-					<td style="text-align: center; width: 20px;">
+					<td class="arrows">
 						<c:if test="${not ordStatus.first and !finishedLock}">
-							<i class="fa fa-angle-up" title="<fmt:message key="label.authoring.basic.up"/>" 
-								onclick="upOption(${question.uid},${ordStatus.index})"></i>	
+							<c:set var="up"><fmt:message key='label.authoring.basic.up'/></c:set>
+							<lams:Arrow state="up" title="${up}" onclick="upOption(${question.uid},${ordStatus.index})"/>
 						</c:if>
 			
 						<c:if test="${not ordStatus.last and !finishedLock}">
-							<i class="fa fa-angle-down" title="<fmt:message key="label.authoring.basic.down"/>"
-								onclick="downOption(${question.uid},${ordStatus.index})"></i>	
+							<c:set var="down"><fmt:message key='label.authoring.basic.down'/></c:set>
+							<lams:Arrow state="down" title="${down}" onclick="downOption(${question.uid},${ordStatus.index})"/>
 						</c:if>
 					</td>
 				</c:if>