Index: lams_tool_survey/web/pages/authoring/basic.jsp
===================================================================
diff -u -r9ad7805407672e72dfc83fb0ba49ccafb0d43d6f -ra365c42dcc890ee15ee51fa8affc3511d1aceea4
--- lams_tool_survey/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 9ad7805407672e72dfc83fb0ba49ccafb0d43d6f)
+++ lams_tool_survey/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision a365c42dcc890ee15ee51fa8affc3511d1aceea4)
@@ -1,5 +1,7 @@
-<%@ include file="/common/taglibs.jsp" %>
-<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="formBean"
+	value="<%=request
+									.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 <script lang="javascript">
 <!-- Common Javascript functions for LAMS -->
 
@@ -9,7 +11,7 @@
 	function showMessage(url) {
 		var area=document.getElementById("questionInputArea");
 		if(area != null){
-			area.style.width="685px";
+			area.style.width="640px";
 			area.style.height="100%";
 			area.src=url;
 			area.style.display="block";
@@ -107,57 +109,50 @@
 	}
 
 </script>
-	<!-- Basic Tab Content -->
-	<table>
-		<tr>
-			<td colspan="2">
-				<div class="field-name">
-					<fmt:message key="label.authoring.basic.title"></fmt:message>
-				</div>
-				<html:text property="survey.title" style="width: 99%;"></html:text>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="2">
-				<div class="field-name">
-					<fmt:message key="label.authoring.basic.instruction"></fmt:message>
-				</div>
-				<lams:FCKEditor id="survey.instructions"
-					value="${formBean.survey.instructions}"
-					contentFolderID="${formBean.contentFolderID}"></lams:FCKEditor>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="2">
-				<div id="surveyListArea">
-						<c:set var="sessionMapID" value="${formBean.sessionMapID}"/>
-						<%@ include file="/pages/authoring/parts/itemlist.jsp"%>
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="2">
-				<table class="forms">
-					<tr>
-						<td>
-							<a href="javascript:showMessage('<html:rewrite page="/authoring/newItemInit.do?itemType=1&contentFolderID=${formBean.contentFolderID}&sessionMapID=${formBean.sessionMapID}"/>');">
-								<fmt:message key="label.authoring.basic.add.survey.question" />
-							</a>
-						</td>
-						<td>
-							<a href="javascript:showMessage('<html:rewrite page="/authoring/newItemInit.do?itemType=3&contentFolderID=${formBean.contentFolderID}&sessionMapID=${formBean.sessionMapID}"/>');">
-								<fmt:message key="label.authoring.basic.add.survey.open.question" />
-							</a>
-						</td>
-					</tr>
-				</table>
-			</td>
-		</tr>
-		<tr>
-			<td  colspan="2">
-				<iframe onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'" 
-					id="questionInputArea" name="questionInputArea" style="width:0px;height:0px;border:0px;display:none" frameborder="no" scrolling="no">
-				</iframe>
-			</td>
-		</tr>
-	</table>
+<!-- Basic Tab Content -->
+<table>
+	<tr>
+		<td colspan="2">
+			<div class="field-name">
+				<fmt:message key="label.authoring.basic.title"></fmt:message>
+			</div>
+			<html:text property="survey.title" style="width: 99%;"></html:text>
+		</td>
+	</tr>
+	<tr>
+		<td colspan="2">
+			<div class="field-name">
+				<fmt:message key="label.authoring.basic.instruction"></fmt:message>
+			</div>
+			<lams:FCKEditor id="survey.instructions"
+				value="${formBean.survey.instructions}"
+				contentFolderID="${formBean.contentFolderID}"></lams:FCKEditor>
+		</td>
+	</tr>
+
+</table>
+<div id="surveyListArea">
+	<c:set var="sessionMapID" value="${formBean.sessionMapID}" />
+	<%@ include file="/pages/authoring/parts/itemlist.jsp"%>
+</div>
+
+<p align="center">
+	<a
+		href="javascript:showMessage('<html:rewrite page="/authoring/newItemInit.do?itemType=1&contentFolderID=${formBean.contentFolderID}&sessionMapID=${formBean.sessionMapID}"/>');">
+		<fmt:message key="label.authoring.basic.add.survey.question" /> </a>
+
+	<a
+		href="javascript:showMessage('<html:rewrite page="/authoring/newItemInit.do?itemType=3&contentFolderID=${formBean.contentFolderID}&sessionMapID=${formBean.sessionMapID}"/>');"
+		class="space-left"> <fmt:message
+			key="label.authoring.basic.add.survey.open.question" /> </a>
+</p>
+
+<p>
+	<iframe
+		onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'"
+		id="questionInputArea" name="questionInputArea"
+		style="width:0px;height:0px;border:0px;display:none" frameborder="no"
+		scrolling="no">
+	</iframe>
+</p>
+
Index: lams_tool_survey/web/pages/authoring/parts/addchoicequestion.jsp
===================================================================
diff -u -r12085431903d9ea39d8b405bb70c7f01c936c409 -ra365c42dcc890ee15ee51fa8affc3511d1aceea4
--- lams_tool_survey/web/pages/authoring/parts/addchoicequestion.jsp	(.../addchoicequestion.jsp)	(revision 12085431903d9ea39d8b405bb70c7f01c936c409)
+++ lams_tool_survey/web/pages/authoring/parts/addchoicequestion.jsp	(.../addchoicequestion.jsp)	(revision a365c42dcc890ee15ee51fa8affc3511d1aceea4)
@@ -4,112 +4,87 @@
 <html>
 	<head>
 		<%@ include file="/common/header.jsp"%>
+		<lams:css style="tabbed" />
 		<%-- user for  surveysurveyitem.js --%>
 		<script type="text/javascript">
 	   var removeInstructionUrl = "<c:url value='/authoring/removeInstruction.do'/>";
        var addInstructionUrl = "<c:url value='/authoring/newInstruction.do'/>";
 	</script>
 		<script type="text/javascript"
 			src="<html:rewrite page='/includes/javascript/surveyitem.js'/>"></script>
-		<style type="text/css">
-	<!--
-	table { 
-		 width:650px;
-		 margin-left:0px; 
-		 text-align:left; 
-		 }
-	
-	td { 
-		padding:4px; 
-		font-size:12px;
-	}
-		
-	-->
-	</style>
 	</head>
-	<body class="tabpart">
-		<table class="forms" border="0">
-			<!-- Basic Info Form-->
-			<tr>
-				<td>
-					<%@ include file="/common/messages.jsp"%>
-					<html:form action="/authoring/saveOrUpdateItem" method="post" styleId="surveyItemForm">
-						<c:set var="formBean"	value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-						<%-- This field is not belong STRUTS form --%>
-						<input type="hidden" name="instructionList" id="instructionList" />
-						<html:hidden property="sessionMapID" />
-						<html:hidden property="itemIndex" />
-						<html:hidden property="contentFolderID" />
-						<%-- This value should be 1 or 2 --%>
-						<html:hidden property="itemType" value="1" />
-						<table >
-							<tr>
-								<td colspan="3">
-									<h2>
-										<fmt:message key="label.authoring.basic.add.survey.question" />
-									</h2>
-								</td>
-							</tr>
-							<tr>
-								<td colspan="2">
-									<fmt:message key="label.question" />
-								</td>
-								<td>
-									<html:checkbox property="question.optional" styleClass="noBorder">
-										<fmt:message key="label.authoring.basic.question.optional" />
-									</html:checkbox>
-								</td>								
-							</tr>
-							<tr>
-								<td colspan="3">
-									<lams:FCKEditor id="question.description"
-										value="${formBean.question.description}"
-										contentFolderID="${formBean.contentFolderID}"></lams:FCKEditor>
-								</td>
-							</tr>
-							<tr>
-								<td>
-									<a href="javascript:;" onclick="addInstruction()" class="button"><fmt:message key="label.authoring.basic.add.option"/></a>
-									<img src="${ctxPath}/includes/images/indicator.gif" style="display:none" id="instructionArea_Busy" />
-								</td>
-								<td>
-									<html:checkbox property="question.allowMultipleAnswer" styleClass="noBorder">
-										<fmt:message key="label.authoring.basic.question.allow.muli.answer" />
-									</html:checkbox>
-								</td>				
-								<td>
-									<html:checkbox property="question.appendText" styleClass="noBorder">
-										<fmt:message key="label.authoring.basic.question.append.text" />
-									</html:checkbox>
-								</td>
-							</tr>			
-						</table>
-					</html:form>
-				</td>
-			</tr>
-			<tr>
-				<!-- Instructions -->
-				<td>
-					<%@ include file="instructions.jsp"%>
-				</td>
-			</tr>
+	<body>
+		<!-- Basic Info Form-->
 
-			<tr>
-				<td align="center" valign="bottom">
-					<a href="#" onclick="submitSurveyItem()" class="button-add-item">
-						<fmt:message key="label.authoring.basic.add.question" /> 
-					</a> 
-					&nbsp;&nbsp;
-					<a href="javascript:;" onclick="cancelSurveyItem()" class="button">
-						<fmt:message key="label.cancel" /> 
-					</a>
-				</td>
-			</tr>
-			<tr>
-				<td>
-					&nbsp;
-				</td>
-			</tr>
-		</table>
+		<%@ include file="/common/messages.jsp"%>
+		<html:form action="/authoring/saveOrUpdateItem" method="post"
+			styleId="surveyItemForm">
+			<c:set var="formBean"
+				value="<%=request
+										.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+			<%-- This field is not belong STRUTS form --%>
+			<input type="hidden" name="instructionList" id="instructionList" />
+			<html:hidden property="sessionMapID" />
+			<html:hidden property="itemIndex" />
+			<html:hidden property="contentFolderID" />
+			<%-- This value should be 1 or 2 --%>
+			<html:hidden property="itemType" value="1" />
+
+			<h2 class="no-space-left">
+				<fmt:message key="label.authoring.basic.add.survey.question" />
+			</h2>
+
+			<div class="field-name">
+				<fmt:message key="label.question" />
+			</div>
+
+
+
+			<lams:FCKEditor id="question.description"
+				value="${formBean.question.description}"
+				contentFolderID="${formBean.contentFolderID}"></lams:FCKEditor>
+
+			<div class="space-top">
+				<html:checkbox property="question.optional" styleClass="noBorder"
+					styleId="questionOptional">
+				</html:checkbox>
+
+				<label for="questionOptional">
+					<fmt:message key="label.authoring.basic.question.optional" />
+				</label>
+			</div>
+
+			<div class="space-top">
+				<a href="javascript:;" onclick="addInstruction()" class="button"><fmt:message
+						key="label.authoring.basic.add.option" /> </a>
+				<img src="${ctxPath}/includes/images/indicator.gif"
+					style="display:none" id="instructionArea_Busy" />
+
+				<span class="space-left"> <html:checkbox
+						property="question.allowMultipleAnswer"
+						styleId="questionAllowMultipleAnswer" styleClass="noBorder">
+					</html:checkbox> <label for="questionAllowMultipleAnswer">
+						<fmt:message
+							key="label.authoring.basic.question.allow.muli.answer" />
+					</label> <html:checkbox property="question.appendText"
+						styleClass="noBorder" styleId="questionAppendText">
+					</html:checkbox> <label for="questionAppendText">
+						<fmt:message key="label.authoring.basic.question.append.text" />
+					</label> </span>
+			</div>
+
+		</html:form>
+		<!-- Instructions -->
+
+		<%@ include file="instructions.jsp"%>
+
+		<div class="space-bottom-top">
+			<a href="#" onclick="submitSurveyItem()" class="button-add-item">
+				<fmt:message key="label.authoring.basic.add.question" /> </a>
+
+			<a href="javascript:;" onclick="cancelSurveyItem()"
+				class="button space-left"> <fmt:message key="label.cancel" /> </a>
+		</div>
+
 	</body>
 </html>
Index: lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp
===================================================================
diff -u -r12085431903d9ea39d8b405bb70c7f01c936c409 -ra365c42dcc890ee15ee51fa8affc3511d1aceea4
--- lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp	(.../addopenquestion.jsp)	(revision 12085431903d9ea39d8b405bb70c7f01c936c409)
+++ lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp	(.../addopenquestion.jsp)	(revision a365c42dcc890ee15ee51fa8affc3511d1aceea4)
@@ -4,86 +4,62 @@
 <html>
 	<head>
 		<%@ include file="/common/header.jsp"%>
+		<lams:css style="tabbed" />
+
 		<%-- user for  surveysurveyitem.js --%>
 		<script type="text/javascript">
 	   var removeInstructionUrl = "<c:url value='/authoring/removeInstruction.do'/>";
        var addInstructionUrl = "<c:url value='/authoring/newInstruction.do'/>";
 	</script>
 		<script type="text/javascript"
 			src="<html:rewrite page='/includes/javascript/surveyitem.js'/>"></script>
-		<style type="text/css">
-	<!--
-	table { 
-		 width:650px;
-		 margin-left:0px; 
-		 text-align:left; 
-		 }
-	
-	td { 
-		padding:4px; 
-		font-size:12px;
-	}
-		
-	-->
-	</style>
+
 	</head>
-	<body class="tabpart">
-		<table class="forms" border="0">
-			<!-- Basic Info Form-->
-			<tr>
-				<td>
-					<%@ include file="/common/messages.jsp"%>
-					<html:form action="/authoring/saveOrUpdateItem" method="post" styleId="surveyItemForm">
-						<c:set var="formBean"	value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-						<html:hidden property="sessionMapID" />
-						<html:hidden property="contentFolderID" />
-						<html:hidden property="itemIndex" />
-						<html:hidden property="itemType" value="3" />
-						<table >
-							<tr>
-								<td colspan="2">
-									<h2>
-										<fmt:message key="label.authoring.basic.add.survey.question" />
-									</h2>
-								</td>
-							</tr>
-							<tr>
-								<td>
-									<fmt:message key="label.question" />
-								</td>
-								<td>
-									<html:checkbox property="question.optional" styleClass="noBorder">
-										<fmt:message key="label.authoring.basic.question.optional" />
-									</html:checkbox>
-								</td>								
-							</tr>
-							<tr>
-								<td colspan="2">
-								<lams:FCKEditor id="question.description"
-									value="${formBean.question.description}"
-									contentFolderID="${formBean.contentFolderID}"></lams:FCKEditor>
-								</td>
-							</tr>
-						</table>
-					</html:form>
-				</td>
-			</tr>
-			<tr>
-				<td align="center" valign="bottom">
-					<a href="#" onclick="submitSurveyItem()" class="button-add-item">
-						<fmt:message key="label.authoring.basic.add.question" /> 
-					</a> 
-					&nbsp;&nbsp;
-					<a href="javascript:;" onclick="cancelSurveyItem()" class="button">
-						<fmt:message key="label.cancel" /> 
-					</a>
-				</td>
-			</tr>
-			<tr>
-				<td>
-					&nbsp;
-				</td>
-			</tr>
-		</table>
+	<body>
+
+		<!-- Basic Info Form-->
+
+		<%@ include file="/common/messages.jsp"%>
+		<html:form action="/authoring/saveOrUpdateItem" method="post"
+			styleId="surveyItemForm">
+			<c:set var="formBean"
+				value="<%=request
+										.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+			<html:hidden property="sessionMapID" />
+			<html:hidden property="contentFolderID" />
+			<html:hidden property="itemIndex" />
+			<html:hidden property="itemType" value="3" />
+
+			<h2 class="no-space-left">
+				<fmt:message key="label.authoring.basic.add.survey.question" />
+			</h2>
+
+			<div class="field-name">
+				<fmt:message key="label.question" />
+			</div>
+
+			<lams:FCKEditor id="question.description"
+				value="${formBean.question.description}"
+				contentFolderID="${formBean.contentFolderID}"></lams:FCKEditor>
+
+			<div class="space-top">
+				<html:checkbox property="question.optional" styleClass="noBorder"
+					styleId="questionOptional">
+				</html:checkbox>
+
+				<label for="questionOptional">
+					<fmt:message key="label.authoring.basic.question.optional" />
+				</label>
+			</div>
+
+		</html:form>
+
+		<div class="space-bottom-top">
+			<a href="#" onclick="submitSurveyItem()" class="button-add-item">
+				<fmt:message key="label.authoring.basic.add.question" /> </a>
+			<a href="javascript:;" onclick="cancelSurveyItem()"
+				class="button space-left"> <fmt:message key="label.cancel" /> </a>
+		</div>
+
 	</body>
 </html>
Index: lams_tool_survey/web/pages/authoring/parts/instructions.jsp
===================================================================
diff -u -rc4a429ad90657aa55fb72fccf49cf717a3e7fd12 -ra365c42dcc890ee15ee51fa8affc3511d1aceea4
--- lams_tool_survey/web/pages/authoring/parts/instructions.jsp	(.../instructions.jsp)	(revision c4a429ad90657aa55fb72fccf49cf717a3e7fd12)
+++ lams_tool_survey/web/pages/authoring/parts/instructions.jsp	(.../instructions.jsp)	(revision a365c42dcc890ee15ee51fa8affc3511d1aceea4)
@@ -1,39 +1,60 @@
-<%@ include file="/common/taglibs.jsp" %>
-<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
-<c:set var="listSize" value="${fn:length(instructionList)}"/>
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="ctxPath" value="${pageContext.request.contextPath}"
+	scope="request" />
+<c:set var="listSize" value="${fn:length(instructionList)}" />
 <div id="instructionArea">
 	<form id="instructionForm">
-	<input type="hidden" name="instructionCount" id="instructionCount">
-	<table border="0" style="width:400px" id="questionTable">
-		<c:forEach var="item" items="${instructionList}" varStatus="status">
-			<tr id="instructionItem${status.index}">
-				<td width="3px">${status.index+1}</td>
-				<td width="100px"><input type="text" name="instructionItemDesc${status.index}" id="instructionItemDesc${status.index}" size="60" value="${item}"></td>
-				
-				<td width="20px">
-					<%-- Don't display down icon if last line --%>
-					<c:if test="${0 != status.index}">
-						<a href="javascript:;" onclick="upItem('${status.index}')">
-							<img src="<html:rewrite page='/includes/images/uparrow.gif'/>" border="0"  title="<fmt:message key="label.up"/>">
-						</a>
-					</c:if>
-				</td>
-				<td width="20px">
-					<%-- Don't display down icon if last line --%>
-					<c:if test="${listSize != status.count}">
-						<a href="javascript:;" onclick="downItem('${status.index}','${listSize}')">
-							<img src="<html:rewrite page='/includes/images/downarrow.gif'/>" border="0"  title="<fmt:message key="label.down"/>"> 
-						</a>
-					</c:if>
-				</td>
-				<td width="30px" align="center">
-					<a href="javascript:;" onclick="removeInstruction('${status.index}')">
-						<img src="<html:rewrite page='/includes/images/cross.gif'/>" border="0" title="<fmt:message key="label.delete"/>">
-					</a>
-				</td>
-			</tr>
-		</c:forEach>
-	</table>
+		<input type="hidden" name="instructionCount" id="instructionCount">
+		<table id="questionTable">
+			<c:forEach var="item" items="${instructionList}" varStatus="status">
+				<tr id="instructionItem${status.index}">
+					<td width="3px">
+						${status.index+1}
+					</td>
+					<td width="100px">
+						<input type="text" name="instructionItemDesc${status.index}"
+							id="instructionItemDesc${status.index}" size="60" value="${item}">
+					</td>
+
+					<td width="40px">
+						<%-- Don't display down icon if last line --%>
+						<c:choose>
+							<c:when test="${0 != status.index}">
+								<img src="<html:rewrite page='/includes/images/uparrow.gif'/>"
+									border="0" title="<fmt:message key="label.up"/>"
+									onclick="upItem('${status.index}')">
+							</c:when>
+							<c:otherwise>
+								<img
+									src="<html:rewrite page='/includes/images/uparrow_disabled.gif'/>"
+									border="0" title="<fmt:message key="label.up"/>">
+							</c:otherwise>
+						</c:choose>
+
+
+						<c:choose>
+							<c:when test="${listSize != status.count}">
+								<img src="<html:rewrite page='/includes/images/downarrow.gif'/>"
+									border="0" title="<fmt:message key="label.down"/>"
+									onclick="downItem('${status.index}','${listSize}')">
+							</c:when>
+							<c:otherwise>
+								<img
+									src="<html:rewrite page='/includes/images/downarrow_disabled.gif'/>"
+									border="0" title="<fmt:message key="label.down"/>">
+							</c:otherwise>
+						</c:choose>
+
+						<%-- Don't display down icon if last line --%>
+					</td>
+					<td width="30px" align="center">
+						<img src="<html:rewrite page='/includes/images/cross.gif'/>"
+							border="0" title="<fmt:message key="label.delete"/>"
+							onclick="removeInstruction('${status.index}')">
+					</td>
+				</tr>
+			</c:forEach>
+		</table>
 	</form>
 </div>
 
Index: lams_tool_survey/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -r7ed78ed8506a377056c19c18d0c105cafc384f44 -ra365c42dcc890ee15ee51fa8affc3511d1aceea4
--- lams_tool_survey/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 7ed78ed8506a377056c19c18d0c105cafc384f44)
+++ lams_tool_survey/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision a365c42dcc890ee15ee51fa8affc3511d1aceea4)
@@ -1,66 +1,86 @@
-<%@ include file="/common/taglibs.jsp" %>
-<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="ctxPath" value="${pageContext.request.contextPath}"
+	scope="request" />
 <div id="itemList">
-<h2><fmt:message key="label.authoring.basic.survey.list.title" />
-<img src="${ctxPath}/includes/images/indicator.gif" style="display:none" id="surveyListArea_Busy" /></h2>
+	<h2 class="spacer-left">
+		<fmt:message key="label.authoring.basic.survey.list.title" />
+		<img src="${ctxPath}/includes/images/indicator.gif"
+			style="display:none" id="surveyListArea_Busy" />
+	</h2>
 
-<table id="itemTable" style="align:left;width:650px" >
-<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+	<table id="itemTable" class="alternative-color">
+		<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-<c:forEach var="question" items="${sessionMap.questionList}" varStatus="status">
-	<tr>
-		<td width="20px" align="center">
-			<c:choose>
-				<c:when test="${question.type == 1}">
-					<img src="${ctxPath}/includes/images/icon_single.gif"/>
-				</c:when>
-				<c:when test="${question.type == 2}">
-					<img src="${ctxPath}/includes/images/icon_multiple.gif"/>
-				</c:when>
-				<c:when test="${question.type == 3}">
-					<img src="${ctxPath}/includes/images/icon_text.gif"/>
-				</c:when>
-			</c:choose>
-		</td>
-		<td>${question.shortTitle}</td>
-		<td width="80px" align="center">
-			<c:if test="${question.optional}">
-				<fmt:message key="label.optional"/>
-			</c:if>
-		</td>
-		<c:if test="${not status.first}">
-			<td width="20px" align="center">
-				<a href="javascript:;" onclick="upQuestion(${status.index},'${sessionMapID}')">
-					<img src="<html:rewrite page='/includes/images/uparrow.gif'/>" border="0"  title="<fmt:message key="label.up"/>">
-				</a>
-			</td>
-			<c:if test="${status.last}">
-				<td>&nbsp;</td>
-			</c:if>
-		</c:if>
-		<c:if test="${not status.last}">
-			<c:if test="${status.first}">
-				<td>&nbsp;</td>
-			</c:if>
-			<td width="20px" align="center">
-				<a href="javascript:;" onclick="downQuestion(${status.index},'${sessionMapID}')">
-					<img src="<html:rewrite page='/includes/images/downarrow.gif'/>" border="0"  title="<fmt:message key="label.down"/>"> 
-				</a>
-			</td>
-		</c:if>
-		<td width="80px" align="center">
-			<a href="javascript:;" onclick="editItem(${status.index},${question.type},'${sessionMapID}','${contentFolderID}')" class="button">
-				<fmt:message key="label.authoring.basic.survey.edit" />
-			</a>
-		</td>
-		<td width="80px" align="center">
-			<a href="javascript:;" onclick="deleteItem(${status.index},'${sessionMapID}')" class="button">
-				<fmt:message key="label.authoring.basic.survey.delete" />
-			</a>
-		</td>
-	</tr>
-</c:forEach>
-</table>
+		<c:forEach var="question" items="${sessionMap.questionList}"
+			varStatus="status">
+			<tr>
+				<td width="20px" align="center">
+					<c:choose>
+						<c:when test="${question.type == 1}">
+							<img src="${ctxPath}/includes/images/icon_single.gif" />
+						</c:when>
+						<c:when test="${question.type == 2}">
+							<img src="${ctxPath}/includes/images/icon_multiple.gif" />
+						</c:when>
+						<c:when test="${question.type == 3}">
+							<img src="${ctxPath}/includes/images/icon_text.gif" />
+						</c:when>
+					</c:choose>
+				</td>
+
+				<td>
+					${question.shortTitle}
+				</td>
+
+				<td width="80px" align="center">
+					<c:if test="${question.optional}">
+						<fmt:message key="label.optional" />
+					</c:if>
+				</td>
+
+				<td width="40px" align="center">
+					<c:if test="${not status.first}">
+						<img src="<html:rewrite page='/includes/images/uparrow.gif'/>"
+							border="0" title="<fmt:message key="label.up"/>"
+							onclick="upQuestion(${status.index},'${sessionMapID}')">
+						<c:if test="${status.last}">
+							<img
+								src="<html:rewrite page='/includes/images/downarrow_disabled.gif'/>"
+								border="0" title="<fmt:message key="label.down"/>">
+						</c:if>
+					</c:if>
+
+					<c:if test="${not status.last}">
+						<c:if test="${status.first}">
+							<img
+								src="<html:rewrite page='/includes/images/uparrow_disabled.gif'/>"
+								border="0" title="<fmt:message key="label.up"/>">
+						</c:if>
+
+						<img src="<html:rewrite page='/includes/images/downarrow.gif'/>"
+							border="0" title="<fmt:message key="label.down"/>"
+							onclick="downQuestion(${status.index},'${sessionMapID}')">
+					</c:if>
+				</td>
+
+				<td width="20px" align="center">
+
+					<img src="<html:rewrite page='/includes/images/edit.gif'/>"
+						border="0"
+						title="<fmt:message key="label.authoring.basic.survey.edit"/>"
+						onclick="editItem(${status.index},${question.type},'${sessionMapID}','${contentFolderID}')">
+
+				</td>
+				<td width="20px" align="center">
+
+					<img src="<html:rewrite page='/includes/images/cross.gif'/>" border="0"
+						title="<fmt:message
+							key="label.authoring.basic.survey.delete" />"
+						onclick="deleteItem(${status.index},'${sessionMapID}')">
+				</td>
+			</tr>
+		</c:forEach>
+	</table>
 </div>
 <%-- This script will works when a new resoruce item submit in order to refresh "Survey List" panel. --%>
 <script lang="javascript">