Index: lams_tool_lamc/db/model/lams_tool_mc.clay
===================================================================
diff -u -r306bd64453644ecb765fde5814bbcc308aa911a1 -r2dbeea64b0b9925ebfcc5b10ced841ad134a0f38
--- lams_tool_lamc/db/model/lams_tool_mc.clay	(.../lams_tool_mc.clay)	(revision 306bd64453644ecb765fde5814bbcc308aa911a1)
+++ lams_tool_lamc/db/model/lams_tool_mc.clay	(.../lams_tool_mc.clay)	(revision 2dbeea64b0b9925ebfcc5b10ced841ad134a0f38)
@@ -245,7 +245,7 @@
 </table>
 <table name="tl_lamc11_que_content" alias="" remarks="">
 <table-description/>
-<table-figure-bounds x="559" y="508" width="176" height="104"/>
+<table-figure-bounds x="559" y="508" width="177" height="137"/>
 <column-list>
 <column name="uid" alias="" remarks="" mandatory="true" column-size="20" decimal-digits="0" default-value="" auto-increment="true">
 <column-description/>
@@ -270,8 +270,8 @@
 <column name="weight" alias="" remarks="" mandatory="true" column-size="5" decimal-digits="0" default-value="0" auto-increment="false">
 <column-description/>
 <data-type name="INT" jdbc-type="4" selected-variant-pattern="INT(%n)">
-<variant type-name-pattern="INT"/>
 <variant type-name-pattern="INT(%n)" precision-variable="%n" precision-min="0" precision-max="10"/>
+<variant type-name-pattern="INT"/>
 <variant type-name-pattern="INT(%n) UNSIGNED" precision-variable="%n" precision-min="0" precision-max="10"/>
 <variant type-name-pattern="INT(%n) UNSIGNED ZEROFILL" precision-variable="%n" precision-min="0" precision-max="10"/>
 <variant type-name-pattern="INT(%n) ZEROFILL" precision-variable="%n" precision-min="0" precision-max="10"/>
@@ -293,6 +293,20 @@
 <variant type-name-pattern="TINYINT ZEROFILL"/>
 </data-type>
 </column>
+<column name="feedbackCorrect" alias="" remarks="" mandatory="false" column-size="255" decimal-digits="0" default-value="" auto-increment="false">
+<column-description/>
+<data-type name="VARCHAR" jdbc-type="12" selected-variant-pattern="VARCHAR(%n)" literal-prefix="'" literal-suffix="'">
+<variant type-name-pattern="VARCHAR(%n)" precision-variable="%n" precision-min="1" precision-max="255"/>
+<variant type-name-pattern="VARCHAR(%n) BINARY" precision-variable="%n" precision-min="1" precision-max="255"/>
+</data-type>
+</column>
+<column name="feedbackIncorrect" alias="" remarks="" mandatory="false" column-size="255" decimal-digits="0" default-value="" auto-increment="false">
+<column-description/>
+<data-type name="VARCHAR" jdbc-type="12" selected-variant-pattern="VARCHAR(%n)" literal-prefix="'" literal-suffix="'">
+<variant type-name-pattern="VARCHAR(%n)" precision-variable="%n" precision-min="1" precision-max="255"/>
+<variant type-name-pattern="VARCHAR(%n) BINARY" precision-variable="%n" precision-min="1" precision-max="255"/>
+</data-type>
+</column>
 <column name="display_order" alias="" remarks="" mandatory="false" column-size="5" decimal-digits="0" default-value="" auto-increment="false">
 <column-description/>
 <data-type name="INT" jdbc-type="4" selected-variant-pattern="INT(%n)">
Index: lams_tool_lamc/db/sql/create_lams_tool_lamc.sql
===================================================================
diff -u -r306bd64453644ecb765fde5814bbcc308aa911a1 -r2dbeea64b0b9925ebfcc5b10ced841ad134a0f38
--- lams_tool_lamc/db/sql/create_lams_tool_lamc.sql	(.../create_lams_tool_lamc.sql)	(revision 306bd64453644ecb765fde5814bbcc308aa911a1)
+++ lams_tool_lamc/db/sql/create_lams_tool_lamc.sql	(.../create_lams_tool_lamc.sql)	(revision 2dbeea64b0b9925ebfcc5b10ced841ad134a0f38)
@@ -29,6 +29,8 @@
      , question VARCHAR(255)
      , weight INT(5) NOT NULL DEFAULT 0
      , disabled TINYINT(1) NOT NULL DEFAULT 1
+     , feedbackCorrect VARCHAR(255)
+     , feedbackIncorrect VARCHAR(255)
      , display_order INT(5)
      , mc_content_id BIGINT(20) NOT NULL
      , PRIMARY KEY (uid)
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
===================================================================
diff -u -re8526e7f760e36faf92d8c56da58cf04d7e2b3db -r2dbeea64b0b9925ebfcc5b10ced841ad134a0f38
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	(.../McAppConstants.java)	(revision e8526e7f760e36faf92d8c56da58cf04d7e2b3db)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	(.../McAppConstants.java)	(revision 2dbeea64b0b9925ebfcc5b10ced841ad134a0f38)
@@ -163,6 +163,8 @@
     
     
     
+    public static final String RICHTEXT_FEEDBACK_CORRECT				="richTextFeedbackCorrect";
+    public static final String RICHTEXT_FEEDBACK_INCORRECT				="richTextFeedbackInCorrect";
     public static final String RICHTEXT_OFFLINEINSTRUCTIONS				="richTextOfflineInstructions";
     public static final String RICHTEXT_ONLINEINSTRUCTIONS				="richTextOnlineInstructions";
     public static final String RICHTEXT_TITLE							="richTextTitle";
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.java
===================================================================
diff -u -r306bd64453644ecb765fde5814bbcc308aa911a1 -r2dbeea64b0b9925ebfcc5b10ced841ad134a0f38
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.java	(.../McQueContent.java)	(revision 306bd64453644ecb765fde5814bbcc308aa911a1)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.java	(.../McQueContent.java)	(revision 2dbeea64b0b9925ebfcc5b10ced841ad134a0f38)
@@ -51,6 +51,11 @@
     /** persistent field */
     private boolean disabled;
     
+    private String feedbackCorrect;
+    
+    private String feedbackIncorrect;
+    
+    
     /** non persistent field */
     private Long mcContentId;
     
@@ -92,6 +97,19 @@
     }
     
     
+    public McQueContent(String question, Integer displayOrder, Integer weight, String feedbackCorrect, String feedbackIncorrect, boolean disabled, McContent mcContent, Set mcUsrAttempts, Set mcOptionsContents) {
+        this.question = question;
+        this.displayOrder = displayOrder;
+        this.weight = weight;
+        this.disabled = disabled;
+        this.feedbackCorrect=feedbackCorrect;
+        this.feedbackIncorrect=feedbackIncorrect;
+        this.mcContent=mcContent;
+        this.mcUsrAttempts = mcUsrAttempts;
+        this.mcOptionsContents = mcOptionsContents;
+    }
+    
+    
     public McQueContent(Long mcQueContentId, String question, Integer displayOrder,  Set mcUsrAttempts, Set mcOptionsContents) {
         this.mcQueContentId = mcQueContentId;
         this.question = question;
@@ -258,4 +276,28 @@
 	public void setWeight(Integer weight) {
 		this.weight = weight;
 	}
+	/**
+	 * @return Returns the feedbackCorrect.
+	 */
+	public String getFeedbackCorrect() {
+		return feedbackCorrect;
+	}
+	/**
+	 * @param feedbackCorrect The feedbackCorrect to set.
+	 */
+	public void setFeedbackCorrect(String feedbackCorrect) {
+		this.feedbackCorrect = feedbackCorrect;
+	}
+	/**
+	 * @return Returns the feedbackIncorrect.
+	 */
+	public String getFeedbackIncorrect() {
+		return feedbackIncorrect;
+	}
+	/**
+	 * @param feedbackIncorrect The feedbackIncorrect to set.
+	 */
+	public void setFeedbackIncorrect(String feedbackIncorrect) {
+		this.feedbackIncorrect = feedbackIncorrect;
+	}
 }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties
===================================================================
diff -u -re8526e7f760e36faf92d8c56da58cf04d7e2b3db -r2dbeea64b0b9925ebfcc5b10ced841ad134a0f38
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties	(.../McResources.properties)	(revision e8526e7f760e36faf92d8c56da58cf04d7e2b3db)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties	(.../McResources.properties)	(revision 2dbeea64b0b9925ebfcc5b10ced841ad134a0f38)
@@ -62,11 +62,14 @@
 option.off								=OFF
 option.correct							=Correct
 option.incorrect						=Incorrect
+label.feedback.incorrect				=Feedback if answered incorrectly:
+label.feedback.correct					=Feedback  if answered  correctly:
 
 
 feedback								=Please address the following issues before submit. <br>
 error.weights.empty						=Please correct this: The question weights can not be empty.
 error.checkBoxes.empty					=Please correct this: No candidate answer has been selected.
+error.weights.zero						=Please correct this: The question weights can not be 0.
 error.weights.notInteger				=Please correct this: The question weights must be an integer.
 error.emptyQuestion						=Please enter the question text. The chosen question can not be empty. 
 error.title								=Please correct this:  The field "Title" is mandatory. <br>
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java
===================================================================
diff -u -r735c5db341aaba22874662bf7e44ec91a24424c7 -r2dbeea64b0b9925ebfcc5b10ced841ad134a0f38
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java	(.../McUtils.java)	(revision 735c5db341aaba22874662bf7e44ec91a24424c7)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java	(.../McUtils.java)	(revision 2dbeea64b0b9925ebfcc5b10ced841ad134a0f38)
@@ -236,6 +236,13 @@
 		String richTextInstructions=request.getParameter(RICHTEXT_INSTRUCTIONS);
 		logger.debug("read parameter richTextInstructions: " + richTextInstructions);
 		
+		String richTextFeedbackCorrect=request.getParameter(RICHTEXT_FEEDBACK_CORRECT);
+		logger.debug("read parameter richTextFeedbackCorrect: " + richTextFeedbackCorrect);
+		
+		String richTextFeedbackInCorrect=request.getParameter(RICHTEXT_FEEDBACK_INCORRECT);
+		logger.debug("read parameter richTextFeedbackInCorrect: " + richTextFeedbackInCorrect);
+		
+		
 		if ((richTextTitle != null) && (richTextTitle.length() > 0))
 		{
 			request.getSession().setAttribute(RICHTEXT_TITLE,richTextTitle);
@@ -245,6 +252,18 @@
 		{
 			request.getSession().setAttribute(RICHTEXT_INSTRUCTIONS,richTextInstructions);
 		}
+		
+		if ((richTextFeedbackCorrect != null) && (richTextFeedbackCorrect.length() > 0))
+		{
+			request.getSession().setAttribute(RICHTEXT_FEEDBACK_CORRECT,richTextFeedbackCorrect);
+		}
+		
+		if ((richTextFeedbackInCorrect != null) && (richTextFeedbackInCorrect.length() > 0))
+		{
+			request.getSession().setAttribute(RICHTEXT_FEEDBACK_INCORRECT,richTextFeedbackInCorrect);
+		}
+
+		
 	}
 	
 	public static void addFileToContentRepository(HttpServletRequest request, McAuthoringForm mcAuthoringForm, boolean isOfflineFile)
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
diff -u -re8526e7f760e36faf92d8c56da58cf04d7e2b3db -r2dbeea64b0b9925ebfcc5b10ced841ad134a0f38
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision e8526e7f760e36faf92d8c56da58cf04d7e2b3db)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision 2dbeea64b0b9925ebfcc5b10ced841ad134a0f38)
@@ -26,7 +26,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
@@ -44,7 +43,6 @@
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.actions.DispatchAction;
 import org.lamsfoundation.lams.tool.mc.McAppConstants;
-import org.lamsfoundation.lams.tool.mc.McApplicationException;
 import org.lamsfoundation.lams.tool.mc.McComparator;
 import org.lamsfoundation.lams.tool.mc.McContent;
 import org.lamsfoundation.lams.tool.mc.McOptsContent;
@@ -526,7 +524,7 @@
 	 		request.setAttribute(USER_ACTION, userAction);
 	 		logger.debug("userAction:" + userAction);
 	 		
-	 		String optionIndex =mcAuthoringForm.getOptionIndex();
+	 		String optionIndex =mcAuthoringForm.getDeletableOptionIndex();
 			logger.debug("optionIndex:" + optionIndex);
 			
 			Map mapOptionsContent=repopulateMap(request, "optionContent");
@@ -593,6 +591,19 @@
 			logger.debug("mcQueContent:" + mcQueContent);
 			
 			mcQueContent.setQuestion(selectedQuestion);
+			logger.debug("updated question set");
+			
+			String richTextFeedbackCorrect=(String) request.getSession().getAttribute(RICHTEXT_FEEDBACK_CORRECT);
+        	logger.debug("richTextFeedbackCorrect: " + richTextFeedbackCorrect);
+        	if (richTextFeedbackCorrect == null) richTextFeedbackCorrect=""; 
+			mcQueContent.setFeedbackCorrect(richTextFeedbackCorrect);
+        	
+        	String richTextFeedbackInCorrect=(String) request.getSession().getAttribute(RICHTEXT_FEEDBACK_INCORRECT);
+        	logger.debug("richTextFeedbackInCorrect: " + richTextFeedbackInCorrect);
+        	if (richTextFeedbackInCorrect == null) richTextFeedbackInCorrect="";
+        	mcQueContent.setFeedbackIncorrect(richTextFeedbackInCorrect);
+			
+			
 			mcService.saveOrUpdateMcQueContent(mcQueContent);
 			logger.debug("persisted  selectedQuestion" + selectedQuestion);
 			
@@ -603,7 +614,8 @@
 			mcService.removeMcOptionsContentByQueId(selectedQuestionContentUid);
 			logger.debug("removed all mcOptionsContents for mcQueContentId :" + selectedQuestionContentUid);
 			
-	 		
+			
+        	
 	 		String isCheckBoxSelected=null;
 	 		boolean isCorrect=false;
 	    	for (int i=1; i <= MAX_OPTION_COUNT ; i++)
@@ -634,10 +646,13 @@
     		 		request.getSession().setAttribute(MAP_OPTIONS_CONTENT, mapOptionsContent);
     	    		logger.debug("Options Map: " + request.getSession().getAttribute(MAP_OPTIONS_CONTENT));
     	    		
-    		       	McOptsContent mcOptionsContent= new McOptsContent(isCorrect,selectedAnswer , mcQueContent, new HashSet());
- 	    	        logger.debug("created mcOptionsContent: " + mcOptionsContent);
- 	       	        mcService.saveMcOptionsContent(mcOptionsContent);
- 	       	        logger.debug("final persistance of option");
+    	    		if ((selectedAnswer != null) && (selectedAnswer.length() > 0))
+    	    		{
+    	    			McOptsContent mcOptionsContent= new McOptsContent(isCorrect,selectedAnswer , mcQueContent, new HashSet());
+     	    	        logger.debug("created mcOptionsContent: " + mcOptionsContent);
+     	       	        mcService.saveMcOptionsContent(mcOptionsContent);
+     	       	        logger.debug("final persistance of option");	
+    	    		}
     			}
 			}
 			
@@ -755,8 +770,9 @@
         		endLearningMessage=(String)request.getSession().getAttribute(END_LEARNING_MESSAGE);
 
         	
-	 		String richTextTitle=(String) request.getSession().getAttribute(RICHTEXT_TITLE);
+        	String richTextTitle=(String) request.getSession().getAttribute(RICHTEXT_TITLE);
         	logger.debug("richTextTitle: " + richTextTitle);
+        	
         	String richTextInstructions=(String) request.getSession().getAttribute(RICHTEXT_INSTRUCTIONS);
         	logger.debug("richTextInstructions: " + richTextInstructions);
         	
@@ -1332,6 +1348,22 @@
 				persistError(request,"error.weights.notInteger");
 				return false;
 			}
+        	
+        	
+        	int weight= new Integer(pairs.getValue().toString()).intValue();
+        	if (weight == 0) 
+            {
+            	ActionMessages errors= new ActionMessages();
+        		errors= new ActionMessages();
+				errors.add(Globals.ERROR_KEY,new ActionMessage("error.weights.zero"));
+				saveErrors(request,errors);
+    			mcAuthoringForm.resetUserAction();
+				persistError(request,"error.weights.zero");
+				return false;
+            	
+            }
+        	
+        	
         }
 		mcAuthoringForm.resetUserAction();
 		return true;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java
===================================================================
diff -u -r306bd64453644ecb765fde5814bbcc308aa911a1 -r2dbeea64b0b9925ebfcc5b10ced841ad134a0f38
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java	(.../McAuthoringForm.java)	(revision 306bd64453644ecb765fde5814bbcc308aa911a1)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java	(.../McAuthoringForm.java)	(revision 2dbeea64b0b9925ebfcc5b10ced841ad134a0f38)
@@ -36,6 +36,7 @@
 	protected String questionIndex;
 	protected String optionIndex;
 	protected String selectedIndex;
+	protected String deletableOptionIndex;
 	
 	protected String editDefaultQuestion;
 	protected String removeOptionContent;
@@ -157,6 +158,7 @@
 		this.questionIndex=null;
 		this.optionIndex=null;
 		this.selectedIndex=null;
+		this.deletableOptionIndex=null;
 		this.isRemoveContent=null;
 		this.toolContentId=null;
 
@@ -799,4 +801,16 @@
 	public void setInstructionsTabDone(String instructionsTabDone) {
 		this.instructionsTabDone = instructionsTabDone;
 	}
+	/**
+	 * @return Returns the deletableOptionIndex.
+	 */
+	public String getDeletableOptionIndex() {
+		return deletableOptionIndex;
+	}
+	/**
+	 * @param deletableOptionIndex The deletableOptionIndex to set.
+	 */
+	public void setDeletableOptionIndex(String deletableOptionIndex) {
+		this.deletableOptionIndex = deletableOptionIndex;
+	}
 }
Index: lams_tool_lamc/web/AdvancedContent.jsp
===================================================================
diff -u -r653f0f0eff40af5e6891c22ef2b8efe9bf2f75af -r2dbeea64b0b9925ebfcc5b10ced841ad134a0f38
--- lams_tool_lamc/web/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 653f0f0eff40af5e6891c22ef2b8efe9bf2f75af)
+++ lams_tool_lamc/web/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 2dbeea64b0b9925ebfcc5b10ced841ad134a0f38)
@@ -3,13 +3,12 @@
 <%@ taglib uri="/WEB-INF/struts-logic-el.tld" prefix="logic-el" %>
 <%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
 <%@ taglib uri="/WEB-INF/fmt.tld" prefix="fmt" %>
+<%@ taglib uri="fck-editor" prefix="FCK" %>
 
-<div id="advancedTabContainer">
-		<tr> <td>
-			<table>
+			<table class="forms">
 				<tr>
-	      			<td>
-		      			<fmt:message key="radiobox.synchInMonitor"/>:
+	      			<td class="formlabel">
+		      			<bean:message key="radiobox.synchInMonitor"/>:
 					</td>
 					<td>
 						<html:radio property="synchInMonitor" value="ON">
@@ -23,8 +22,8 @@
 		         </tr>
 		         
 				<tr>
-	      			<td>
-		      			<fmt:message key="radiobox.usernameVisible"/>:
+					<td class="formlabel">
+		      			<bean:message key="radiobox.usernameVisible"/>:
 					</td>
 					<td>
 						<html:radio property="usernameVisible" value="ON">
@@ -38,8 +37,8 @@
 		         </tr>
 		         
    				<tr>
-	      			<td>
-		      			<fmt:message key="radiobox.questionsSequenced"/>:
+					<td class="formlabel">
+		      			<bean:message key="radiobox.questionsSequenced"/>:		      			
 					</td>
 					<td>
 						<html:radio property="questionsSequenced" value="ON">
@@ -52,45 +51,77 @@
 	      			</td>
 		        </tr>
 		         
+		         <tr>
+					<td class="formlabel">
+		      			<bean:message key="radiobox.retries"/>:		      			
+					</td>
+					<td>
+						<html:radio property="retries" value="ON">
+						 <bean:message key="option.on"/>
+						</html:radio>
+
+						<html:radio property="retries" value="OFF">
+						 <bean:message key="option.off"/>
+						</html:radio>
+	      			</td>
+
+				</tr>	      			
+		        
+   				<tr>
+					<td class="formlabel">
+		      			<bean:message key="radiobox.showFeedback"/>:		      			
+					</td>
+					<td>
+						<html:radio property="showFeedback" value="ON">
+						 <bean:message key="option.on"/>
+						</html:radio>
+
+						<html:radio property="showFeedback" value="OFF">
+						 <bean:message key="option.off"/>
+						</html:radio>
+	      			</td>
+		        </tr>
+		         
 		         <tr> 
-			 		<td> <fmt:message key="label.report.title"/>: </td>
+					<td class="formlabel">
+			 			<bean:message key="label.report.title"/>: </td>
 			 		<td> 
 			 			<html:text property="reportTitle" size="60" maxlength="100"/>
 			 		</td>
 			  	</tr>
 			  	
 			  	<tr> 
-			 		<td> <fmt:message key="label.monitoringReport.title"/>: </td>
+					<td class="formlabel">
+			 			<bean:message key="label.monitoringReport.title"/>: 
+			 		</td>
 			 		<td> 
 			 			<html:text property="monitoringReportTitle" size="60" maxlength="100"/>
 			 		</td>
 			  	</tr>
 			  	
 			  	<tr> 
-			 		<td> <fmt:message key="label.report.endLearningMessage"/>: </td>
+					<td class="formlabel">
+			 			<bean:message key="label.report.endLearningMessage"/>: 
+			 		</td>
 			 		<td> 
 			 			<html:text property="endLearningMessage" size="60" maxlength="100"/>
 			 		</td>
 			  	</tr>
-			</table>	  	
-
-			<hr>
-			<table>
+			  	
+		  		<tr>
+ 				 	<td colspan=2 align=center>								
+						&nbsp&nbsp
+				  	</td>
+				</tr>
 				<tr>
 					 <td class="body" colspan=2> 
-						 <html:submit property="submitTabDone" styleClass="linkbutton" onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
+						 <html:submit property="advancedTabDone" styleClass="linkbutton" onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
 							<bean:message key="button.done"/>
 						</html:submit>
 					</td> 
-				</tr>
-  			</table>
+ 				 </tr>
+			</table>	  	
 		
-		</td></tr>
-</div>
-
-
 		
-		
-		
 
 		
\ No newline at end of file
Index: lams_tool_lamc/web/BasicContent.jsp
===================================================================
diff -u -r653f0f0eff40af5e6891c22ef2b8efe9bf2f75af -r2dbeea64b0b9925ebfcc5b10ced841ad134a0f38
--- lams_tool_lamc/web/BasicContent.jsp	(.../BasicContent.jsp)	(revision 653f0f0eff40af5e6891c22ef2b8efe9bf2f75af)
+++ lams_tool_lamc/web/BasicContent.jsp	(.../BasicContent.jsp)	(revision 2dbeea64b0b9925ebfcc5b10ced841ad134a0f38)
@@ -5,165 +5,157 @@
 <%@ taglib uri="/WEB-INF/fmt.tld" prefix="fmt" %>
 <%@ taglib uri="fck-editor" prefix="FCK" %>
 
-<div id="basicTabContainer">	
-		<c:if test="${(requestScope.startMonitoringSummaryRequest != 'true')  || (sessionScope.editActivityEditMode=='true') }"> 			
-			<c:if test="${requestScope.stopRenderingQuestions != 'true'}"> 			
-			<tr> <td>
-					<table align=center> 
-						<tr> 
-					 		<td> <bean:message key="label.authoring.title"/>: </td>
-					 		<td NOWRAP width=700> <!-- Dave,I found width was necessary to present all the elements of the editor, feel free to change -->
-							<FCK:editor id="richTextTitle" basePath="/lams/fckeditor/"
-							      height="200"
-								  width="100%">
-								  <c:out value="${sessionScope.richTextTitle}" escapeXml="false" />						  
-							</FCK:editor>
+					<table class="forms" align=left>
+ 						<tr> 
+					 		<td class="formlabel"> <bean:message key="label.authoring.title"/>: </td>
+							<td class="formcontrol">
+								<FCK:editor id="richTextTitle" basePath="/lams/fckeditor/">
+									  <c:out value="${sessionScope.richTextTitle}" escapeXml="false" />						  
+								</FCK:editor>
 							</td> 
 					  	</tr>
+					  	
 					  	<tr> 
-					 		<td> <bean:message key="label.authoring.instructions"/>: </td>
-					 		<td NOWRAP width=700> <!-- Dave,I found width was necessary to present all the elements of the editor, feel free to change -->
-							<FCK:editor id="richTextInstructions" basePath="/lams/fckeditor/"
-							      height="200"
-								  width="100%">
-								  <c:out value="${sessionScope.richTextInstructions}" escapeXml="false" />						  
-							</FCK:editor>
+					 		<td class="formlabel"> <bean:message key="label.authoring.instructions"/>: </td>
+							<td class="formcontrol">
+								<FCK:editor id="richTextInstructions" basePath="/lams/fckeditor/">
+									  <c:out value="${sessionScope.richTextInstructions}" escapeXml="false" />						  
+								</FCK:editor>
 							</td>
 						</tr>
 				
-			 		<!--default question content, this entry can not be deleted but can be updated -->
-				 		<tr> 
-						  	<td> 
-						 		<bean:message key="label.question1"/> : 
-						 	</td>
-						  	<td>
-								  	<input type="text" name="questionContent0" size="50" 
-								  	maxlength="255" value="<c:out value="${sessionScope.defaultQuestionContent}"/>"> 
-								  	&nbsp
-									<html:submit property="addContent" styleClass="linkbutton" disabled="${sessionScope.isDefineLater}"
-									onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
-									<bean:message key="button.addNewQuestion"/>
-									</html:submit>
-						  	</td>
-					  	</tr>
-		
-				  	<!--end of default question content -->
-				  	
-			  		<!-- if there is more than just the default content start presenting them -->
-			  	 		<c:set var="queIndex" scope="session" value="1"/>
-						<c:forEach var="questionEntry" items="${sessionScope.mapQuestionContent}">
-					  		<c:if test="${questionEntry.key > 1}"> 			
-								<c:set var="queIndex" scope="session" value="${queIndex +1}"/>
-								  <tr>
-								  	<td> <c:out value="Question ${queIndex}"/> : </td>
-								  		<td> <input type="text" name="questionContent<c:out value="${queIndex-1}"/>" value="<c:out value="${questionEntry.value}"/>"   
-									  		size="50" maxlength="255"> 
-									  	&nbsp
-		 								<html:submit property="removeContent" styleClass="linkbutton"  onclick="removeQuestion(${formIndex}, ${queIndex});"
-		 								disabled="${sessionScope.isDefineLater}" onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
-											<bean:message key="button.removeQuestion"/>
-										</html:submit>
-									  	</td>
-								  </tr>
-							</c:if> 			
-						</c:forEach>
-						<html:hidden property="toolContentId" value="${sessionScope.toolContentId}"/>
-						<html:hidden property="questionIndex"/>
-						<html:hidden property="isRemoveContent"/>
+					<tr>
+					 	<td colspan=2 align=center>								
+							&nbsp&nbsp
+					  	</td>
 					</tr>
-					</table>
-		
-					<hr>
-					<table>
-							<tr>
-									 <td> 
-										 <html:submit property="submitAllContent" styleClass="linkbutton" onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
-											<bean:message key="button.submitAllContent"/>
-										</html:submit>
-									</td> 
-							</tr>
-					</table>
-			</td></tr>			
-			</c:if>	
-		</c:if>	
-	
-		
-		<c:if test="${sessionScope.editActivityEditMode=='false'}"> 
-			<c:if test="${requestScope.startMonitoringSummaryRequest == 'true'}"> 
-			<c:if test="${requestScope.stopRenderingQuestions != 'true'}"> 			
-			<tr> <td>
-					<table align=center>
-						<tr> 
-					 		<td> <bean:message key="label.authoring.title"/>: </td>
-					 		<td NOWRAP width=700> <!-- Dave,I found width was necessary to present all the elements of the editor, feel free to change -->
-						 		<c:out value="${sessionScope.richTextTitle}" escapeXml="false" />
-							</td> 
-					  	</tr>
-
-					  	<tr> 
-					 		<td> <bean:message key="label.authoring.instructions"/>: </td> 
-					 		<td NOWRAP width=700> <!-- Dave,I found width was necessary to present all the elements of the editor, feel free to change -->
-							  <c:out value="${sessionScope.richTextInstructions}" escapeXml="false" />						  
-							</td>
-						</tr>
 				
-			 		<!--default question content, this entry can not be deleted but can be updated -->
-		
-				 		<tr> 
-						  	<td> 
-						  		<c:out value="Question 1"/> : </td>
-						  		<td>
-									<c:out value="${sessionScope.defaultQuestionContent}"/>
-						  		</td>
-					  	</tr>
-		
-				  	<!--end of default question content -->
-				  	
-			  		<!-- if there is more than just the default content start presenting them -->
+					<tr> <td colspan=2 align=center>
+					
+					<table align=center>
+					<tr>
+						<td class="formlabel">
+						</td>
+						<td class="input" align="center">
+							<h5> <b> <bean:message key="label.Questions"/> </b> </h5>
+						</td>
+						<td class="input" align="center">
+							<h5> <b> <bean:message key="label.weight"/> </b> </h5>
+						</td>
+						<td class="input" colspan=2 align="center">
+							<h5> <b> <bean:message key="label.actions"/> </b> </h5>
+						</td>
+					</tr>
 			  	 		<c:set var="queIndex" scope="session" value="1"/>
-						<c:forEach var="questionEntry" items="${sessionScope.mapQuestionContent}">
-					  		<c:if test="${questionEntry.key > 1}"> 			
-								<c:set var="queIndex" scope="session" value="${queIndex +1}"/>
-								  <tr>
-								  	<td> <c:out value="Question ${queIndex}"/> : </td>
-								  		<td> <c:out value="${questionEntry.value}"/>
-									  	&nbsp
-									  	</td>
-								  </tr>
-							</c:if> 			
+						<c:forEach var="questionEntry" items="${sessionScope.mapQuestionsContent}">
+									<c:if test="${questionEntry.key == 1}"> 			
+									    <tr>
+										  	<td class="formlabel"> <c:out value="Question ${queIndex}"/> : </td>
+										  	
+									  		<td class="input"> 
+									  			<input type="text" name="questionContent<c:out value="${queIndex}"/>" value="<c:out value="${questionEntry.value}"/>"
+										  		size="50" maxlength="255" >
+										  	</td>
+
+                                            <td class="input" align=center>										  	
+												<c:forEach var="weightsEntry" items="${sessionScope.mapWeights}">                                            
+														<c:if test="${questionEntry.key == weightsEntry.key}"> 			
+													  			<input type="text" name="questionWeight<c:out value="${queIndex}"/>" value="<c:out value="${weightsEntry.value}"/>"
+														  		size="3" maxlength="3">
+														</c:if>
+												</c:forEach>
+                                            </td>
+
+                                                   
+                                            <td class="input">										  	
+			  										<html:submit property="addQuestion" styleClass="linkbutton" 
+													onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
+														<bean:message key="button.addNewQuestion"/>
+													</html:submit>
+											</td>	
+											&nbsp&nbsp&nbsp
+                                            <td class="input">										  	
+					 								<html:submit property="editOptions" styleClass="linkbutton"  onclick="javascript:document.forms[0].questionIndex.value=${queIndex};"
+					 								onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
+														<bean:message key="label.edit"/>
+													</html:submit>
+											</td>
+										  </tr>
+									</c:if> 			
+									
+							  		<c:if test="${questionEntry.key > 1}"> 			
+										<c:set var="queIndex" scope="session" value="${queIndex +1}"/>
+										  <tr>
+										  	<td class="formlabel"> <c:out value="Question ${queIndex}"/> : </td>
+										  	
+										  		<td class="input"> 
+										  			<input type="text" name="questionContent<c:out value="${queIndex}"/>" value="<c:out value="${questionEntry.value}"/>"  size="50" maxlength="255" > 
+												</td>											
+
+	                                            <td class="input" align=center>										  	
+													<c:forEach var="weightsEntry" items="${sessionScope.mapWeights}">                                            
+															<c:if test="${questionEntry.key == weightsEntry.key}"> 			
+														  			<input type="text" name="questionWeight<c:out value="${queIndex}"/>" value="<c:out value="${weightsEntry.value}"/>"
+															  		size="3" maxlength="3">
+															</c:if>
+													</c:forEach>
+	                                            </td>
+											
+                                               <td class="input">										  	
+				 								<html:submit property="removeQuestion" styleClass="linkbutton"  onclick="javascript:document.forms[0].questionIndex.value=${queIndex};"
+					 								onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
+														<bean:message key="button.removeQuestion"/>
+													</html:submit>
+												</td>
+												&nbsp&nbsp&nbsp
+	                                            <td class="input">										  	
+					 								<html:submit property="editOptions" styleClass="linkbutton"  onclick="javascript:document.forms[0].questionIndex.value=${queIndex};"
+					 								onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
+														<bean:message key="label.edit"/>
+													</html:submit>
+											  	</td>
+										  </tr>
+									</c:if> 
 						</c:forEach>
-						<html:hidden property="toolContentId" value="${sessionScope.toolContentId}"/>
-						<html:hidden property="questionIndex"/>
-						<html:hidden property="isRemoveContent"/>
-					</table>
-		
-					<hr>
-					<table>
-							<tr>
-									 <td> 
-										 <html:submit property="edit" styleClass="linkbutton" onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
-											<bean:message key="label.edit"/>
-										</html:submit>
-									</td> 
-							</tr>
-					</table>
-			</td></tr>			
-			</c:if>	
-			</c:if>	
-		</c:if>	
-</div>	
+							<html:hidden property="questionIndex"/>
 
-<SCRIPT language="JavaScript"> 
+					<tr>
+	 				 	<td colspan=5 align=center>
+							&nbsp&nbsp
+					  	</td>
+					</tr>		
+					
+					<tr>
+					  	<td class="formlabel"><bean:message key="radiobox.passmark"/>: </td>
+						<td class="input"> 
+							  <html:text property="passmark"  size="3" maxlength="3"/>							
+						</td>
+						<td> &nbsp</td> <td>&nbsp </td>
+					</tr>
+					
+					<tr>
+	 				 	<td colspan=5 align=center>
+							&nbsp&nbsp
+					  	</td>
+					</tr>
+						
+					<tr>
+	 				 	<td colspan=5 align=center>								
+							&nbsp&nbsp
+					  	</td>
+					</tr>
 
-<!--  addQuestion gets called everytime a new question content is added to the UI -->
-	
-	function removeQuestion(formIndex, questionIndex)
-	{
-		document.forms[formIndex].questionIndex.value=questionIndex;
-		document.forms[formIndex].isRemoveQuestion.value='1';
-		document.forms[formIndex].submit();
-	}
-	
- </SCRIPT>
+	 				 <tr>
+	 				 	<td colspan=5 align=left>								
+							<html:submit property="submitQuestions" styleClass="linkbutton" 
+							onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
+								<bean:message key="button.submit"/>
+							</html:submit>	 				 		  										  		
+		 			  	</td>
+	 				 </tr>
+							
+					</table>		
+					</td> </tr>
+							
 
-		
\ No newline at end of file
+	 				</table> 	 
Index: lams_tool_lamc/web/authoringMaincontent.jsp
===================================================================
diff -u -re8526e7f760e36faf92d8c56da58cf04d7e2b3db -r2dbeea64b0b9925ebfcc5b10ced841ad134a0f38
--- lams_tool_lamc/web/authoringMaincontent.jsp	(.../authoringMaincontent.jsp)	(revision e8526e7f760e36faf92d8c56da58cf04d7e2b3db)
+++ lams_tool_lamc/web/authoringMaincontent.jsp	(.../authoringMaincontent.jsp)	(revision 2dbeea64b0b9925ebfcc5b10ced841ad134a0f38)
@@ -265,123 +265,7 @@
 <div id='content_a'  class="tabbody content_a">
 <h2>Advanced Definitions </h2>
 <div id="formtablecontainer">
-			<table class="forms">
-				<tr>
-	      			<td class="formlabel">
-		      			<bean:message key="radiobox.synchInMonitor"/>:
-					</td>
-					<td>
-						<html:radio property="synchInMonitor" value="ON">
-						 <bean:message key="option.on"/>
-						</html:radio>
-
-						<html:radio property="synchInMonitor" value="OFF">
-						 <bean:message key="option.off"/>
-						</html:radio>
-	      			</td>
-		         </tr>
-		         
-				<tr>
-					<td class="formlabel">
-		      			<bean:message key="radiobox.usernameVisible"/>:
-					</td>
-					<td>
-						<html:radio property="usernameVisible" value="ON">
-						 <bean:message key="option.on"/>
-						</html:radio>
-
-						<html:radio property="usernameVisible" value="OFF">
-						 <bean:message key="option.off"/>
-						</html:radio>
-	      			</td>
-		         </tr>
-		         
-   				<tr>
-					<td class="formlabel">
-		      			<bean:message key="radiobox.questionsSequenced"/>:		      			
-					</td>
-					<td>
-						<html:radio property="questionsSequenced" value="ON">
-						 <bean:message key="option.on"/>
-						</html:radio>
-
-						<html:radio property="questionsSequenced" value="OFF">
-						 <bean:message key="option.off"/>
-						</html:radio>
-	      			</td>
-		        </tr>
-		         
-		         <tr>
-					<td class="formlabel">
-		      			<bean:message key="radiobox.retries"/>:		      			
-					</td>
-					<td>
-						<html:radio property="retries" value="ON">
-						 <bean:message key="option.on"/>
-						</html:radio>
-
-						<html:radio property="retries" value="OFF">
-						 <bean:message key="option.off"/>
-						</html:radio>
-	      			</td>
-
-				</tr>	      			
-		        
-   				<tr>
-					<td class="formlabel">
-		      			<bean:message key="radiobox.showFeedback"/>:		      			
-					</td>
-					<td>
-						<html:radio property="showFeedback" value="ON">
-						 <bean:message key="option.on"/>
-						</html:radio>
-
-						<html:radio property="showFeedback" value="OFF">
-						 <bean:message key="option.off"/>
-						</html:radio>
-	      			</td>
-		        </tr>
-		         
-		         <tr> 
-					<td class="formlabel">
-			 			<bean:message key="label.report.title"/>: </td>
-			 		<td> 
-			 			<html:text property="reportTitle" size="60" maxlength="100"/>
-			 		</td>
-			  	</tr>
-			  	
-			  	<tr> 
-					<td class="formlabel">
-			 			<bean:message key="label.monitoringReport.title"/>: 
-			 		</td>
-			 		<td> 
-			 			<html:text property="monitoringReportTitle" size="60" maxlength="100"/>
-			 		</td>
-			  	</tr>
-			  	
-			  	<tr> 
-					<td class="formlabel">
-			 			<bean:message key="label.report.endLearningMessage"/>: 
-			 		</td>
-			 		<td> 
-			 			<html:text property="endLearningMessage" size="60" maxlength="100"/>
-			 		</td>
-			  	</tr>
-			  	
-		  		<tr>
- 				 	<td colspan=2 align=center>								
-						&nbsp&nbsp
-				  	</td>
-				</tr>
-				<tr>
-					 <td class="body" colspan=2> 
-						 <html:submit property="advancedTabDone" styleClass="linkbutton" onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
-							<bean:message key="button.done"/>
-						</html:submit>
-					</td> 
- 				 </tr>
-			</table>	  	
-
+			<jsp:include page="AdvancedContent.jsp" />
 </div>
 
 <!-- end of content_b -->
Index: lams_tool_lamc/web/editOptionsContent.jsp
===================================================================
diff -u -re8526e7f760e36faf92d8c56da58cf04d7e2b3db -r2dbeea64b0b9925ebfcc5b10ced841ad134a0f38
--- lams_tool_lamc/web/editOptionsContent.jsp	(.../editOptionsContent.jsp)	(revision e8526e7f760e36faf92d8c56da58cf04d7e2b3db)
+++ lams_tool_lamc/web/editOptionsContent.jsp	(.../editOptionsContent.jsp)	(revision 2dbeea64b0b9925ebfcc5b10ced841ad134a0f38)
@@ -118,13 +118,15 @@
 
 						<tr>
 						  	<td> </td>
-							<td class="input" align="center">
+							<td class="formlabel">
 								<h5> <b> <bean:message key="label.candidateAnswers"/> </b> </h5>
-							</td>
-							<td class="input" align="center">
+
+						  		&nbsp&nbsp&nbsp&nbsp&nbsp
+
 								<h5> <b> <bean:message key="label.isCorrect"/> </b> </h5>
-							</td>
-							<td class="input" colspan=2 align="center">
+
+						  		&nbsp&nbsp&nbsp&nbsp&nbsp
+
 								<h5> <b> <bean:message key="label.actions"/> </b> </h5>
 							</td>
 						</tr>
@@ -134,35 +136,39 @@
 						<c:forEach var="optionEntry" items="${sessionScope.mapOptionsContent}">
 							  <c:if test="${optionEntry.key == 1}"> 			
 								  <tr>
-								  	<td> </td>
+									  	<td class="formlabel"> <c:out value="Candidate Answer ${optionIndex}"/> : </td>
+
 								  		<td class="input"> 
 								  			<input type="text" name="optionContent<c:out value="${optionIndex}"/>" value="<c:out value="${optionEntry.value}"/>"   
 									  		size="50" maxlength="255"> 
-									  	</td>
+									  		
+									  		&nbsp&nbsp&nbsp&nbsp&nbsp
+
 									  	
 			  				  	 		<c:set var="selectedOptionFound" scope="request" value="0"/>
 			  							<c:forEach var="selectedOptionEntry" items="${sessionScope.mapSelectedOptions}">
 											  <c:if test="${selectedOptionEntry.value == optionEntry.value}"> 			
-						  							<td class="input" align=center> 
+						  					
 													  	<select name="checkBoxSelected<c:out value="${optionIndex}"/>">
 															<option value="Incorrect" > Incorrect </option>
 															<option value="Correct" SELECTED>   Correct  </option>
 														</select>
-													</td>
+											
 						  				  	 		<c:set var="selectedOptionFound" scope="request" value="1"/>
 						 					</c:if> 			
 										</c:forEach>
 										
 									  <c:if test="${selectedOptionFound == 0}"> 			
-								  				<td class="input" align=center> 
+								  			
 												  	<select name="checkBoxSelected<c:out value="${optionIndex}"/>">
 														<option value="Incorrect" SELECTED> Incorrect </option>
 														<option value="Correct">   Correct  </option>
 													</select>
-												</td>
+											
 					 					</c:if> 			
 									  											
-								  		<td class="input"> 
+									  		&nbsp&nbsp&nbsp&nbsp&nbsp
+
 	  										<html:submit property="addOption" styleClass="linkbutton" 
 											onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
 												<bean:message key="button.add"/>
@@ -177,32 +183,34 @@
 								  	<td class="input"> 
 								  			<input type="text" name="optionContent<c:out value="${optionIndex}"/>" value="<c:out value="${optionEntry.value}"/>"   
 									  		size="50" maxlength="255"> 
-									  	</td>
 
-\			  				  	 		<c:set var="selectedOptionFound" scope="request" value="0"/>
+									  		&nbsp&nbsp&nbsp&nbsp&nbsp
+
+			  				  	 		<c:set var="selectedOptionFound" scope="request" value="0"/>
 			  							<c:forEach var="selectedOptionEntry" items="${sessionScope.mapSelectedOptions}">
 											  <c:if test="${selectedOptionEntry.value == optionEntry.value}"> 			
-						  							<td class="input" align=center> 
+
 													  	<select name="checkBoxSelected<c:out value="${optionIndex}"/>">
 															<option value="Incorrect" > Incorrect </option>
 															<option value="Correct" SELECTED>   Correct  </option>
 														</select>
-													</td>
+
 						  				  	 		<c:set var="selectedOptionFound" scope="request" value="1"/>
 						 					</c:if> 			
 										</c:forEach>
 										
 									  <c:if test="${selectedOptionFound == 0}"> 			
-								  				<td class="input" align=center> 
+
 												  	<select name="checkBoxSelected<c:out value="${optionIndex}"/>">
 														<option value="Incorrect" SELECTED> Incorrect </option>
 														<option value="Correct">   Correct  </option>
 													</select>
-												</td>
+
 					 					</c:if> 			
 									  	
-								  		<td class="input"> 
-			 								<html:submit property="removeOption" styleClass="linkbutton"  onclick="javascript:document.forms[0].optionIndex.value=${optionIndex};"
+									  		&nbsp&nbsp&nbsp&nbsp&nbsp
+
+			 								<html:submit property="removeOption" styleClass="linkbutton"  onclick="javascript:document.forms[0].deletableOptionIndex.value=${optionIndex};"
 			 								onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
 												<bean:message key="button.remove"/>
 											</html:submit>
@@ -211,20 +219,57 @@
 							</c:if> 			
 						  		<input type=hidden name="checkBoxSelected<c:out value="${optionIndex}"/>">
 						</c:forEach>
-							<html:hidden property="selectedIndex"/>							
+							<html:hidden property="deletableOptionIndex"/>							
 					<tr>
 	 				 	<td colspan=4 align=center>								
 							&nbsp&nbsp
 					  	</td>
 					</tr>
+					<tr>
+	 				 	<td colspan=4 align=center>								
+							&nbsp&nbsp
+					  	</td>
+					</tr>
+
+
+					<tr>
+	 				 	<td class="formlabel" align=right> 
+							<bean:message key="label.feedback.incorrect"/>
+						</td>
+						<td class="formcontrol">
+							<FCK:editor id="richTextFeedbackInCorrect" basePath="/lams/fckeditor/">
+								  <c:out value="${sessionScope.richTextFeedbackInCorrect}" escapeXml="false" />						  
+							</FCK:editor>
+						</td> 
+						<td>&nbsp </td>  
+						<td> &nbsp </td>
+						
+					</tr>
+					
+					<tr>
+	 				 	<td class="formlabel" align=right> 
+							<bean:message key="label.feedback.correct"/>
+						</td>
+						<td class="formcontrol">
+							<FCK:editor id="richTextFeedbackCorrect" basePath="/lams/fckeditor/">
+								  <c:out value="${sessionScope.richTextFeedbackCorrect}" escapeXml="false" />						  
+							</FCK:editor>
+						</td> 
+						<td> &nbsp</td> 
+						<td> &nbsp</td>
+					</tr>
+					
+					
 	 				 <tr>
-	 				 	<td class="input" colspan=4 align=left>
+	 				 <td> &nbsp</td>
+	 				 <td class="input" colspan=3 align=left>
 							<html:submit property="doneOptions" styleClass="linkbutton" 
 							onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
 								<bean:message key="button.done"/>
 							</html:submit>	 				 		  										  		
 		 			  	</td>
 	 				 </tr>
+	 				 
 				</table> 	 
 </div>
 <hr>
@@ -237,9 +282,9 @@
 
 <!-- tab content 2 Advanced-->
 <div id='content_a'  class="tabbody content_a">
-<h2>Advanced Question Definitions</h2>
+<h2>Advanced Definitions</h2>
 <div id="formtablecontainer">
-The advanced contents should go here
+		<jsp:include page="AdvancedContent.jsp" />
 </div>
 
 <!-- end of content_b -->
@@ -283,6 +328,3 @@
 
 
 
-
-
-