Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java,v
diff -u -r1.56 -r1.57
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java	19 Oct 2006 13:21:41 -0000	1.56
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java	27 Oct 2006 15:42:15 -0000	1.57
@@ -38,7 +38,6 @@
 import org.lamsfoundation.lams.tool.mc.McCandidateAnswersDTO;
 import org.lamsfoundation.lams.tool.mc.McComparator;
 import org.lamsfoundation.lams.tool.mc.McQuestionContentDTO;
-import org.lamsfoundation.lams.tool.mc.McUtils;
 import org.lamsfoundation.lams.tool.mc.pojos.McContent;
 import org.lamsfoundation.lams.tool.mc.pojos.McOptsContent;
 import org.lamsfoundation.lams.tool.mc.pojos.McQueContent;
@@ -325,7 +324,7 @@
     		String feedback=mcQueContent.getFeedback();
     		logger.debug("feedback:" + feedback);
     		
-    		
+    		/*
     		boolean isFeedbackTextMarkup=LearningUtil.isTextMarkup(feedback);
     		logger.debug("isFeedbackTextMarkup: " + isFeedbackTextMarkup);
 
@@ -340,9 +339,10 @@
     		
     		newFeedbackText=McUtils.replaceNewLines(newFeedbackText);
     		logger.debug("newFeedbackText after procesing new lines: " + newFeedbackText);
+    		*/
 
     		
-    		map.put(mapIndex.toString(),newFeedbackText);
+    		map.put(mapIndex.toString(),feedback);
     		mapIndex=new Long(mapIndex.longValue()+1);
     	}
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java,v
diff -u -r1.42 -r1.43
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java	19 Oct 2006 13:21:40 -0000	1.42
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java	27 Oct 2006 15:42:15 -0000	1.43
@@ -768,6 +768,7 @@
     		String question=mcQueContent.getQuestion();
     		logger.debug("question: " + question);
     		
+    		/*
     		boolean isTextMarkup=LearningUtil.isTextMarkup(question);
     		logger.debug("isTextMarkup: " + isTextMarkup);
     		
@@ -782,8 +783,9 @@
     		
     		newQuestionText=McUtils.replaceNewLines(newQuestionText);
     		logger.debug("newQuestionText after procesing new lines: " + newQuestionText);
+    		*/
 
-    		mcLearnerAnswersDTO.setQuestion(newQuestionText);
+    		mcLearnerAnswersDTO.setQuestion(question);
     		mcLearnerAnswersDTO.setDisplayOrder(mcQueContent.getDisplayOrder().toString());
     		mcLearnerAnswersDTO.setQuestionUid(mcQueContent.getUid().toString());
     		
@@ -1121,6 +1123,7 @@
         return false;
     }
 
+    /*
     public static String getWrappedText(String text, boolean authoring)
     {
         
@@ -1163,6 +1166,7 @@
 	    logger.debug("returning newText: " + newText);
     	return newText;
     }
+    */
 
     
  }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java,v
diff -u -r1.49 -r1.50
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	19 Oct 2006 13:21:41 -0000	1.49
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	27 Oct 2006 15:42:16 -0000	1.50
@@ -585,6 +585,7 @@
     		String question=mcQueContent.getQuestion();
     		logger.debug("question: " + question);
     		
+    		/*
     		boolean isTextMarkup=LearningUtil.isTextMarkup(question);
     		logger.debug("isTextMarkup: " + isTextMarkup);
     		
@@ -599,9 +600,10 @@
     		
     		newQuestionText=McUtils.replaceNewLines(newQuestionText);
     		logger.debug("newQuestionText after procesing new lines: " + newQuestionText);
+    		*/
     		
     		
-    		mcLearnerAnswersDTO.setQuestion(newQuestionText);
+    		mcLearnerAnswersDTO.setQuestion(question);
     		mcLearnerAnswersDTO.setDisplayOrder(mcQueContent.getDisplayOrder().toString());
     		mcLearnerAnswersDTO.setQuestionUid(mcQueContent.getUid().toString());
     		mcLearnerAnswersDTO.setMark(mcQueContent.getMark().toString());
@@ -615,6 +617,7 @@
     		if (feedback == null) feedback="";
     		logger.debug("feedback: " + feedback);
     		
+    		/*
     		boolean isFeedbackTextMarkup=LearningUtil.isTextMarkup(feedback);
     		logger.debug("isFeedbackTextMarkup: " + isFeedbackTextMarkup);
 
@@ -629,8 +632,9 @@
     		
     		newFeedbackText=McUtils.replaceNewLines(newFeedbackText);
     		logger.debug("newFeedbackText after procesing new lines: " + newFeedbackText);
+    		*/
     		
-    		mcLearnerAnswersDTO.setFeedback(newFeedbackText);
+    		mcLearnerAnswersDTO.setFeedback(feedback);
     		
     		Map caMap= new TreeMap(new McStringComparator());
     		Map caIdsMap= new TreeMap(new McStringComparator());
Index: lams_tool_lamc/web/authoring/itemlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/itemlist.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_lamc/web/authoring/itemlist.jsp	20 Oct 2006 09:25:42 -0000	1.4
+++ lams_tool_lamc/web/authoring/itemlist.jsp	27 Oct 2006 15:42:16 -0000	1.5
@@ -30,8 +30,7 @@
 	</h2>
 
 	<c:set var="formBean"
-		value="<%=request
-									.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+		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" />
 
@@ -62,9 +61,10 @@
 
 			<tr>
 				<td>
-					<span class="field-name"> <fmt:message key="label.question" />
-						: </span>
-					<c:out value="${question}" escapeXml="false" />
+					<div style="overflow: auto;">
+						<strong> <fmt:message key="label.question" />: </strong>
+						<c:out value="${question}" escapeXml="false" />
+					</div>					
 				</td>
 
 
Index: lams_tool_lamc/web/authoring/itemlistViewOnly.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/Attic/itemlistViewOnly.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_lamc/web/authoring/itemlistViewOnly.jsp	15 Oct 2006 15:17:18 -0000	1.2
+++ lams_tool_lamc/web/authoring/itemlistViewOnly.jsp	27 Oct 2006 15:42:16 -0000	1.3
@@ -37,8 +37,10 @@
 	<c:set var="displayOrder" scope="request" value="${currentDTO.displayOrder}"/>	
 
 	<tr>
-		<td width="10%" align="right" class="field-name">
-			<fmt:message key="label.question" />:
+		<td width="10%" align="right">
+			<div style="overflow: auto;">		
+				<strong> <fmt:message key="label.question" />: </strong>
+			</div>								
 		</td>
 
 		<td width="60%" align="left">
Index: lams_tool_lamc/web/learning/CombinedAnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/CombinedAnswersContent.jsp,v
diff -u -r1.19 -r1.20
--- lams_tool_lamc/web/learning/CombinedAnswersContent.jsp	27 Oct 2006 08:28:18 -0000	1.19
+++ lams_tool_lamc/web/learning/CombinedAnswersContent.jsp	27 Oct 2006 15:42:16 -0000	1.20
@@ -72,11 +72,13 @@
 			items="${requestScope.listQuestionCandidateAnswersDto}">
 		
 			<div class="shading-bg">
+				<div style="overflow: auto;">
 				<c:out value="${dto.question}" escapeXml="false" />
 				 [
 				<strong><fmt:message key="label.mark" /></strong>
 				<c:out value="${dto.mark}" />
 				]
+				</div>									
 			</div>
 			
 			
Index: lams_tool_lamc/web/learning/IndividualLearnerResults.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/Attic/IndividualLearnerResults.jsp,v
diff -u -r1.33 -r1.34
--- lams_tool_lamc/web/learning/IndividualLearnerResults.jsp	27 Oct 2006 08:28:18 -0000	1.33
+++ lams_tool_lamc/web/learning/IndividualLearnerResults.jsp	27 Oct 2006 15:42:16 -0000	1.34
@@ -110,12 +110,13 @@
 				items="${requestScope.listSelectedQuestionCandidateAnswersDto}">
 
 				<div class="shading-bg">
-					<p>
+
 						<strong> <fmt:message key="label.question.col" /> </strong>
 						
+						<div style="overflow: auto;">
+							<c:out value="${dto.question}" escapeXml="false" />
+						</div>									
 
-						<c:out value="${dto.question}" escapeXml="false" />
-						<br>
 						[
 						<strong> <fmt:message key="label.mark" /> </strong>
 						<c:out value="${dto.mark}" />
@@ -129,7 +130,7 @@
 							<img src="<c:out value="${tool}"/>images/cross.gif" border="0" class="middle">
 						</c:if>
 
-					</p>
+
 					<p>
 						<c:forEach var="caText" varStatus="status"
 							items="${dto.candidateAnswers}">
@@ -139,9 +140,9 @@
 
 					</p>
 
-					<p>
-						<i> <c:out value="${dto.feedback}" escapeXml="false" /> </i>
-					</p>
+					<div style="overflow: auto;">
+						<strong> <fmt:message key="label.feedback.simple" /> </strong> <c:out value="${dto.feedback}" escapeXml="false" /> 
+					</div>									
 
 				</div>
 			</c:forEach>
Index: lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp,v
diff -u -r1.15 -r1.16
--- lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp	17 Oct 2006 20:35:24 -0000	1.15
+++ lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp	27 Oct 2006 15:42:16 -0000	1.16
@@ -32,54 +32,56 @@
 					  </tr>
 					  
 					  <tr>
-					  	<td NOWRAP align=left valign=top colspan=2> 
+					  	<td align=left valign=top colspan=2> 
 						  	<c:out value="${mcGeneralLearnerFlowDTO.activityInstructions}" escapeXml="false" /> 
 					  	</td>
 					  </tr>
 					  
 			
 			 		<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true'}"> 		
 					  <tr>
-					  	<td NOWRAP align=center valign=top colspan=2> 
+					  	<td align=center valign=top colspan=2> 
 						  	  <b> <fmt:message key="label.withRetries"/> </b>
 					  	</td>
 					  </tr>
 					</c:if> 			
 				
 					<c:if test="${mcGeneralLearnerFlowDTO.retries == 'false'}"> 		
 					  <tr>
-					  	<td NOWRAP align=center valign=top colspan=2> 
+					  	<td align=center valign=top colspan=2> 
 						    <b> <fmt:message key="label.withoutRetries"/> </b>
 					  	</td>
 					  </tr>
 					</c:if> 			
 
 			 		<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true' && mcGeneralLearnerFlowDTO.passMark != '0'}"> 		
 					  <tr>
-					  	<td NOWRAP align=left valign=top colspan=2> 
+					  	<td align=left valign=top colspan=2> 
 						  	 <b>  <fmt:message key="label.learner.message"/> ( <c:out value="${mcGeneralLearnerFlowDTO.passMark}"/> )  </b>
 						  	 
 					  	</td>
 					  </tr>
 					</c:if>
 
 				  <tr>						 
-					  	<td NOWRAP align=left valign=top colspan=2> 
+					  	<td align=left valign=top colspan=2> 
 						<table align=left>
 						
 								<html:hidden property="nextQuestionSelected"/>						
 								<html:hidden property="questionIndex" value="${mcGeneralLearnerFlowDTO.questionIndex}"/>						
 								<c:forEach var="dto" varStatus="status" items="${requestScope.listQuestionCandidateAnswersDto}">
 									<c:if test="${dto.displayOrder == mcGeneralLearnerFlowDTO.questionIndex}"> 										
 									  <tr>
-									  	<td NOWRAP align=left valign=top> 
+									  	<td align=left valign=top> 
+											<div style="overflow: auto;">									  	
 										  		<c:out value="${dto.question}" escapeXml="false"/> &nbsp[ <b> <fmt:message key="label.mark"/> </b>
 										  		<c:out value="${dto.mark}"/> ]
+											</div>																			  		
 									  	</td>
 									  </tr>
 									
 									  <tr>
-									  	<td NOWRAP align=left valign=top> 
+									  	<td align=left valign=top> 
 											<c:forEach var="ca" varStatus="status" items="${dto.candidateAnswerUids}">
 												<input type="checkbox" name="checkedCa" value="${dto.questionUid}-${ca.value}"> 
 													
@@ -99,23 +101,23 @@
 
 
 			  	   	<tr> 
-				 		<td NOWRAP colspan=2 valign=top> 
+				 		<td colspan=2 valign=top> 
 				 		&nbsp
 				 		</td>
 			  	   </tr>
 			  	   
 			  	<html:hidden property="donePreview"/>						   
 		  		<c:if test="${mcGeneralLearnerFlowDTO.totalCountReached != 'true'  &&  mcGeneralLearnerFlowDTO.totalQuestionCount != '1'}"> 			
 	  	   		  <tr>
-				  	<td NOWRAP colspan=2 valign=top> 
+				  	<td colspan=2 valign=top> 
 						  <img src="<c:out value="${tool}"/>images/green_arrow_down_right.gif" align=left onclick="javascript:submitNextQuestionSelected();"> 							
 				  	 </td>
 				  </tr>
 				</c:if> 								  
 
 		 		<c:if test="${mcGeneralLearnerFlowDTO.totalQuestionCount == '1'}"> 		
 	  	   		  <tr>
-				  	<td NOWRAP colspan=2 valign=top> 
+				  	<td colspan=2 valign=top> 
 				  			<html:submit property="continueOptionsCombined" styleClass="button">
 								<fmt:message key="button.continue"/>
 							</html:submit>	 				 		  					
@@ -125,7 +127,7 @@
 				
 		 		<c:if test="${mcGeneralLearnerFlowDTO.totalCountReached == 'true'}"> 		
 	  	   		  <tr>
-				  	<td NOWRAP colspan=2 valign=top> 
+				  	<td colspan=2 valign=top> 
 				  			<html:submit property="continueOptionsCombined" styleClass="button">
 								<fmt:message key="button.continue"/>
 							</html:submit>	 				 		  					
Index: lams_tool_lamc/web/learning/ViewAnswers.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/ViewAnswers.jsp,v
diff -u -r1.36 -r1.37
--- lams_tool_lamc/web/learning/ViewAnswers.jsp	27 Oct 2006 08:28:18 -0000	1.36
+++ lams_tool_lamc/web/learning/ViewAnswers.jsp	27 Oct 2006 15:42:16 -0000	1.37
@@ -82,10 +82,11 @@
 				<c:set var="mainQueIndex" scope="request" value="${mainQueIndex +1}" />
 
 				<div class="shading-bg">
-					<p>
+					<div style="overflow: auto;">									  	
 						<c:out value="${questionEntry.value}" escapeXml="false" />
-					</p>
+					</div>																			  								
 
+
 					<!--  CANDIDATE ANSWERS  -->
 					<c:set var="queIndex" scope="request" value="0" />
 					<c:forEach var="mainEntry"
@@ -155,10 +156,9 @@
 					<c:forEach var="feedbackEntry"
 						items="${mcGeneralLearnerFlowDTO.mapFeedbackContent}">
 						<c:if test="${requestScope.mainQueIndex == feedbackEntry.key}">
-							<p>
-								<em> <c:out value="${feedbackEntry.value}" escapeXml="false" />
-								</em>
-							</p>
+							<div style="overflow: auto;">									  							
+								<strong> <fmt:message key="label.feedback.simple" /> </strong> <c:out value="${feedbackEntry.value}" escapeXml="false" />
+							</div>								
 						</c:if>
 					</c:forEach>
 				</div>
Index: lams_tool_lamc/web/monitoring/itemlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/Attic/itemlist.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_lamc/web/monitoring/itemlist.jsp	17 Oct 2006 20:35:24 -0000	1.2
+++ lams_tool_lamc/web/monitoring/itemlist.jsp	27 Oct 2006 15:43:51 -0000	1.3
@@ -36,12 +36,14 @@
 	<c:set var="displayOrder" scope="request" value="${currentDTO.displayOrder}"/>	
 
 	<tr>
-		<td width="10%" align="right" class="field-name">
-			<fmt:message key="label.question" />:
+		<td width="10%" align="right">
+				<fmt:message key="label.question" />:
 		</td>
 
 		<td width="60%" align="left">
-			<c:out value="${question}" escapeXml="false"/> 
+			<div style="overflow: auto;">						
+				<c:out value="${question}" escapeXml="false"/> 
+			</div>														
 		</td>