Index: lams_tool_lamc/web/authoring/BasicContent.jsp
===================================================================
diff -u -r9ad7805407672e72dfc83fb0ba49ccafb0d43d6f -r7011368b3f7cc34d52ce8f8640b64a9add794dd6
--- lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 9ad7805407672e72dfc83fb0ba49ccafb0d43d6f)
+++ lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 7011368b3f7cc34d52ce8f8640b64a9add794dd6)
@@ -28,7 +28,7 @@
 	function showMessage(url) {
 		var area=document.getElementById("messageArea");
 		if(area != null){
-			area.style.width="670px";
+			area.style.width="640px";
 			area.style.height="100%";
 			area.src=url;
 			area.style.display="block";
@@ -65,95 +65,70 @@
 
 </script>
 
-			<html:hidden property="questionIndex"/>
-			<table cellpadding="0">
+<html:hidden property="questionIndex" />
+<table cellpadding="0">
+	<tr>
+		<td colspan="2">
+			<div class="field-name">
+				<fmt:message key="label.authoring.title.col"></fmt:message>
+			</div>
+			<html:text property="title" style="width: 99%;"></html:text>
+		</td>
+	</tr>
 
-						<tr>
-							<td colspan="2">
-								<div class="field-name">
-									<fmt:message key="label.authoring.title.col"></fmt:message>
-								</div>
-								<html:text property="title" style="width: 100%;"></html:text>
-							</td>
-						</tr>
-						
+	<tr>
+		<td colspan="2">
+			<div class="field-name">
+				<fmt:message key="label.authoring.instructions.col"></fmt:message>
+			</div>
+			<lams:FCKEditor id="instructions"
+				value="${mcGeneralAuthoringDTO.activityInstructions}"
+				contentFolderID="${mcGeneralAuthoringDTO.contentFolderID}"></lams:FCKEditor>
+		</td>
+	</tr>
+</table>
 
-						<tr>
-							<td colspan="2">
-								<div class="field-name">
-									<fmt:message key="label.authoring.instructions.col"></fmt:message>
-								</div>
-								<lams:FCKEditor id="instructions"
-									value="${mcGeneralAuthoringDTO.activityInstructions}"
-									contentFolderID="${mcGeneralAuthoringDTO.contentFolderID}"></lams:FCKEditor>
-							</td>
-						</tr>
-	
-				 		<tr>
-						<td colspan="2">
-							<div id="resourceListArea">
-						 		<c:if test="${mcGeneralAuthoringDTO.activeModule == 'authoring' || mcGeneralAuthoringDTO.activeModule == 'defineLater'}"> 		
-									<%@ include file="/authoring/itemlist.jsp"%>
-								</c:if> 							
-						 		<c:if test="${mcGeneralAuthoringDTO.activeModule != 'authoring' && mcGeneralAuthoringDTO.activeModule != 'defineLater'}"> 		
-									<%@ include file="/monitoring/itemlist.jsp"%>
-								</c:if> 							
-							</div>
-						</td>
-						</tr>
-						
+<div id="resourceListArea">
+	<c:if
+		test="${mcGeneralAuthoringDTO.activeModule == 'authoring' || mcGeneralAuthoringDTO.activeModule == 'defineLater'}">
+		<%@ include file="/authoring/itemlist.jsp"%>
+	</c:if>
+	<c:if
+		test="${mcGeneralAuthoringDTO.activeModule != 'authoring' && mcGeneralAuthoringDTO.activeModule != 'defineLater'}">
+		<%@ include file="/monitoring/itemlist.jsp"%>
+	</c:if>
+</div>
 
-			 		<c:if test="${mcGeneralAuthoringDTO.activeModule == 'authoring' || mcGeneralAuthoringDTO.activeModule == 'defineLater'}"> 								
-						<tr>
-							<td colspan="2">
-									<a href="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=newQuestionBox&requestType=direct&contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&toolContentID=${mcGeneralAuthoringDTO.toolContentID}&activeModule=${mcGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${mcGeneralAuthoringDTO.defaultContentIdStr}&sln=${mcGeneralAuthoringDTO.sln}&questionsSequenced=${mcGeneralAuthoringDTO.questionsSequenced}&retries=${mcGeneralAuthoringDTO.retries}"/>');"
-										style="float:right;width:150px" class="button-add-item"> <fmt:message
-										key="label.add.new.question" /> </a>
-							</td>
-						</tr>
-					</c:if> 												
-			 		<c:if test="${mcGeneralAuthoringDTO.activeModule != 'authoring' && mcGeneralAuthoringDTO.activeModule != 'defineLater'}"> 							
-						<tr>
-							<td colspan="2">
-									<a href="javascript:showMessage('<html:rewrite page="/monitoring.do?dispatch=newQuestionBox&requestType=direct&contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&toolContentID=${mcGeneralAuthoringDTO.toolContentID}&activeModule=${mcGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${mcGeneralAuthoringDTO.defaultContentIdStr}"/>');"
-										style="float:right;width:150px" class="button-add-item"> <fmt:message
-										key="label.add.new.question" /> </a>
-							</td>
-						</tr>
-					</c:if> 																		 		
+<p>
+	<c:if
+		test="${mcGeneralAuthoringDTO.activeModule == 'authoring' || mcGeneralAuthoringDTO.activeModule == 'defineLater'}">
+		<a
+			href="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=newQuestionBox&requestType=direct&contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&toolContentID=${mcGeneralAuthoringDTO.toolContentID}&activeModule=${mcGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${mcGeneralAuthoringDTO.defaultContentIdStr}&sln=${mcGeneralAuthoringDTO.sln}&questionsSequenced=${mcGeneralAuthoringDTO.questionsSequenced}&retries=${mcGeneralAuthoringDTO.retries}"/>');"
+			class="button-add-item"> <fmt:message
+				key="label.add.new.question" /> </a>
+	</c:if>
+	<c:if
+		test="${mcGeneralAuthoringDTO.activeModule != 'authoring' && mcGeneralAuthoringDTO.activeModule != 'defineLater'}">
+		<a
+			href="javascript:showMessage('<html:rewrite page="/monitoring.do?dispatch=newQuestionBox&requestType=direct&contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&toolContentID=${mcGeneralAuthoringDTO.toolContentID}&activeModule=${mcGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${mcGeneralAuthoringDTO.defaultContentIdStr}"/>');"
+			class="button-add-item"> <fmt:message
+				key="label.add.new.question" /> </a>
 
-					<tr>
-						<td colspan="2">
-							<iframe
-								onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'"
-								id="messageArea" name="messageArea"
-								style="width:0px;height:0px;border:0px;display:none"
-								frameborder="no" scrolling="no">
-							</iframe>
-						</td>
-					</tr>
+	</c:if>
+</p>
 
-			 </table>			
-				 
+<p>
+	<iframe
+		onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'"
+		id="messageArea" name="messageArea"
+		style="width:0px;height:0px;border:0px;display:none" frameborder="no"
+		scrolling="no">
+	</iframe>
+</p>
 
-
-				
-				<table cellpadding="0">
-					    <tr> <td> &nbsp </td> </tr>					    
-						<tr> 
-							<td>							
-						      	<c:if test="${mcGeneralAuthoringDTO.activeModule != 'authoring'}"> 					
-									<p align="right">
-									    <a href="javascript:submitMethod('submitAllContent')" class="button">
-								        	<fmt:message key="label.save"/></a>
-									</p>
-									
-								</c:if> 					
-					
-							</td> 
-					  	</tr>
-				 </table>
-
-		
-
-				
\ No newline at end of file
+<c:if test="${mcGeneralAuthoringDTO.activeModule != 'authoring'}">
+	<p align="right">
+		<a href="javascript:submitMethod('submitAllContent')" class="button">
+			<fmt:message key="label.save" /> </a>
+	</p>
+</c:if>
Index: lams_tool_lamc/web/authoring/candidateAnswersAddList.jsp
===================================================================
diff -u -r9ad7805407672e72dfc83fb0ba49ccafb0d43d6f -r7011368b3f7cc34d52ce8f8640b64a9add794dd6
--- lams_tool_lamc/web/authoring/candidateAnswersAddList.jsp	(.../candidateAnswersAddList.jsp)	(revision 9ad7805407672e72dfc83fb0ba49ccafb0d43d6f)
+++ lams_tool_lamc/web/authoring/candidateAnswersAddList.jsp	(.../candidateAnswersAddList.jsp)	(revision 7011368b3f7cc34d52ce8f8640b64a9add794dd6)
@@ -18,99 +18,104 @@
   http://www.gnu.org/licenses/gpl.txt
 --%>
 
-<%@ include file="/common/taglibs.jsp" %>
+<%@ include file="/common/taglibs.jsp"%>
 
-<html:hidden property="candidateIndex"/>			
+<html:hidden property="candidateIndex" />
 
-	<table class="innerforms">
-		<td>
-			<div class="field-name">
-				<fmt:message key="label.add.candidates"></fmt:message>
-			</div>
-		</td>
-	</table>					
 
+<div class="field-name space-top">
+	<fmt:message key="label.add.candidates"></fmt:message>
+</div>
+
 <%@ include file="/common/messages.jsp"%>
 
+<table id="caTable">
 
-<table id="caTable" style="align:left;width:600px" >
+	<c:forEach items="${newAddableQuestionContentList}" var="currentDTO"
+		varStatus="status">
 
-    
-    <c:forEach items="${newAddableQuestionContentList}" var="currentDTO" varStatus="status">
-	
-	<c:set var="caCount" scope="request" value="${currentDTO.caCount}"/>
-	
-		<c:set var="listCandidateAnswersDTO" scope="request" value="${currentDTO.listCandidateAnswersDTO}"/>	
-	
-		    <c:set var="caIndex" scope="request" value="0"/>
-		    
-		   <c:forEach items="${listCandidateAnswersDTO}" var="currentCandidateDTO" varStatus="status">
-		   	<c:set var="caIndex" scope="request" value="${caIndex +1}"/>
-		   	
+		<c:set var="caCount" scope="request" value="${currentDTO.caCount}" />
+
+		<c:set var="listCandidateAnswersDTO" scope="request"
+			value="${currentDTO.listCandidateAnswersDTO}" />
+
+		<c:set var="caIndex" scope="request" value="0" />
+
+		<c:forEach items="${listCandidateAnswersDTO}"
+			var="currentCandidateDTO" varStatus="status">
+			<c:set var="caIndex" scope="request" value="${caIndex +1}" />
+
 			<tr>
 				<td width="4%" align="right">
-					<c:out value="${caIndex}" />  
-				</td>		
-			
+					<c:out value="${caIndex}" />
+				</td>
+
 				<td align="left">
-					<input type="text" name="ca${caIndex}"  value="${currentCandidateDTO.candidateAnswer}" size="50">
-				</td>		
-				
-				<td width="16%" align="left">				
+					<input type="text" name="ca${caIndex}"
+						value="${currentCandidateDTO.candidateAnswer}" size="50">
+				</td>
 
+				<td width="16%" align="left">
 
+
 					<select name="correct${caIndex}">
-						<c:forEach var="correctEntry" items="${mcGeneralAuthoringDTO.correctMap}">
-							<c:set var="SELECTED_ANSWER" scope="request" value=""/>
-							<c:if test="${correctEntry.value == currentCandidateDTO.correct}"> 			
-										<c:set var="SELECTED_ANSWER" scope="request" value="SELECTED"/>
-							</c:if>						
-	
-							<option value="<c:out value="${correctEntry.value}"/>"  <c:out value="${SELECTED_ANSWER}"/>> <c:out value="${correctEntry.value}"/>  </option>																				
-								
-						</c:forEach>		  	
+						<c:forEach var="correctEntry"
+							items="${mcGeneralAuthoringDTO.correctMap}">
+							<c:set var="SELECTED_ANSWER" scope="request" value="" />
+							<c:if test="${correctEntry.value == currentCandidateDTO.correct}">
+								<c:set var="SELECTED_ANSWER" scope="request" value="SELECTED" />
+							</c:if>
+
+							<option value="<c:out value="${correctEntry.value}"/>"
+								<c:out value="${SELECTED_ANSWER}"/>>
+								<c:out value="${correctEntry.value}" />
+							</option>
+
+						</c:forEach>
 					</select>
-				
+
 				</td>
-		
-				<td width="22%" align="left">
-			 		<c:if test="${caCount != 1}"> 		
-			 		
-				 		<c:if test="${caIndex == 1}"> 		
-							<a title="<fmt:message key='label.tip.moveCandidateDown'/>" href="javascript:;" onclick="javascript:submitModifyAddedAuthoringCandidate('<c:out value="${caIndex}"/>', 'moveAddedCandidateDown');">
-			                            <img src="<c:out value="${tool}"/>images/down.gif" border="0">
-							</a> 
-						</c:if> 							
-		
-										
-				 		<c:if test="${caIndex == caCount}"> 		
-							<a title="<fmt:message key='label.tip.moveCandidateUp'/>" href="javascript:;" onclick="javascript:submitModifyAddedAuthoringCandidate('<c:out value="${caIndex}"/>', 'moveAddedCandidateUp');">
-			                            <img src="<c:out value="${tool}"/>images/up.gif" border="0">
-							</a> 
-						</c:if> 							
-						
-						<c:if test="${(caIndex != 1)  && (caIndex != caCount)}"> 		
-							<a title="<fmt:message key='label.tip.moveCandidateDown'/>" href="javascript:;" onclick="javascript:submitModifyAddedAuthoringCandidate('<c:out value="${caIndex}"/>', 'moveAddedCandidateDown');">
-			                            <img src="<c:out value="${tool}"/>images/down.gif" border="0">
-							</a> 
-		
-							<a title="<fmt:message key='label.tip.moveCandidateUp'/>" href="javascript:;" onclick="javascript:submitModifyAddedAuthoringCandidate('<c:out value="${caIndex}"/>', 'moveAddedCandidateUp');">
-			                            <img src="<c:out value="${tool}"/>images/up.gif" border="0">
-							</a> 
-						</c:if> 							
-					
-					</c:if> 			
+
+				<td width="12%" align="left">
+					<c:if test="${caCount != 1}">
+
+						<c:if test="${caIndex == 1}">
+							<img src="<c:out value="${tool}"/>images/down.gif" border="0"
+								title="<fmt:message key='label.tip.moveCandidateDown'/>"
+								onclick="javascript:submitModifyAddedAuthoringCandidate('<c:out value="${caIndex}"/>', 'moveAddedCandidateDown');">
+							<img src="<c:out value="${tool}"/>images/up_disabled.gif"
+								border="0">
+						</c:if>
+
+						<c:if test="${caIndex == caCount}">
+							<img src="<c:out value="${tool}"/>images/down_disabled.gif"
+								border="0">
+							<img src="<c:out value="${tool}"/>images/up.gif" border="0"
+								title="<fmt:message key='label.tip.moveCandidateUp'/>"
+								onclick="javascript:submitModifyAddedAuthoringCandidate('<c:out value="${caIndex}"/>', 'moveAddedCandidateUp');">
+						</c:if>
+
+						<c:if test="${(caIndex != 1)  && (caIndex != caCount)}">
+							<img src="<c:out value="${tool}"/>images/down.gif" border="0"
+								title="<fmt:message key='label.tip.moveCandidateDown'/>"
+								onclick="javascript:submitModifyAddedAuthoringCandidate('<c:out value="${caIndex}"/>', 'moveAddedCandidateDown');">
+
+							<img src="<c:out value="${tool}"/>images/up.gif" border="0"
+								title="<fmt:message key='label.tip.moveCandidateUp'/>"
+								onclick="javascript:submitModifyAddedAuthoringCandidate('<c:out value="${caIndex}"/>', 'moveAddedCandidateUp');">
+						</c:if>
+					</c:if>
 				</td>
-				
-				<td width="10%" align="left">				
-						<a title="<fmt:message key='label.tip.removeCandidate'/>" href="javascript:;" onclick="removeAddedCandidate(${caIndex});">
-			                    <img src="<c:out value="${tool}"/>images/delete.gif" border="0">
-						</a> 				
-				</td>						
-		
+
+				<td width="10%" align="left">
+					<img src="<c:out value="${tool}"/>images/delete.gif" border="0"
+						title="<fmt:message key='label.tip.removeCandidate'/>"
+						onclick="removeAddedCandidate(${caIndex});">
+				</td>
+
 			</tr>
-			</c:forEach>	
+		</c:forEach>
 
-</c:forEach>
+	</c:forEach>
 
-</table>
\ No newline at end of file
+</table>
Index: lams_tool_lamc/web/authoring/candidateAnswersList.jsp
===================================================================
diff -u -r9ad7805407672e72dfc83fb0ba49ccafb0d43d6f -r7011368b3f7cc34d52ce8f8640b64a9add794dd6
--- lams_tool_lamc/web/authoring/candidateAnswersList.jsp	(.../candidateAnswersList.jsp)	(revision 9ad7805407672e72dfc83fb0ba49ccafb0d43d6f)
+++ lams_tool_lamc/web/authoring/candidateAnswersList.jsp	(.../candidateAnswersList.jsp)	(revision 7011368b3f7cc34d52ce8f8640b64a9add794dd6)
@@ -18,107 +18,110 @@
   http://www.gnu.org/licenses/gpl.txt
 --%>
 
-<%@ include file="/common/taglibs.jsp" %>
+<%@ include file="/common/taglibs.jsp"%>
 
-<html:hidden property="candidateIndex"/>			
-<html:hidden property="questionIndex"/>			
+<html:hidden property="candidateIndex" />
+<html:hidden property="questionIndex" />
 
+<div class="field-name space-top">
+	<fmt:message key="label.add.candidates"></fmt:message>
+</div>
 
+<%@ include file="/common/messages.jsp"%>
 
-	<table class="innerforms">
-		<td>
-			<div class="field-name">
-				<fmt:message key="label.add.candidates"></fmt:message>
-			</div>
-		</td>
-	</table>					
+<table id="caTable">
 
-<%@ include file="/common/messages.jsp"%>
+	<c:set var="queIndex" scope="request" value="0" />
 
+	<c:forEach items="${listQuestionContentDTO}" var="currentDTO"
+		varStatus="status">
+		<c:set var="queIndex" scope="request" value="${queIndex +1}" />
 
-<table id="caTable" style="align:left;width:600px" >
+		<c:set var="caCount" scope="request" value="${currentDTO.caCount}" />
 
-    <c:set var="queIndex" scope="request" value="0"/>
-    
-    <c:forEach items="${listQuestionContentDTO}" var="currentDTO" varStatus="status">
-	<c:set var="queIndex" scope="request" value="${queIndex +1}"/>
-	
-	<c:set var="caCount" scope="request" value="${currentDTO.caCount}"/>
-	
-	<c:if test="${currentEditableQuestionIndex == queIndex}"> 		
-	
-		<c:set var="listCandidateAnswersDTO" scope="request" value="${currentDTO.listCandidateAnswersDTO}"/>	
-	
-		    <c:set var="caIndex" scope="request" value="0"/>
-		    
-		   <c:forEach items="${listCandidateAnswersDTO}" var="currentCandidateDTO" varStatus="status">
-		   	<c:set var="caIndex" scope="request" value="${caIndex +1}"/>
-		   	
-			<tr>
-				<td width="4%" align="right">
-					<c:out value="${caIndex}" /> 
-				</td>		
-			
-				<td align="left">
-					<input type="text" name="ca${caIndex}"  value="${currentCandidateDTO.candidateAnswer}" size="50">
-				</td>		
-				
-				<td width="16%" align="left">				
+		<c:if test="${currentEditableQuestionIndex == queIndex}">
 
+			<c:set var="listCandidateAnswersDTO" scope="request"
+				value="${currentDTO.listCandidateAnswersDTO}" />
 
-					<select name="correct${caIndex}">
-						<c:forEach var="correctEntry" items="${mcGeneralAuthoringDTO.correctMap}">
-							<c:set var="SELECTED_ANSWER" scope="request" value=""/>
-							<c:if test="${correctEntry.value == currentCandidateDTO.correct}"> 			
-										<c:set var="SELECTED_ANSWER" scope="request" value="SELECTED"/>
-							</c:if>						
-	
-							<option value="<c:out value="${correctEntry.value}"/>"  <c:out value="${SELECTED_ANSWER}"/>> <c:out value="${correctEntry.value}"/>  </option>																				
-								
-						</c:forEach>		  	
-					</select>
-				
-				</td>
-		
-				<td width="22%" align="left">
-			 		<c:if test="${caCount != 1}"> 		
-			 		
-				 		<c:if test="${caIndex == 1}"> 		
-							<a title="<fmt:message key='label.tip.moveCandidateDown'/>" href="javascript:;" onclick="javascript:submitModifyAuthoringCandidate('<c:out value="${queIndex}"/>', '<c:out value="${caIndex}"/>', 'moveCandidateDown');">
-			                            <img src="<c:out value="${tool}"/>images/down.gif" border="0">
-							</a> 
-						</c:if> 							
-		
-										
-				 		<c:if test="${caIndex == caCount}"> 		
-							<a title="<fmt:message key='label.tip.moveCandidateUp'/>" href="javascript:;" onclick="javascript:submitModifyAuthoringCandidate('<c:out value="${queIndex}"/>', '<c:out value="${caIndex}"/>', 'moveCandidateUp');">
-			                            <img src="<c:out value="${tool}"/>images/up.gif" border="0">
-							</a> 
-						</c:if> 							
-						
-						<c:if test="${(caIndex != 1)  && (caIndex != caCount)}"> 		
-							<a title="<fmt:message key='label.tip.moveCandidateDown'/>" href="javascript:;" onclick="javascript:submitModifyAuthoringCandidate('<c:out value="${queIndex}"/>', '<c:out value="${caIndex}"/>', 'moveCandidateDown');">
-			                            <img src="<c:out value="${tool}"/>images/down.gif" border="0">
-							</a> 
-		
-							<a title="<fmt:message key='label.tip.moveCandidateUp'/>" href="javascript:;" onclick="javascript:submitModifyAuthoringCandidate('<c:out value="${queIndex}"/>', '<c:out value="${caIndex}"/>', 'moveCandidateUp');">
-			                            <img src="<c:out value="${tool}"/>images/up.gif" border="0">
-							</a> 
-						</c:if> 							
-					
-					</c:if> 			
-				</td>
-				
-				<td width="10%" align="left">				
-						<a title="<fmt:message key='label.tip.removeCandidate'/>" href="javascript:;" onclick="removeCandidate(${queIndex}, ${caIndex});">
-			                    <img src="<c:out value="${tool}"/>images/delete.gif" border="0">
-						</a> 				
-				</td>						
-		
-			</tr>
-			</c:forEach>	
-			
-		</c:if> 					
-</c:forEach>
+			<c:set var="caIndex" scope="request" value="0" />
 
-</table>
\ No newline at end of file
+			<c:forEach items="${listCandidateAnswersDTO}"
+				var="currentCandidateDTO" varStatus="status">
+				<c:set var="caIndex" scope="request" value="${caIndex +1}" />
+
+				<tr>
+					<td width="4%" align="right">
+						<c:out value="${caIndex}" />
+					</td>
+
+					<td align="left">
+						<input type="text" name="ca${caIndex}"
+							value="${currentCandidateDTO.candidateAnswer}" size="50">
+					</td>
+
+					<td width="16%" align="left">
+
+
+						<select name="correct${caIndex}">
+							<c:forEach var="correctEntry"
+								items="${mcGeneralAuthoringDTO.correctMap}">
+								<c:set var="SELECTED_ANSWER" scope="request" value="" />
+								<c:if
+									test="${correctEntry.value == currentCandidateDTO.correct}">
+									<c:set var="SELECTED_ANSWER" scope="request" value="SELECTED" />
+								</c:if>
+
+								<option value="<c:out value="${correctEntry.value}"/>"
+									<c:out value="${SELECTED_ANSWER}"/>>
+									<c:out value="${correctEntry.value}" />
+								</option>
+
+							</c:forEach>
+						</select>
+
+					</td>
+
+					<td width="12%" align="left">
+						<c:if test="${caCount != 1}">
+
+							<c:if test="${caIndex == 1}">
+								<img src="<c:out value="${tool}"/>images/down.gif" border="0"
+									title="<fmt:message key='label.tip.moveCandidateDown'/>"
+									onclick="javascript:submitModifyAuthoringCandidate('<c:out value="${queIndex}"/>', '<c:out value="${caIndex}"/>', 'moveCandidateDown');">
+								<img src="<c:out value="${tool}"/>images/up_disabled.gif"
+									border="0">
+							</c:if>
+
+							<c:if test="${caIndex == caCount}">
+								<img src="<c:out value="${tool}"/>images/down_disabled.gif"
+									border="0">
+								<img src="<c:out value="${tool}"/>images/up.gif" border="0"
+									title="<fmt:message key='label.tip.moveCandidateUp'/>"
+									onclick="javascript:submitModifyAuthoringCandidate('<c:out value="${queIndex}"/>', '<c:out value="${caIndex}"/>', 'moveCandidateUp');">
+							</c:if>
+
+							<c:if test="${(caIndex != 1)  && (caIndex != caCount)}">
+								<img src="<c:out value="${tool}"/>images/down.gif" border="0"
+									title="<fmt:message key='label.tip.moveCandidateDown'/>"
+									onclick="javascript:submitModifyAuthoringCandidate('<c:out value="${queIndex}"/>', '<c:out value="${caIndex}"/>', 'moveCandidateDown');">
+
+								<img src="<c:out value="${tool}"/>images/up.gif" border="0"
+									title="<fmt:message key='label.tip.moveCandidateUp'/>"
+									onclick="javascript:submitModifyAuthoringCandidate('<c:out value="${queIndex}"/>', '<c:out value="${caIndex}"/>', 'moveCandidateUp');">
+							</c:if>
+						</c:if>
+					</td>
+
+					<td width="10%" align="left">
+						<img src="<c:out value="${tool}"/>images/delete.gif" border="0"
+							title="<fmt:message key='label.tip.removeCandidate'/>"
+							onclick="removeCandidate(${queIndex}, ${caIndex});">
+					</td>
+				</tr>
+			</c:forEach>
+
+		</c:if>
+	</c:forEach>
+
+</table>
Index: lams_tool_lamc/web/authoring/editQuestionBox.jsp
===================================================================
diff -u -r9ad7805407672e72dfc83fb0ba49ccafb0d43d6f -r7011368b3f7cc34d52ce8f8640b64a9add794dd6
--- lams_tool_lamc/web/authoring/editQuestionBox.jsp	(.../editQuestionBox.jsp)	(revision 9ad7805407672e72dfc83fb0ba49ccafb0d43d6f)
+++ lams_tool_lamc/web/authoring/editQuestionBox.jsp	(.../editQuestionBox.jsp)	(revision 7011368b3f7cc34d52ce8f8640b64a9add794dd6)
@@ -25,7 +25,7 @@
 <html>
 	<head>
 		<%@ include file="/common/header.jsp"%>
-		
+
 		<script language="JavaScript" type="text/JavaScript">
 		
 			function showMessage(url) {
@@ -68,123 +68,78 @@
 				document.McAuthoringForm.questionIndex.value=questionIndexValue; 
 				submitMethod("removeCandidate");
 			}
-
-			
 		
-		</script>		
+		</script>
 	</head>
-	
+
 	<body>
-		<table cellpadding="0">
-			<html:form  action="/authoring?validate=false" styleId="newQuestionForm" enctype="multipart/form-data" method="POST">					   	
-			
-			<html:hidden property="dispatch" value="saveSingleQuestion"/>
-			<html:hidden property="toolContentID"/>
-			<html:hidden property="currentTab" styleId="currentTab" />
-			<html:hidden property="activeModule"/>
-			<html:hidden property="httpSessionID"/>								
-			<html:hidden property="defaultContentIdStr"/>								
-			<html:hidden property="defineLaterInEditMode"/>										
-			<html:hidden property="contentFolderID"/>														
-			<html:hidden property="editableQuestionIndex"/>														
-			<html:hidden property="editQuestionBoxRequest" value="true"/>																	
-			<html:hidden property="totalMarks"/>														
 
-		
-			<tr>
-			<td>
-			<table class="innerforms">
-		
-				<tr>
-					<td>
-						<div class="field-name">
-							<fmt:message key="label.edit.question"></fmt:message>
-						</div>
-						
-  					<lams:FCKEditor id="newQuestion"
-							value="${mcGeneralAuthoringDTO.editableQuestionText}"
-							contentFolderID="${mcGeneralAuthoringDTO.contentFolderID}"></lams:FCKEditor>
-					</td>
-				</tr>
-				
+		<html:form action="/authoring?validate=false"
+			styleId="newQuestionForm" enctype="multipart/form-data" method="POST">
 
-				<tr>
-					<td>
-						<%@ include file="/authoring/candidateAnswersList.jsp"%>					
-					</td>
-				</tr>
-				
-				<tr>
-					<td>
-						<html:submit onclick="javascript:submitMethod('newCandidateBox');" style="float:right;width:150px"  styleClass="button-add-item">
-			            	<fmt:message key="label.add.candidates" />
-						</html:submit>	 				 		  											
-					</td>
-				</tr>
+			<html:hidden property="dispatch" value="saveSingleQuestion" />
+			<html:hidden property="toolContentID" />
+			<html:hidden property="currentTab" styleId="currentTab" />
+			<html:hidden property="activeModule" />
+			<html:hidden property="httpSessionID" />
+			<html:hidden property="defaultContentIdStr" />
+			<html:hidden property="defineLaterInEditMode" />
+			<html:hidden property="contentFolderID" />
+			<html:hidden property="editableQuestionIndex" />
+			<html:hidden property="editQuestionBoxRequest" value="true" />
+			<html:hidden property="totalMarks" />
 
-				
-				
-				
-				<tr>
-					<td>
-						<fmt:message key="label.questions.worth"></fmt:message> 
+			<div class="field-name space-top">
+				<fmt:message key="label.edit.question"></fmt:message>
+			</div>
 
+			<lams:FCKEditor id="newQuestion"
+				value="${mcGeneralAuthoringDTO.editableQuestionText}"
+				contentFolderID="${mcGeneralAuthoringDTO.contentFolderID}"></lams:FCKEditor>
 
-									<select name="mark">
-										<c:forEach var="markEntry" items="${mcGeneralAuthoringDTO.marksMap}">
-											<c:set var="SELECTED_MARK" scope="request" value=""/>
-											<c:if test="${markEntry.value == mcGeneralAuthoringDTO.markValue}"> 			
-														<c:set var="SELECTED_MARK" scope="request" value="SELECTED"/>
-											</c:if>						
+			<%@ include file="/authoring/candidateAnswersList.jsp"%>
 
-												<option value="<c:out value="${markEntry.value}"/>"  <c:out value="${SELECTED_MARK}"/>> <c:out value="${markEntry.value}"/>  </option>																				
-										</c:forEach>		  	
-									</select>
+			<div class="space-bottom small-space-top">
+				<div class="right-buttons">
+					<html:submit onclick="javascript:submitMethod('newCandidateBox');"
+						styleClass="button">
+						<fmt:message key="label.add.candidates" />
+					</html:submit>
+				</div>
 
+				<fmt:message key="label.questions.worth"></fmt:message>
+				<select name="mark">
+					<c:forEach var="markEntry"
+						items="${mcGeneralAuthoringDTO.marksMap}">
+						<c:set var="SELECTED_MARK" scope="request" value="" />
+						<c:if test="${markEntry.value == mcGeneralAuthoringDTO.markValue}">
+							<c:set var="SELECTED_MARK" scope="request" value="SELECTED" />
+						</c:if>
 
-						<fmt:message key="label.marks"></fmt:message> 
-					</td>
-				</tr>
+						<option value="<c:out value="${markEntry.value}"/>"
+							<c:out value="${SELECTED_MARK}"/>>
+							<c:out value="${markEntry.value}" />
+						</option>
+					</c:forEach>
+				</select>
+				<fmt:message key="label.marks"></fmt:message>
+			</div>
 
-				
+			<div class="field-name">
+				<fmt:message key="label.feedback"></fmt:message>
+			</div>
+			<html:textarea property="feedback" rows="3" cols="70"></html:textarea>
 
-				<tr>
-					<td>
-						<div class="field-name">
-							<fmt:message key="label.feedback"></fmt:message>
-						</div>
-						<html:textarea property="feedback" rows="3" cols="70"></html:textarea>							
-					</td>
-				</tr>
+			<div class="space-bottom-top">
+				<a href="#" onclick="getElementById('newQuestionForm').submit();"
+					class="button-add-item"> <fmt:message key="label.save.question" />
+				</a>
 
-				<tr>
-					<td align="center" valign="bottom">
-						<table>
-							<tr>
-							<td> &nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
-								<a href="#" onclick="getElementById('newQuestionForm').submit();" class="button-add-item">
-									<fmt:message key="label.save.question" />
-								</a>
-							</td> 
-	
-							<td>
-								<a href="#" onclick="javascript:window.parent.hideMessage()" class="button">
-									<fmt:message key="label.cancel" />
-								</a>
-							</td> 	
-							</tr>					
-						</table>
-					</td>
-				</tr>
-				
+				<a href="#" onclick="javascript:window.parent.hideMessage()"
+					class="button space-left"> <fmt:message key="label.cancel" />
+				</a>
+			</div>
 
-			</table>				
-			</td>
-			</tr>
-				
-			</html:form>
-			
-		</table>
-
+		</html:form>
 	</body>
-</html>
\ No newline at end of file
+</html>
Index: lams_tool_lamc/web/authoring/itemlist.jsp
===================================================================
diff -u -r8b5fd331984013fa4afe645a4753ae7562b0dc84 -r7011368b3f7cc34d52ce8f8640b64a9add794dd6
--- lams_tool_lamc/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision 8b5fd331984013fa4afe645a4753ae7562b0dc84)
+++ lams_tool_lamc/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision 7011368b3f7cc34d52ce8f8640b64a9add794dd6)
@@ -18,113 +18,106 @@
   http://www.gnu.org/licenses/gpl.txt
 --%>
 
-<%@ 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.questions" /> </h2>
-<img src="${ctxPath}/includes/images/indicator.gif" style="display:none" id="resourceListArea_Busy" /></h2>
+	<h2 class="spacer-left">
+		<fmt:message key="label.questions" />
+	</h2>
+	<img src="${ctxPath}/includes/images/indicator.gif"
+		style="display:none" id="resourceListArea_Busy" />
+	</h2>
 
-<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-<table id="itemTable" style="align:left;width:650px" >
-    <c:set var="queIndex" scope="request" value="0"/>
-    
-	<tr>
-		<td width="10%" align="right" class="field-name">
-			&nbsp
-		</td>
+	<c:set var="formBean"
+		value="<%=request
+									.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+	<table id="itemTable" class="alternative-color">
+		<c:set var="queIndex" scope="request" value="0" />
 
-		<td width="55%" align="left">
-			&nbsp
-		</td>		
+		<tr>
+			<th width="70%">
 
-		<td width="5%" align="center">
-	 		<c:if test="${totalQuestionCount > 0}"> 				
-		 		<b> <fmt:message key="label.question.marks" /> </b>
-			</c:if> 			
-		</td>
-		
-		<td width="10%" align="right">
-		 		&nbsp
-		</td>
-		
+			</th>
 
-		<td width="10%" align="right">
-			&nbsp
-		</td>
+			<th width="12%">
+				<c:if test="${totalQuestionCount > 0}">
+					<fmt:message key="label.question.marks" />
+				</c:if>
+			</th>
 
-		<td width="10%" align="right">
-			&nbsp		
-		</td>
-	</tr>
-    
-    <c:forEach items="${listQuestionContentDTO}" var="currentDTO" varStatus="status">
-	<c:set var="queIndex" scope="request" value="${queIndex +1}"/>
-	<c:set var="question" scope="request" value="${currentDTO.question}"/>
-	<c:set var="feedback" scope="request" value="${currentDTO.feedback}"/>
-	<c:set var="mark" scope="request" value="${currentDTO.mark}"/>
-	<c:set var="displayOrder" scope="request" value="${currentDTO.displayOrder}"/>	
+			<th colspan="3">
+				&nbsp;
+			</th>
+		</tr>
 
-	<tr>
-		<td width="10%" align="right" class="field-name">
-			<fmt:message key="label.question" />:
-		</td>
+		<c:forEach items="${listQuestionContentDTO}" var="currentDTO"
+			varStatus="status">
+			<c:set var="queIndex" scope="request" value="${queIndex +1}" />
+			<c:set var="question" scope="request" value="${currentDTO.question}" />
+			<c:set var="feedback" scope="request" value="${currentDTO.feedback}" />
+			<c:set var="mark" scope="request" value="${currentDTO.mark}" />
+			<c:set var="displayOrder" scope="request"
+				value="${currentDTO.displayOrder}" />
 
-		<td width="55%" align="left">
-			<c:out value="${question}" escapeXml="false"/> 
-		</td>		
+			<tr>
+				<td>
+					<span class="field-name"> <fmt:message key="label.question" />
+						: </span>
+					<c:out value="${question}" escapeXml="false" />
+				</td>
 
 
-		<td width="5%" align="center">
-			  <c:out value="${mark}" />  
-		</td>
+				<td>
+					<c:out value="${mark}" />
+				</td>
 
+				<td width="12%">
+					<c:if test="${totalQuestionCount != 1}">
+						<c:if test="${queIndex == 1}">
+							<img src="<c:out value="${tool}"/>images/down.gif" border="0"
+								title="<fmt:message key='label.tip.moveQuestionDown'/>"
+								onclick="javascript:submitModifyAuthoringQuestion('<c:out value="${queIndex}"/>','moveQuestionDown');">
+							<img src="<c:out value="${tool}"/>images/up_disabled.gif"
+								border="0">
+						</c:if>
 
+						<c:if test="${queIndex == totalQuestionCount}">
+							<img src="<c:out value="${tool}"/>images/down_disabled.gif"
+								border="0">
+							<img src="<c:out value="${tool}"/>images/up.gif" border="0"
+								title="<fmt:message key='label.tip.moveQuestionUp'/>"
+								onclick="javascript:submitModifyAuthoringQuestion('<c:out value="${queIndex}"/>','moveQuestionUp');">
+						</c:if>
 
-			<td width="10%" align="right">
-		 		<c:if test="${totalQuestionCount != 1}"> 		
-		 		
-			 		<c:if test="${queIndex == 1}"> 		
-						<a title="<fmt:message key='label.tip.moveQuestionDown'/>" href="javascript:;" onclick="javascript:submitModifyAuthoringQuestion('<c:out value="${queIndex}"/>','moveQuestionDown');">
-		                            <img src="<c:out value="${tool}"/>images/down.gif" border="0">
-						</a> 
-					</c:if> 							
-	
-			 		<c:if test="${queIndex == totalQuestionCount}"> 		
-						<a title="<fmt:message key='label.tip.moveQuestionUp'/>" href="javascript:;" onclick="javascript:submitModifyAuthoringQuestion('<c:out value="${queIndex}"/>','moveQuestionUp');">
-		                            <img src="<c:out value="${tool}"/>images/up.gif" border="0">
-						</a> 
-					</c:if> 							
-					
-					<c:if test="${(queIndex != 1)  && (queIndex != totalQuestionCount)}"> 		
-						<a title="<fmt:message key='label.tip.moveQuestionDown'/>" href="javascript:;" onclick="javascript:submitModifyAuthoringQuestion('<c:out value="${queIndex}"/>','moveQuestionDown');">
-		                            <img src="<c:out value="${tool}"/>images/down.gif" border="0">
-						</a> 
-	
-						<a title="<fmt:message key='label.tip.moveQuestionUp'/>" href="javascript:;" onclick="javascript:submitModifyAuthoringQuestion('<c:out value="${queIndex}"/>','moveQuestionUp');">
-		                            <img src="<c:out value="${tool}"/>images/up.gif" border="0">
-						</a> 
-					</c:if> 							
-				
-				</c:if> 			
-			</td>
+						<c:if
+							test="${(queIndex != 1)  && (queIndex != totalQuestionCount)}">
+							<img src="<c:out value="${tool}"/>images/down.gif" border="0"
+								title="<fmt:message key='label.tip.moveQuestionDown'/>"
+								onclick="javascript:submitModifyAuthoringQuestion('<c:out value="${queIndex}"/>','moveQuestionDown');" />
+							<img src="<c:out value="${tool}"/>images/up.gif" border="0"
+								title="<fmt:message key='label.tip.moveQuestionUp'/>"
+								onclick="javascript:submitModifyAuthoringQuestion('<c:out value="${queIndex}"/>','moveQuestionUp');" />
+						</c:if>
 
-		
+					</c:if>
+				</td>
 
-		<td width="10%" align="right">
-				<a title="<fmt:message key='label.tip.editQuestion'/>" href="javascript:;" onclick="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=newEditableQuestionBox&questionIndex=${queIndex}&contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&toolContentID=${mcGeneralAuthoringDTO.toolContentID}&activeModule=${mcGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${mcGeneralAuthoringDTO.defaultContentIdStr}&sln=${mcGeneralAuthoringDTO.sln}&questionsSequenced=${mcGeneralAuthoringDTO.questionsSequenced}&retries=${mcGeneralAuthoringDTO.retries}&reflect=${mcGeneralAuthoringDTO.reflect}&reflectionSubject=${mcGeneralAuthoringDTO.reflectionSubject}"/>');">
-	                    <img src="<c:out value="${tool}"/>images/edit.gif" border="0">
-				</a> 
-		</td>
+				<td width="10%">
+					<img src="<c:out value="${tool}"/>images/edit.gif" border="0"
+						title="<fmt:message key='label.tip.editQuestion'/>"
+						onclick="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=newEditableQuestionBox&questionIndex=${queIndex}&contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&toolContentID=${mcGeneralAuthoringDTO.toolContentID}&activeModule=${mcGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${mcGeneralAuthoringDTO.defaultContentIdStr}&sln=${mcGeneralAuthoringDTO.sln}&questionsSequenced=${mcGeneralAuthoringDTO.questionsSequenced}&retries=${mcGeneralAuthoringDTO.retries}&reflect=${mcGeneralAuthoringDTO.reflect}&reflectionSubject=${mcGeneralAuthoringDTO.reflectionSubject}"/>');">
+				</td>
 
-		<td width="10%" align="right">
-				<a title="<fmt:message key='label.tip.deleteQuestion'/>" href="javascript:;" onclick="removeQuestion(${queIndex});">
-	                    <img src="<c:out value="${tool}"/>images/delete.gif" border="0">
-				</a> 				
-		</td>
-	</tr>
-</c:forEach>
+				<td width="10%">
+					<img src="<c:out value="${tool}"/>images/delete.gif" border="0"
+						title="<fmt:message key='label.tip.deleteQuestion'/>"
+						onclick="removeQuestion(${queIndex});">
+				</td>
+			</tr>
+		</c:forEach>
 
-</table>
+	</table>
 </div>
 <%-- This script will works when a new resoruce item submit in order to refresh "Resource List" panel. --%>
 <script lang="javascript">
Index: lams_tool_lamc/web/authoring/newQuestionBox.jsp
===================================================================
diff -u -r9ad7805407672e72dfc83fb0ba49ccafb0d43d6f -r7011368b3f7cc34d52ce8f8640b64a9add794dd6
--- lams_tool_lamc/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision 9ad7805407672e72dfc83fb0ba49ccafb0d43d6f)
+++ lams_tool_lamc/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision 7011368b3f7cc34d52ce8f8640b64a9add794dd6)
@@ -25,7 +25,8 @@
 <html>
 	<head>
 		<%@ include file="/common/header.jsp"%>
-		
+		<lams:css style="tabbed" />
+
 		<script language="JavaScript" type="text/JavaScript">
 
 			function submitMethod() {
@@ -50,115 +51,74 @@
 				submitMethod("removeAddedCandidate");
 			}
 			
-		</script>		
+		</script>
 	</head>
-	
-	<body>
-		<table cellpadding="0">
-	
 
-			<html:form  action="/authoring?validate=false" styleId="newQuestionForm" enctype="multipart/form-data" method="POST">				
-			<html:hidden property="dispatch" value="addSingleQuestion"/>
-			<html:hidden property="toolContentID"/>
+	<body>
+		<html:form action="/authoring?validate=false"
+			styleId="newQuestionForm" enctype="multipart/form-data" method="POST">
+			<html:hidden property="dispatch" value="addSingleQuestion" />
+			<html:hidden property="toolContentID" />
 			<html:hidden property="currentTab" styleId="currentTab" />
-			<html:hidden property="activeModule"/>
-			<html:hidden property="httpSessionID"/>								
-			<html:hidden property="defaultContentIdStr"/>								
-			<html:hidden property="defineLaterInEditMode"/>										
-			<html:hidden property="contentFolderID"/>														
-			<html:hidden property="editQuestionBoxRequest" value="false"/>																				
-			<html:hidden property="totalMarks"/>														
-			
-			<tr>
-			<td>
-			<table class="innerforms">
-		
-				<tr>
-					<td>
-						<div class="field-name">
-							<fmt:message key="label.add.new.question"></fmt:message>
-						</div>
- 						<lams:FCKEditor id="newQuestion"
-							value="${mcGeneralAuthoringDTO.editableQuestionText}"
-							contentFolderID="${mcGeneralAuthoringDTO.contentFolderID}"></lams:FCKEditor> 
-					</td>
-				</tr>
+			<html:hidden property="activeModule" />
+			<html:hidden property="httpSessionID" />
+			<html:hidden property="defaultContentIdStr" />
+			<html:hidden property="defineLaterInEditMode" />
+			<html:hidden property="contentFolderID" />
+			<html:hidden property="editQuestionBoxRequest" value="false" />
+			<html:hidden property="totalMarks" />
 
+			<div class="field-name space-top">
+				<fmt:message key="label.add.new.question"></fmt:message>
+			</div>
+			<lams:FCKEditor id="newQuestion"
+				value="${mcGeneralAuthoringDTO.editableQuestionText}"
+				contentFolderID="${mcGeneralAuthoringDTO.contentFolderID}"></lams:FCKEditor>
 
-				<tr>
-					<td>
-						<%@ include file="/authoring/candidateAnswersAddList.jsp"%>					
-					</td>
-				</tr>
-				
-				<tr>
-					<td>
-						<html:submit onclick="javascript:submitMethod('newAddedCandidateBox');" style="float:right;width:150px"  styleClass="button-add-item">
-			            	<fmt:message key="label.add.candidates" />
-						</html:submit>	 				 		  											
-					</td>
-				</tr>
+			<%@ include file="/authoring/candidateAnswersAddList.jsp"%>
 
+			<div class="space-bottom small-space-top">
+				<div class="right-buttons">
+					<html:submit
+						onclick="javascript:submitMethod('newAddedCandidateBox');"
+						styleClass="button">
+						<fmt:message key="label.add.candidates" />
+					</html:submit>
+				</div>
 
+				<fmt:message key="label.questions.worth"></fmt:message>
+				<select name="mark">
+					<c:forEach var="markEntry"
+						items="${mcGeneralAuthoringDTO.marksMap}">
+						<c:set var="SELECTED_MARK" scope="request" value="" />
+						<c:if test="${markEntry.value == mcGeneralAuthoringDTO.markValue}">
+							<c:set var="SELECTED_MARK" scope="request" value="SELECTED" />
+						</c:if>
 
-				<tr>
-					<td>
-						<fmt:message key="label.questions.worth"></fmt:message> 
+						<option value="<c:out value="${markEntry.value}"/>"
+							<c:out value="${SELECTED_MARK}"/>>
+							<c:out value="${markEntry.value}" />
+						</option>
+					</c:forEach>
+				</select>
+				<fmt:message key="label.marks"></fmt:message>
+			</div>
 
-									<select name="mark">
-										<c:forEach var="markEntry" items="${mcGeneralAuthoringDTO.marksMap}">
-											<c:set var="SELECTED_MARK" scope="request" value=""/>										
-											<c:if test="${markEntry.value == mcGeneralAuthoringDTO.markValue}"> 			
-														<c:set var="SELECTED_MARK" scope="request" value="SELECTED"/>
-											</c:if>						
+			<div class="field-name">
+				<fmt:message key="label.feedback"></fmt:message>
+			</div>
+			<html:textarea property="feedback" rows="3" cols="70"></html:textarea>
 
-												<option value="<c:out value="${markEntry.value}"/>"  <c:out value="${SELECTED_MARK}"/>> <c:out value="${markEntry.value}"/>  </option>																				
-										</c:forEach>		  	
-									</select>
+			<div class="space-bottom-top">
+				<a href="#" onclick="getElementById('newQuestionForm').submit();"
+					class="button-add-item"> <fmt:message key="label.save.question" />
+				</a>
 
+				<a href="#" onclick="javascript:window.parent.hideMessage()"
+					class="button space-left"> <fmt:message key="label.cancel" />
+				</a>
+			</div>
 
-						<fmt:message key="label.marks"></fmt:message> 
-					</td>
-				</tr>
-
-
-				<tr>
-					<td>
-						<div class="field-name">
-							<fmt:message key="label.feedback"></fmt:message>
-						</div>
-						<html:textarea property="feedback" rows="3" cols="70"></html:textarea>							
-					</td>
-				</tr>
-				
-
-				<tr>
-					<td align="center" valign="bottom">
-						<table>
-							<tr>
-							<td> &nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
-								<a href="#" onclick="getElementById('newQuestionForm').submit();" class="button-add-item">
-									<fmt:message key="label.save.question" />
-								</a>
-							</td> 
-	
-							<td>
-								<a href="#" onclick="javascript:window.parent.hideMessage()" class="button">
-									<fmt:message key="label.cancel" />
-								</a>
-							</td> 	
-							</tr>					
-						</table>						
-					</td>
-				</tr>
-				
-
-			</table>				
-			</td>
-			</tr>
-				
-			</html:form>
-		</table>
-
+		</html:form>
 	</body>
-</html>
\ No newline at end of file
+</html>
Index: lams_tool_larsrc/web/pages/authoring/basic.jsp
===================================================================
diff -u -r9ad7805407672e72dfc83fb0ba49ccafb0d43d6f -r7011368b3f7cc34d52ce8f8640b64a9add794dd6
--- lams_tool_larsrc/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 9ad7805407672e72dfc83fb0ba49ccafb0d43d6f)
+++ lams_tool_larsrc/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 7011368b3f7cc34d52ce8f8640b64a9add794dd6)
@@ -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("reourceInputArea");
 		if(area != null){
-			area.style.width="670px";
+			area.style.width="650px";
 			area.style.height="100%";
 			area.src=url;
 			area.style.display="block";
@@ -70,67 +72,57 @@
 	}
 
 </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="resource.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="resource.instructions"
-					value="${formBean.resource.instructions}"
-					contentFolderID="${formBean.contentFolderID}"></lams:FCKEditor>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="2">
-				<div id="resourceListArea">
-						<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?sessionMapID=${formBean.sessionMapID}&itemType=1"/>');">
-								<fmt:message key="label.authoring.basic.add.url" />
-							</a>
-						</td>
-						<td>
-							<a href="javascript:showMessage('<html:rewrite page="/authoring/newItemInit.do?sessionMapID=${formBean.sessionMapID}&itemType=2"/>');">
-								<fmt:message key="label.authoring.basic.add.file" />
-							</a>
-						</td>
-						<td>
-							<a href="javascript:showMessage('<html:rewrite page="/authoring/newItemInit.do?sessionMapID=${formBean.sessionMapID}&itemType=3"/>');">
-								<fmt:message key="label.authoring.basic.add.website" />
-							</a>
-						</td>
-						<td>
-							<a href="javascript:showMessage('<html:rewrite page="/authoring/newItemInit.do?sessionMapID=${formBean.sessionMapID}&itemType=4"/>');">
-								<fmt:message key="label.authoring.basic.add.learning.object"/>
-							</a>
-						</td>
-					</tr>
-				</table>
-			</td>
-		</tr>
-		<tr>
-			<td  colspan="2">
-				<iframe onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'" 
-					id="reourceInputArea" name="reourceInputArea" 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="resource.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="resource.instructions"
+				value="${formBean.resource.instructions}"
+				contentFolderID="${formBean.contentFolderID}"></lams:FCKEditor>
+		</td>
+	</tr>
+
+</table>
+
+<div id="resourceListArea">
+	<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?sessionMapID=${formBean.sessionMapID}&itemType=1"/>');">
+				<fmt:message key="label.authoring.basic.add.url" /></a> 
+				 <a
+				href="javascript:showMessage('<html:rewrite page="/authoring/newItemInit.do?sessionMapID=${formBean.sessionMapID}&itemType=2"/>');"  class="space-left">
+				<fmt:message key="label.authoring.basic.add.file" /></a>
+				 <a
+				href="javascript:showMessage('<html:rewrite page="/authoring/newItemInit.do?sessionMapID=${formBean.sessionMapID}&itemType=3"/>');" class="space-left">
+				<fmt:message key="label.authoring.basic.add.website" /></a>
+				<a
+				href="javascript:showMessage('<html:rewrite page="/authoring/newItemInit.do?sessionMapID=${formBean.sessionMapID}&itemType=4"/>');" class="space-left">
+				<fmt:message key="label.authoring.basic.add.learning.object" /> </a>
+				
+				
+
+</p>
+
+<p>
+	<iframe
+		onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'"
+		id="reourceInputArea" name="reourceInputArea"
+		style="width:0px;height:0px;border:0px;display:none" frameborder="no"
+		scrolling="no">
+	</iframe>
+</p>
Index: lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp
===================================================================
diff -u -r9cd6be516aa221a17b218c27819ed892cd60e35f -r7011368b3f7cc34d52ce8f8640b64a9add794dd6
--- lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision 9cd6be516aa221a17b218c27819ed892cd60e35f)
+++ lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision 7011368b3f7cc34d52ce8f8640b64a9add794dd6)
@@ -2,106 +2,73 @@
 <html>
 	<head>
 		<%@ include file="/common/header.jsp"%>
+		<lams:css style="tabbed"/>
 
 		<script type="text/javascript">
 	   <%-- user for  rsrcresourceitem.js --%>
 	   var removeInstructionUrl = "<c:url value='/authoring/removeInstruction.do'/>";
        var addInstructionUrl = "<c:url value='/authoring/newInstruction.do'/>";
        var removeItemAttachmentUrl = "<c:url value='/authoring/removeItemAttachment.do'/>";
 	</script>
-		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/rsrcresourceitem.js'/>"></script>
-		<style type="text/css">
-	<!--
-	table { 
-		 width:650px;
-		 margin-left:0px; 
-		 text-align:left; 
-		 }
-	
-	td { 
-		padding:4px; 
-		font-size:12px;
-	}
-	hr {
-		border: none 0;
-		border-top: 1px solid #ccc;
-		width: 650px;
-		height: 1px;
-		margin: 0px 10px 10px 0px;
-	}
-		
-	-->
-	</style>
+		<script type="text/javascript"
+			src="<html:rewrite page='/includes/javascript/rsrcresourceitem.js'/>"></script>
 	</head>
 	<body>
-		<table>
-			<!-- Basic Info Form-->
-			<tr>
-				<td>
-					<%@ include file="/common/messages.jsp"%>
-					<html:form action="/authoring/saveOrUpdateItem" method="post" styleId="resourceItemForm" enctype="multipart/form-data">
-						<input type="hidden" name="instructionList" id="instructionList" />
-						<html:hidden property="sessionMapID" />
-						<input type="hidden" name="itemType" id="itemType" value="2" />
-						<html:hidden property="itemIndex" />
-						<table class="innerforms">
+
+		<!-- Basic Info Form-->
+
+		<%@ include file="/common/messages.jsp"%>
+		<html:form action="/authoring/saveOrUpdateItem" method="post"
+			styleId="resourceItemForm" enctype="multipart/form-data">
+			<input type="hidden" name="instructionList" id="instructionList" />
+			<html:hidden property="sessionMapID" />
+			<input type="hidden" name="itemType" id="itemType" value="2" />
+			<html:hidden property="itemIndex" />
+
+
+			<h2 class="no-space-left">
+				<fmt:message key="label.authoring.basic.add.file" />
+			</h2>
+
+			<div class="field-name">
+				<fmt:message key="label.authoring.basic.resource.title.input" />
+			</div>
+
+			<html:text property="title" size="55" tabindex="1" />
+
+			<%--  Remove description in as LDEV-617
 							<tr>
-								<td colspan="2">
-									<h2>
-										<fmt:message key="label.authoring.basic.add.file" />
-									</h2>
-								</td>
-							</tr>
-							<tr>
 								<td width="130px">
-									<fmt:message key="label.authoring.basic.resource.title.input" />
-								</td>
-								<td>
-									<html:text property="title" size="55" tabindex="1" />
-								</td>
-							</tr>
-							<%--  Remove description in as LDEV-617
-							<tr>
-								<td width="130px">
 									<fmt:message key="label.authoring.basic.resource.description.input" />
 								</td>
 								<td>
 									<lams:STRUTS-textarea rows="5" cols="55" tabindex="2" property="description" />
 								</td>
 							</tr>
 							--%>
-							<tr>
-								<td width="130px">
-									<fmt:message key="label.authoring.basic.resource.file.input" />
-								</td>
-								<td>
-									<c:set var="itemAttachment" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-									<div id="itemAttachmentArea">
-										<%@ include file="/pages/authoring/parts/itemattachment.jsp"%>
-									</div>
-								</td>
-							</tr>
-						</table>
-					</html:form>
-				</td>
-			</tr>
-			<tr>
-				<!-- Instructions -->
-				<td>
-					<%@ include file="instructions.jsp"%>
-				</td>
-			</tr>
-			<tr>
-				<td align="center" valign="bottom">
-					<a href="#" onclick="submitResourceItem()" class="button-add-item"><fmt:message key="label.authoring.basic.add.file" /></a>  <a href="javascript:;" onclick="cancelResourceItem()" class="button"><fmt:message key="label.cancel" /></a> 
-				</td>
-			</tr>
-			<tr>
-				<td>
-					&nbsp;
-				</td>
-			</tr>
-		</table>
 
+			<div class="field-name space-top">
+				<fmt:message key="label.authoring.basic.resource.file.input" />
+			</div>
+			<c:set var="itemAttachment"
+				value="<%=request
+										.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+			<div id="itemAttachmentArea">
+				<%@ include file="/pages/authoring/parts/itemattachment.jsp"%>
+			</div>
+
+		</html:form>
+
+		<!-- Instructions -->
+
+		<%@ include file="instructions.jsp"%>
+		
+		
+		<div class="space-bottom-top">
+			<a href="#" onclick="submitResourceItem()" class="button-add-item"><fmt:message
+					key="label.authoring.basic.add.file" /> </a>
+			<a href="javascript:;" onclick="cancelResourceItem()" class="button space-left"><fmt:message
+					key="label.cancel" /> </a>
+		</div>
 	</body>
 </html>
Index: lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp
===================================================================
diff -u -r9cd6be516aa221a17b218c27819ed892cd60e35f -r7011368b3f7cc34d52ce8f8640b64a9add794dd6
--- lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp	(.../addlearningobject.jsp)	(revision 9cd6be516aa221a17b218c27819ed892cd60e35f)
+++ lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp	(.../addlearningobject.jsp)	(revision 7011368b3f7cc34d52ce8f8640b64a9add794dd6)
@@ -2,107 +2,72 @@
 <html>
 	<head>
 		<%@ include file="/common/header.jsp"%>
-
+		<lams:css style="tabbed" />
 		<script type="text/javascript">
 	   <%-- user for  rsrcresourceitem.js --%>
 	   var removeInstructionUrl = "<c:url value='/authoring/removeInstruction.do'/>";
        var addInstructionUrl = "<c:url value='/authoring/newInstruction.do'/>";
        var removeItemAttachmentUrl = "<c:url value='/authoring/removeItemAttachment.do'/>";
 	</script>
-		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/rsrcresourceitem.js'/>"></script>
-		<style type="text/css">
-	<!--
-	table { 
-		 width:650px;
-		 margin-left:0px; 
-		 text-align:left; 
-		 }
-	
-	td { 
-		padding:4px; 
-		font-size:12px;
-	}
-	hr {
-		border: none 0;
-		border-top: 1px solid #ccc;
-		width: 650px;
-		height: 1px;
-		margin: 0px 10px 10px 0px;
-	}
-		
-	-->
-	</style>
+		<script type="text/javascript"
+			src="<html:rewrite page='/includes/javascript/rsrcresourceitem.js'/>"></script>
+
 	</head>
 	<body class="tabpart">
-		<table class="forms">
-			<!-- Basic Info Form-->
-			<tr>
-				<td>
-					<%@ include file="/common/messages.jsp"%>
-					<html:form action="/authoring/saveOrUpdateItem" method="post" styleId="resourceItemForm" enctype="multipart/form-data">
-						<html:hidden property="sessionMapID" />
-						<input type="hidden" name="instructionList" id="instructionList" />
-						<input type="hidden" name="itemType" id="itemType" value="4" />
-						<html:hidden property="itemIndex" />
-						<table class="innerforms">
+
+		<!-- Basic Info Form-->
+		<%@ include file="/common/messages.jsp"%>
+		<html:form action="/authoring/saveOrUpdateItem" method="post"
+			styleId="resourceItemForm" enctype="multipart/form-data">
+			<html:hidden property="sessionMapID" />
+			<input type="hidden" name="instructionList" id="instructionList" />
+			<input type="hidden" name="itemType" id="itemType" value="4" />
+			<html:hidden property="itemIndex" />
+
+			<h2 class="no-space-left">
+				<fmt:message key="label.authoring.basic.add.learning.object" />
+			</h2>
+			
+			<div class="field-name">
+				<fmt:message key="label.authoring.basic.resource.title.input" />
+			</div>
+
+			<html:text property="title" size="55" tabindex="1" />
+
+			<%--  Remove description in as LDEV-617
 							<tr>
-								<td colspan="2">
-									<h2>
-										<fmt:message key="label.authoring.basic.add.learning.object" />
-									</h2>
-								</td>
-							</tr>
-							<tr>
 								<td width="130px">
-									<fmt:message key="label.authoring.basic.resource.title.input" />
-								</td>
-								<td>
-									<html:text property="title" size="55" tabindex="1" />
-								</td>
-							</tr>
-  						    <%--  Remove description in as LDEV-617
-							<tr>
-								<td width="130px">
 									<fmt:message key="label.authoring.basic.resource.description.input" />
 								</td>
 								<td>
 									<lams:STRUTS-textarea rows="5" cols="55" tabindex="2" property="description" />
 								</td>
 							</tr>
 							--%>
-							<tr>
-								<td width="130px">
-									<fmt:message key="label.authoring.basic.resource.zip.file.input" />
-								</td>
-								<td>
-									<c:set var="itemAttachment" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-									<div id="itemAttachmentArea">
-										<%@ include file="/pages/authoring/parts/itemattachment.jsp"%>
-									</div>
-								</td>
-							</tr>
-						</table>
-					</html:form>
-				</td>
-			</tr>
-			<tr>
+			
+			<div class="field-name space-top">
+				<fmt:message key="label.authoring.basic.resource.zip.file.input" />
+			</div>
 
-				<!-- Instructions -->
-				<td>
-					<%@ include file="instructions.jsp"%>
-				</td>
-			</tr>
-			<tr>
-				<td align="center" valign="bottom">
-					<a href="#" onclick="submitResourceItem()" class="button-add-item"><fmt:message key="label.authoring.basic.add.learning.object" /></a> <a href="javascript:;" onclick="cancelResourceItem()" class="button"><fmt:message key="label.cancel" /></a> 
-				</td>
-			</tr>
-			<tr>
-				<td>
-					&nbsp;
-				</td>
-			</tr>
-		</table>
+			<c:set var="itemAttachment"
+				value="<%=request
+										.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+			<div id="itemAttachmentArea">
+				<%@ include file="/pages/authoring/parts/itemattachment.jsp"%>
+			</div>
 
+		</html:form>
+		<!-- Instructions -->
+
+		<%@ include file="instructions.jsp"%>
+
+		
+		<div class="space-bottom-top">
+			<a href="#" onclick="submitResourceItem()" class="button-add-item"><fmt:message
+					key="label.authoring.basic.add.learning.object" /> </a>
+			<a href="javascript:;" onclick="cancelResourceItem()"
+				class="button space-left"><fmt:message key="label.cancel" /> </a>
+		</div>
+
 	</body>
 </html>
Index: lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp
===================================================================
diff -u -r9cd6be516aa221a17b218c27819ed892cd60e35f -r7011368b3f7cc34d52ce8f8640b64a9add794dd6
--- lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	(.../addurl.jsp)	(revision 9cd6be516aa221a17b218c27819ed892cd60e35f)
+++ lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	(.../addurl.jsp)	(revision 7011368b3f7cc34d52ce8f8640b64a9add794dd6)
@@ -2,104 +2,73 @@
 <html>
 	<head>
 		<%@ include file="/common/header.jsp"%>
+		<lams:css style="tabbed" />
 		<%-- user for  rsrcresourceitem.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/rsrcresourceitem.js'/>"></script>
-		<style type="text/css">
-	<!--
-	table { 
-		 width:650px;
-		 margin-left:0px; 
-		 text-align:left; 
-		 }
-	
-	td { 
-		padding:4px; 
-		font-size:12px;
-	}
-	hr {
-		border: none 0;
-		border-top: 1px solid #ccc;
-		width: 650px;
-		height: 1px;
-		margin: 0px 10px 10px 0px;
-	}
-		
-	-->
-	</style>
+		<script type="text/javascript"
+			src="<html:rewrite page='/includes/javascript/rsrcresourceitem.js'/>"></script>
 	</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="resourceItemForm">
-						<html:hidden property="sessionMapID" />
-						<input type="hidden" name="instructionList" id="instructionList" />
-						<input type="hidden" name="itemType" id="itemType" value="1" />
-						<html:hidden property="itemIndex" />
-						<table class="innerforms">
+
+		<!-- Basic Info Form-->
+		<%@ include file="/common/messages.jsp"%>
+		<html:form action="/authoring/saveOrUpdateItem" method="post"
+			styleId="resourceItemForm">
+			<html:hidden property="sessionMapID" />
+			<input type="hidden" name="instructionList" id="instructionList" />
+			<input type="hidden" name="itemType" id="itemType" value="1" />
+			<html:hidden property="itemIndex" />
+
+			<h2 class="no-space-left">
+				<fmt:message key="label.authoring.basic.add.url" />
+			</h2>
+
+			<div class="field-name">
+				<fmt:message key="label.authoring.basic.resource.title.input" />
+			</div>
+
+			<html:text property="title" size="55" />
+
+			<%--  Remove description in as LDEV-617
 							<tr>
-								<td colspan="2">
-									<h2>
-										<fmt:message key="label.authoring.basic.add.url" />
-									</h2>
-								</td>
-							</tr>
-							<tr>
-								<td width="75px">
-									<fmt:message key="label.authoring.basic.resource.title.input" />
-								</td>
 								<td>
-									<html:text property="title" size="55" />
-								</td>
-							</tr>
-						  <%--  Remove description in as LDEV-617
-							<tr>
-								<td>
 									<fmt:message key="label.authoring.basic.resource.description.input" />
 								</td>
 								<td>
 									<lams:STRUTS-textarea rows="5" cols="55" property="description" />
 								</td>
 							</tr>
 						 --%>
-							<tr>
-								<td valign="top">
-									<fmt:message key="label.authoring.basic.resource.url.input" />
-								</td>
-								<td>
-									<html:text property="url" size="55" /><BR><BR>
-									<html:checkbox property="openUrlNewWindow">
-										<fmt:message key="open.in.new.window" />
-									</html:checkbox>
-								</td>
-							</tr>
-						</table>
-					</html:form>
-				</td>
-			</tr>
-			<tr>
 
-				<!-- Instructions -->
-				<td>
-					<%@ include file="instructions.jsp"%>
-				</td>
-			</tr>
-			<tr>
-				<td align="center" valign="bottom">
-					 <a href="#" onclick="submitResourceItem()" class="button-add-item"><fmt:message key="label.authoring.basic.add.url" /></a>  <a href="javascript:;" onclick="cancelResourceItem()" class="button"><fmt:message key="label.cancel" /></a>
-				</td>
-			</tr>
-			<tr>
-				<td>
-					&nbsp;
-				</td>
-			</tr>
-		</table>
+			<div class="field-name space-top">
+				<fmt:message key="label.authoring.basic.resource.url.input" />
+			</div>
+			<html:text property="url" size="55" />
+
+			<div class="space-top">
+				<html:checkbox property="openUrlNewWindow"
+					styleId="openUrlNewWindow" styleClass="noBorder">
+				</html:checkbox>
+				<label for="openUrlNewWindow">
+					<fmt:message key="open.in.new.window" />
+				</label>
+			</div>
+
+		</html:form>
+
+		<!-- Instructions -->
+
+		<%@ include file="instructions.jsp"%>
+
+
+		<div class="space-bottom-top">
+			<a href="#" onclick="submitResourceItem()" class="button-add-item"><fmt:message
+					key="label.authoring.basic.add.url" /> </a>
+			<a href="javascript:;" onclick="cancelResourceItem()"
+				class="button space-left"><fmt:message key="label.cancel" /> </a>
+		</div>
 	</body>
 </html>
Index: lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp
===================================================================
diff -u -r9cd6be516aa221a17b218c27819ed892cd60e35f -r7011368b3f7cc34d52ce8f8640b64a9add794dd6
--- lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp	(.../addwebsite.jsp)	(revision 9cd6be516aa221a17b218c27819ed892cd60e35f)
+++ lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp	(.../addwebsite.jsp)	(revision 7011368b3f7cc34d52ce8f8640b64a9add794dd6)
@@ -2,107 +2,75 @@
 <html>
 	<head>
 		<%@ include file="/common/header.jsp"%>
+		<lams:css style="tabbed" />
 		<script type="text/javascript">
 	   <%-- user for  rsrcresourceitem.js --%>
 	   var removeInstructionUrl = "<c:url value='/authoring/removeInstruction.do'/>";
        var addInstructionUrl = "<c:url value='/authoring/newInstruction.do'/>";
        var removeItemAttachmentUrl = "<c:url value='/authoring/removeItemAttachment.do'/>";
        
 	</script>
-		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/rsrcresourceitem.js'/>"></script>
-		<style type="text/css">
-	<!--
-	table { 
-		 width:650px;
-		 margin-left:0px; 
-		 text-align:left; 
-		 }
-	
-	td { 
-		padding:4px; 
-		font-size:12px;
-	}
-	hr {
-		border: none 0;
-		border-top: 1px solid #ccc;
-		width: 650px;
-		height: 1px;
-		margin: 0px 10px 10px 0px;
-	}
-		
-	-->
-	</style>
+		<script type="text/javascript"
+			src="<html:rewrite page='/includes/javascript/rsrcresourceitem.js'/>"></script>
+
 	</head>
 	<body class="tabpart">
-		<table class="forms">
-			<!-- Basic Info Form-->
-			<tr>
-				<td>
-					<%@ include file="/common/messages.jsp"%>
-					<html:form action="/authoring/saveOrUpdateItem" method="post" styleId="resourceItemForm" enctype="multipart/form-data">
-						<html:hidden property="sessionMapID" />
-						<input type="hidden" name="instructionList" id="instructionList" />
-						<input type="hidden" name="itemType" id="itemType" value="3" />
-						<html:hidden property="itemIndex" />
-						<table class="innerforms">
+
+		<!-- Basic Info Form-->
+
+		<%@ include file="/common/messages.jsp"%>
+		<html:form action="/authoring/saveOrUpdateItem" method="post"
+			styleId="resourceItemForm" enctype="multipart/form-data">
+			<html:hidden property="sessionMapID" />
+			<input type="hidden" name="instructionList" id="instructionList" />
+			<input type="hidden" name="itemType" id="itemType" value="3" />
+			<html:hidden property="itemIndex" />
+
+			<h2 class="no-space-left">
+				<fmt:message key="label.authoring.basic.add.website" />
+			</h2>
+
+			<div class="field-name">
+				<fmt:message key="label.authoring.basic.resource.title.input" />
+			</div>
+
+			<html:text property="title" size="55" tabindex="1" />
+
+			<%--  Remove description in as LDEV-617
 							<tr>
-								<td colspan="2">
-									<h2>
-										<fmt:message key="label.authoring.basic.add.website" />
-									</h2>
-								</td>
-							</tr>
-							<tr>
 								<td width="130px">
-									<fmt:message key="label.authoring.basic.resource.title.input" />
-								</td>
-								<td>
-									<html:text property="title" size="55" tabindex="1" />
-								</td>
-							</tr>
-							  <%--  Remove description in as LDEV-617
-							<tr>
-								<td width="130px">
 									<fmt:message key="label.authoring.basic.resource.description.input" />
 								</td>
 								<td>
 									<lams:STRUTS-textarea rows="5" cols="55" tabindex="2" property="description" />
 								</td>
 							</tr>
 							--%>
-							<tr>
-								<td width="130px">
-									<fmt:message key="label.authoring.basic.resource.zip.file.input" />
-								</td>
-								<td>
-									<c:set var="itemAttachment" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-									<div id="itemAttachmentArea">
-										<%@ include file="/pages/authoring/parts/itemattachment.jsp"%>
-									</div>
-								</td>
-							</tr>
-						</table>
-					</html:form>
-				</td>
-			</tr>
-			<tr>
 
-				<!-- Instructions -->
-				<td>
-					<%@ include file="instructions.jsp"%>
-				</td>
-			</tr>
-			<tr>
-				<td align="center" valign="bottom">
-					 <a href="#" onclick="submitResourceItem()" class="button-add-item"><fmt:message key="label.authoring.basic.add.website" /></a> <a href="javascript:;" onclick="cancelResourceItem()" class="button"><fmt:message key="label.cancel" /></a>
-				</td>
-			</tr>
-			<tr>
-				<td>
-					&nbsp;
-				</td>
-			</tr>
-		</table>
+			<div class="field-name space-top">
+				<fmt:message key="label.authoring.basic.resource.zip.file.input" />
+			</div>
 
+			<c:set var="itemAttachment"
+				value="<%=request
+										.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+			<div id="itemAttachmentArea">
+				<%@ include file="/pages/authoring/parts/itemattachment.jsp"%>
+			</div>
+
+		</html:form>
+		<!-- Instructions -->
+
+		<%@ include file="instructions.jsp"%>
+
+		<div class="space-bottom-top">
+			<a href="#" onclick="submitResourceItem()" class="button-add-item"><fmt:message
+					key="label.authoring.basic.add.website" /> </a>
+			<a href="javascript:;" onclick="cancelResourceItem()" class="button space-left"><fmt:message
+					key="label.cancel" /> </a>
+		</div>
+
+
+
 	</body>
 </html>
Index: lams_tool_larsrc/web/pages/authoring/parts/instructions.jsp
===================================================================
diff -u -r3c434c8fc63a2665a84d3ff07f5102db909a23af -r7011368b3f7cc34d52ce8f8640b64a9add794dd6
--- lams_tool_larsrc/web/pages/authoring/parts/instructions.jsp	(.../instructions.jsp)	(revision 3c434c8fc63a2665a84d3ff07f5102db909a23af)
+++ lams_tool_larsrc/web/pages/authoring/parts/instructions.jsp	(.../instructions.jsp)	(revision 7011368b3f7cc34d52ce8f8640b64a9add794dd6)
@@ -1,46 +1,75 @@
-<%@ 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">
-		<tr>
-			<td colspan="5">
-				<fmt:message key="label.authoring.basic.resource.instructions"/>
-				<a href="javascript:;" onclick="addInstruction()" class="button"><fmt:message key="label.authoring.basic.resource.add.instruction"/></a>
-				<img src="${ctxPath}/includes/images/indicator.gif" style="display:none" id="instructionArea_Busy" />
-			</td>
-		</tr>
-		<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">
+
+		<div class="field-name space-top">
+			<fmt:message key="label.authoring.basic.resource.instructions" />
+		</div>
+
+		<a href="javascript:;" onclick="addInstruction()"
+			class="button-add-item"><fmt:message
+				key="label.authoring.basic.resource.add.instruction" /> </a>
+		<img src="${ctxPath}/includes/images/indicator.gif"
+			style="display:none" id="instructionArea_Busy" />
+
+
+		<table>
+			<c:forEach var="item" items="${instructionList}" varStatus="status">
+				<tr id="instructionItem${status.index}">
+					<td width="3px">
+						${status.index+1}
+					</td>
+					<td>
+						<input type="text" name="instructionItemDesc${status.index}"
+							id="instructionItemDesc${status.index}" size="60" value="${item}">
+					</td>
+
+					<td>
+						<%-- 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>
+						<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_larsrc/web/pages/authoring/parts/itemattachment.jsp
===================================================================
diff -u -r8d06fff29ec080cfdbfe976fe31379903e51e389 -r7011368b3f7cc34d52ce8f8640b64a9add794dd6
--- lams_tool_larsrc/web/pages/authoring/parts/itemattachment.jsp	(.../itemattachment.jsp)	(revision 8d06fff29ec080cfdbfe976fe31379903e51e389)
+++ lams_tool_larsrc/web/pages/authoring/parts/itemattachment.jsp	(.../itemattachment.jsp)	(revision 7011368b3f7cc34d52ce8f8640b64a9add794dd6)
@@ -1,24 +1,27 @@
-<%@ include file="/common/taglibs.jsp" %>
-<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
-<input type="hidden" name="hasFile" value="${itemAttachment.hasFile}"/>
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="ctxPath" value="${pageContext.request.contextPath}"
+	scope="request" />
+<input type="hidden" name="hasFile" value="${itemAttachment.hasFile}" />
 <c:choose>
 	<c:when test="${itemAttachment.hasFile}">
 		<table border="0" style="align:left;width:400px">
-		<tr><td>
-			<c:out value="${itemAttachment.fileName}" />
-		</td>
-		<td>
-			<a href="#" onclick="removeItemAttachment(${itemAttachment.itemIndex})" class="button">
-				<fmt:message key="label.delete" />
-			</a>	
-		</td>
-		<td>
-			<img src="${ctxPath}/includes/images/indicator.gif" style="display:none" id="itemAttachmentArea_Busy" />
-		</td>
-		</tr>
+			<tr>
+				<td>
+					<c:out value="${itemAttachment.fileName}" />
+				</td>
+				<td>
+					<a href="#"
+						onclick="removeItemAttachment(${itemAttachment.itemIndex})"
+						class="button"> <fmt:message key="label.delete" /> </a>
+				</td>
+				<td>
+					<img src="${ctxPath}/includes/images/indicator.gif"
+						style="display:none" id="itemAttachmentArea_Busy" />
+				</td>
+			</tr>
 		</table>
 	</c:when>
 	<c:otherwise>
-		<input type="file" name="file" size="55"  /> 
+		<input type="file" name="file" />
 	</c:otherwise>
 </c:choose>
Index: lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -rc25a2c783e51d05045d1fb61981c169357cd3e98 -r7011368b3f7cc34d52ce8f8640b64a9add794dd6
--- lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
+++ lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 7011368b3f7cc34d52ce8f8640b64a9add794dd6)
@@ -1,103 +1,123 @@
-<%@ 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" />
+
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+
 <div id="itemList">
-<h2><fmt:message key="label.authoring.basic.resource.list.title" />
-<img src="${ctxPath}/includes/images/indicator.gif" style="display:none" id="resourceListArea_Busy" /></h2>
+	<h2 class="spacer-left">
+		<fmt:message key="label.authoring.basic.resource.list.title" />
+		<img src="${ctxPath}/includes/images/indicator.gif"
+			style="display:none" id="resourceListArea_Busy" />
+	</h2>
 
-<table id="itemTable" style="align:left;width:650px" >
-<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+	<table class="alternative-color" id="itemTable">
+		<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-<c:forEach var="resource" items="${sessionMap.resourceList}" varStatus="status">
-	<tr>
-	<%-- Resource Type:1=URL,2=File,3=Website,4=Learning Object --%>
-	<c:if test="${resource.type == 1}">
-		<td width="200px" align="right" class="field-name">
-			<fmt:message key="label.authoring.basic.resource.url" />:
-		</td>
-		<td>${resource.title}</td>
-		<td width="130px" nowrap="nowrap" align="center">
-			<a href="#" onclick="previewItem(1,${status.index},'${sessionMapID}')" class="button">
-				<fmt:message key="label.authoring.basic.resource.verify.url" />
-			</a>
-		</td>
-		<td width="80px" align="center">
-			<a href="#" onclick="editItem(${status.index},'${sessionMapID}')" class="button">
-				<fmt:message key="label.authoring.basic.resource.edit" />
-			</a>
-		</td>
-		<td width="80px" align="center">
-			<a href="#" onclick="deleteItem(${status.index},'${sessionMapID}')" class="button">
-				<fmt:message key="label.authoring.basic.resource.delete" />
-			</a>
-		</td>
-	</c:if>
-	<c:if test="${resource.type == 2}">
-		<td  width="200px" align="right" class="field-name">
-			<fmt:message key="label.authoring.basic.resource.file" />:
-		</td>
-		<td>${resource.title}</td>
-		<td width="130px" nowrap="nowrap" align="center">
-			<a href="#" onclick="previewItem(2,${status.index},'${sessionMapID}')" class="button">
-				<fmt:message key="label.authoring.basic.resource.preview" />
-			</a>
-		</td>
-		<td width="80px" align="center">
-			<a href="#" onclick="editItem(${status.index},'${sessionMapID}')" class="button">
-				<fmt:message key="label.authoring.basic.resource.edit" />
-			</a>
-		</td>
-		<td width="80px" align="center">
-			<a href="#" onclick="deleteItem(${status.index},'${sessionMapID}')" class="button">
-				<fmt:message key="label.authoring.basic.resource.delete" />
-			</a>
-		</td>
-	</c:if>
-	<c:if test="${resource.type == 3}">
-		<td width="200px" align="right" class="field-name">
-			<fmt:message key="label.authoring.basic.resource.website" />:
-		</td>
-		<td>${resource.title}</td>
-		<td width="130px" nowrap="nowrap" align="center">
-			<a href="#" onclick="previewItem(3,${status.index},'${sessionMapID}')" class="button">
-				<fmt:message key="label.authoring.basic.resource.preview" />
-			</a>
-		</td>
-			<td width="80px" align="center">
-			<a href="#" onclick="editItem(${status.index},'${sessionMapID}')" class="button">
-				<fmt:message key="label.authoring.basic.resource.edit" />
-			</a>
-		</td>
-		<td width="80px" align="center">
-			<a href="#" onclick="deleteItem(${status.index},'${sessionMapID}')" class="button">
-				<fmt:message key="label.authoring.basic.resource.delete" />
-			</a>
-		</td>
-	</c:if>
-	<c:if test="${resource.type == 4}">
-		<td width="200px" align="right" class="field-name">
-			<fmt:message key="label.authoring.basic.resource.learning.object" />:
-		</td>
-		<td>${resource.title}</td>
-		<td width="130px" nowrap="nowrap" align="center">
-			<a href="#" onclick="previewItem(4,${status.index},'${sessionMapID}')" class="button">
-				<fmt:message key="label.authoring.basic.resource.preview" />
-			</a>
-		</td>
-		<td width="80px" align="center">
-			<a href="#" onclick="editItem(${status.index},'${sessionMapID}')" class="button">
-				<fmt:message key="label.authoring.basic.resource.edit" />
-			</a>
-		</td>
-		<td width="80px" align="center">
-			<a href="#" onclick="deleteItem(${status.index},'${sessionMapID}')" class="button">
-				<fmt:message key="label.authoring.basic.resource.delete" />
-			</a>
-		</td>
-	</c:if>
-	</tr>
-</c:forEach>
-</table>
+		<c:forEach var="resource" items="${sessionMap.resourceList}"
+			varStatus="status">
+			<tr>
+				<%-- Resource Type:1=URL,2=File,3=Website,4=Learning Object --%>
+				<c:if test="${resource.type == 1}">
+					<td>
+						<span class="field-name"> <fmt:message
+								key="label.authoring.basic.resource.url" /> : </span>
+						${resource.title}
+					</td>
+					<td width="10%">
+						<a href="#"
+							onclick="previewItem(1,${status.index},'${sessionMapID}')"> <fmt:message
+								key="label.authoring.basic.resource.verify.url" /> </a>
+					</td>
+					<td width="5%">
+						<img src="${tool}includes/images/edit.gif"
+							title="<fmt:message key="label.authoring.basic.resource.edit" />"
+							onclick="editItem(${status.index},'${sessionMapID}')" />
+
+					</td>
+					<td width="5%">
+						<img src="${tool}includes/images/cross.gif"
+							title="<fmt:message key="label.authoring.basic.resource.delete" />"
+							onclick="deleteItem(${status.index},'${sessionMapID}')" />
+					</td>
+				</c:if>
+
+				<c:if test="${resource.type == 2}">
+					<td>
+						<span class="field-name"> <fmt:message
+								key="label.authoring.basic.resource.file" /> : </span>
+						${resource.title}
+					</td>
+					<td>
+						<a href="#"
+							onclick="previewItem(2,${status.index},'${sessionMapID}')"> <fmt:message
+								key="label.authoring.basic.resource.preview" /> </a>
+					</td>
+					<td>
+						<img src="${tool}includes/images/edit.gif"
+							title="<fmt:message key="label.authoring.basic.resource.edit" />"
+							onclick="editItem(${status.index},'${sessionMapID}')" />
+
+					</td>
+					<td>
+						<img src="${tool}includes/images/cross.gif"
+							title="<fmt:message key="label.authoring.basic.resource.delete" />"
+							onclick="deleteItem(${status.index},'${sessionMapID}')" />
+					</td>
+				</c:if>
+
+				<c:if test="${resource.type == 3}">
+					<td>
+						<span class="field-name"> <fmt:message
+								key="label.authoring.basic.resource.website" /> : </span>
+						${resource.title}
+					</td>
+					<td>
+						<a href="#"
+							onclick="previewItem(3,${status.index},'${sessionMapID}')"> <fmt:message
+								key="label.authoring.basic.resource.preview" /> </a>
+					</td>
+					<td>
+						<img src="${tool}includes/images/edit.gif"
+							title="<fmt:message key="label.authoring.basic.resource.edit" />"
+							onclick="editItem(${status.index},'${sessionMapID}')" />
+					</td>
+					<td>
+						<img src="${tool}includes/images/cross.gif"
+							title="<fmt:message key="label.authoring.basic.resource.delete" />"
+							onclick="deleteItem(${status.index},'${sessionMapID}')" />
+					</td>
+				</c:if>
+
+				<c:if test="${resource.type == 4}">
+					<td>
+						<span class="field-name"> <fmt:message
+								key="label.authoring.basic.resource.learning.object" /> : </span>
+						${resource.title}
+					</td>
+					<td>
+						<a href="#"
+							onclick="previewItem(4,${status.index},'${sessionMapID}')"> <fmt:message
+								key="label.authoring.basic.resource.preview" /> </a>
+					</td>
+					<td>
+						<img src="${tool}includes/images/edit.gif"
+							title="<fmt:message key="label.authoring.basic.resource.edit" />"
+							onclick="editItem(${status.index},'${sessionMapID}')" />
+					</td>
+					<td>
+						<img src="${tool}includes/images/cross.gif"
+							title="<fmt:message key="label.authoring.basic.resource.delete" />"
+							onclick="deleteItem(${status.index},'${sessionMapID}')" />
+					</td>
+				</c:if>
+			</tr>
+		</c:forEach>
+	</table>
 </div>
+
 <%-- This script will works when a new resoruce item submit in order to refresh "Resource List" panel. --%>
 <script lang="javascript">
 
@@ -106,4 +126,4 @@
 		var obj = window.top.document.getElementById('resourceListArea');
 		obj.innerHTML= document.getElementById("itemList").innerHTML;
 	}
-</script>
\ No newline at end of file
+</script>