Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
diff -u -re66bdae723516ab13d4a6f81e5f598018f6dbe58 -r8c2289edbab42fcc74a5172d3b565c631ca4ba58
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8c2289edbab42fcc74a5172d3b565c631ca4ba58)
@@ -1176,6 +1176,8 @@
 	String command = WebUtil.readStrParam(request, AttributeNames.PARAM_COMMAND, true);
 	if (command == null) {
 	    plannerForm.fillForm(taskList);
+	    String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	    plannerForm.setContentFolderID(contentFolderId);
 	    return mapping.findForward(ResourceConstants.SUCCESS);
 	} else {
 	    try {
@@ -1206,6 +1208,7 @@
 	ActionMessages errors = plannerForm.validate();
 	if (errors.isEmpty()) {
 	    Resource taskList = getResourceService().getResourceByContentId(plannerForm.getToolContentID());
+	    taskList.setInstructions(plannerForm.getInstructions());
 
 	    int itemIndex = 0;
 	    String title = null;
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourcePedagogicalPlannerForm.java
===================================================================
diff -u -r00a6e145b37916eb1561ea5c68319b0fc691681b -r8c2289edbab42fcc74a5172d3b565c631ca4ba58
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourcePedagogicalPlannerForm.java	(.../ResourcePedagogicalPlannerForm.java)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourcePedagogicalPlannerForm.java	(.../ResourcePedagogicalPlannerForm.java)	(revision 8c2289edbab42fcc74a5172d3b565c631ca4ba58)
@@ -48,6 +48,8 @@
     private List<Long> fileUuid;
     private List<Long> fileVersion;
     private List<Short> type;
+    private String instructions;
+    private String contentFolderID;
 
     @Override
     public ActionMessages validate() {
@@ -96,6 +98,7 @@
     public void fillForm(Resource resource) {
 	if (resource != null) {
 	    setToolContentID(resource.getContentId());
+	    setInstructions(resource.getInstructions());
 
 	    title = new ArrayList<String>();
 	    url = new ArrayList<String>();
@@ -289,4 +292,20 @@
     public void setFileDummy(int number, String emptyString) {
 	setFile(number, null);
     }
+
+    public String getInstructions() {
+	return instructions;
+    }
+
+    public void setInstructions(String instructions) {
+	this.instructions = instructions;
+    }
+
+    public String getContentFolderID() {
+	return contentFolderID;
+    }
+
+    public void setContentFolderID(String contentFolderID) {
+	this.contentFolderID = contentFolderID;
+    }
 }
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -rf21aa2ec355995ada05a1490b962235e75726d61 -r8c2289edbab42fcc74a5172d3b565c631ca4ba58
--- lams_tool_larsrc/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision f21aa2ec355995ada05a1490b962235e75726d61)
+++ lams_tool_larsrc/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 8c2289edbab42fcc74a5172d3b565c631ca4ba58)
@@ -17,6 +17,10 @@
 			margin: 5px 0px 5px 10px;
 			float: none;
 		}
+		
+		body {
+			width: 760px;
+		}
 	</style>
 	
 	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-latest.pack.js"></script>
@@ -41,40 +45,58 @@
   				}
   			});
   		}
+  		
+	  	function prepareFormData(){
+			//FCKeditor content is not submitted when sending by jQuery; we need to do this
+			var content = FCKeditorAPI.GetInstance('instructions').GetXHTML();
+			document.getElementById("instructions").value=content;
+		}
   	</script>
 </lams:head>
 <body id="body">
 	<%@ include file="/common/messages.jsp"%>
-	<html:form style="width: 555px" enctype="multipart/form-data" action="/authoring/saveOrUpdatePedagogicalPlannerForm.do" styleId="pedagogicalPlannerForm" method="post">
+	<html:form enctype="multipart/form-data" action="/authoring/saveOrUpdatePedagogicalPlannerForm.do" styleId="pedagogicalPlannerForm" method="post">
 		<html:hidden property="toolContentID" />
 		<html:hidden property="valid" styleId="valid" />
 		<html:hidden property="callID" styleId="callID" />
 		<html:hidden property="activityOrderNumber" styleId="activityOrderNumber" />
+		
 		<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-		<c:forEach var="itemIndex"  begin="1" end="${formBean.itemCount}" >
-			<c:set var="itemType" value="${formBean.typeList[itemIndex-1]}" />
-			<c:set var="itemFileName" value="${formBean.fileNameList[itemIndex-1]}" />
-			<html:hidden property="type[${itemIndex-1}]" />
-			<html:hidden property="fileUuid[${itemIndex-1}]" />
-			<html:hidden property="fileVersion[${itemIndex-1}]" />
-			<html:hidden property="fileName[${itemIndex-1}]"></html:hidden>
-			<h4 class="space-left"><fmt:message key="label.authoring.basic.title"/></h4>
-			<html:text styleClass="item" size="90" property="title[${itemIndex-1}]"></html:text>
-			<c:choose>
-				<c:when test="${itemType eq 1}">
-					<h4 class="space-left"><fmt:message key="label.authoring.basic.resource.url"/></h4>
-					<html:text styleClass="item" size="90" property="url[${itemIndex-1}]"></html:text>
-				</c:when>
-				<c:when test="${itemType eq 2}">
-					<html:hidden property="url[${itemIndex-1}]" />
-					<h4 class="space-left"><fmt:message key="label.authoring.basic.resource.file"/>
-						<c:if test="${not empty itemFileName}">: ${itemFileName}</c:if>
-					</h4>
-					<html:file size="78" styleClass="item" property="file[${itemIndex-1}]" />
-				</c:when>
-			</c:choose>
-			<hr style="margin-left: auto; margin-right: auto; margin-top: 5px; margin-bottom: 5px; width: 450px" />
-		</c:forEach>
+		<h4 class="space-left"><fmt:message key="label.authoring.basic.resource.instructions"/></h4>
+		<lams:FCKEditor id="instructions"
+			value="${formBean.instructions}"
+			contentFolderID="${formBean.contentFolderID}"
+               toolbarSet="Custom-Pedplanner" height="150px"
+               width="760px" displayExpanded="false">
+		</lams:FCKEditor>
+		
+		<c:if test="${formBean.itemCount ne 0}">
+			<h4 class="space-left space-top space-bottom"><fmt:message key="label.authoring.basic.resource.list.title"/></h4>
+			<c:forEach var="itemIndex"  begin="1" end="${formBean.itemCount}" >
+				<c:set var="itemType" value="${formBean.typeList[itemIndex-1]}" />
+				<c:set var="itemFileName" value="${formBean.fileNameList[itemIndex-1]}" />
+				<html:hidden property="type[${itemIndex-1}]" />
+				<html:hidden property="fileUuid[${itemIndex-1}]" />
+				<html:hidden property="fileVersion[${itemIndex-1}]" />
+				<html:hidden property="fileName[${itemIndex-1}]"></html:hidden>
+				<h4 class="space-left"><fmt:message key="label.authoring.basic.title"/></h4>
+				<html:text styleClass="item" size="90" property="title[${itemIndex-1}]"></html:text>
+				<c:choose>
+					<c:when test="${itemType eq 1}">
+						<h4 class="space-left"><fmt:message key="label.authoring.basic.resource.url"/></h4>
+						<html:text styleClass="item" size="90" property="url[${itemIndex-1}]"></html:text>
+					</c:when>
+					<c:when test="${itemType eq 2}">
+						<html:hidden property="url[${itemIndex-1}]" />
+						<h4 class="space-left"><fmt:message key="label.authoring.basic.resource.file"/>
+							<c:if test="${not empty itemFileName}">: ${itemFileName}</c:if>
+						</h4>
+						<html:file size="78" styleClass="item" property="file[${itemIndex-1}]" />
+					</c:when>
+				</c:choose>
+				<hr style="margin-left: auto; margin-right: auto; margin-top: 5px; margin-bottom: 5px; width: 450px" />
+			</c:forEach>
+		</c:if>
 	</html:form>
 	<a class="button" href="javascript:createItem(2);"><fmt:message key="label.authoring.basic.add.file" /></a>
 	<a class="button" href="javascript:createItem(1);"><fmt:message key="label.authoring.basic.add.url" /></a>
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VotePedagogicalPlannerAction.java
===================================================================
diff -u -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 -r8c2289edbab42fcc74a5172d3b565c631ca4ba58
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VotePedagogicalPlannerAction.java	(.../VotePedagogicalPlannerAction.java)	(revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VotePedagogicalPlannerAction.java	(.../VotePedagogicalPlannerAction.java)	(revision 8c2289edbab42fcc74a5172d3b565c631ca4ba58)
@@ -96,8 +96,8 @@
 	VotePedagogicalPlannerForm plannerForm = (VotePedagogicalPlannerForm) form;
 	ActionMessages errors = plannerForm.validate();
 	if (errors.isEmpty()) {
-
 	    VoteContent voteContent = getVoteService().retrieveVote(plannerForm.getToolContentID());
+	    voteContent.setInstructions(plannerForm.getInstructions());
 
 	    int nominationIndex = 1;
 	    String nomination = null;
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VotePedagogicalPlannerForm.java
===================================================================
diff -u -r00a6e145b37916eb1561ea5c68319b0fc691681b -r8c2289edbab42fcc74a5172d3b565c631ca4ba58
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VotePedagogicalPlannerForm.java	(.../VotePedagogicalPlannerForm.java)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VotePedagogicalPlannerForm.java	(.../VotePedagogicalPlannerForm.java)	(revision 8c2289edbab42fcc74a5172d3b565c631ca4ba58)
@@ -37,7 +37,16 @@
 public class VotePedagogicalPlannerForm extends PedagogicalPlannerActivityForm {
     private List<String> nomination;
     private String contentFolderID;
+    private String instructions;
 
+    public String getInstructions() {
+	return instructions;
+    }
+
+    public void setInstructions(String instructions) {
+	this.instructions = instructions;
+    }
+
     public String getContentFolderID() {
 	return contentFolderID;
     }
@@ -73,6 +82,7 @@
     public void fillForm(VoteContent voteContent) {
 	if (voteContent != null) {
 	    setToolContentID(voteContent.getVoteContentId());
+	    setInstructions(voteContent.getInstructions());
 
 	    nomination = new ArrayList<String>();
 	    Set questions = voteContent.getVoteQueContents();
Index: lams_tool_vote/web/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -rf21aa2ec355995ada05a1490b962235e75726d61 -r8c2289edbab42fcc74a5172d3b565c631ca4ba58
--- lams_tool_vote/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision f21aa2ec355995ada05a1490b962235e75726d61)
+++ lams_tool_vote/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 8c2289edbab42fcc74a5172d3b565c631ca4ba58)
@@ -35,6 +35,9 @@
   		
   		function prepareFormData(){
 			//FCKeditor content is not submitted when sending by jQuery; we need to do this
+			var content = FCKeditorAPI.GetInstance('instructions').GetXHTML();
+			document.getElementById("instructions").value=content;
+			
 			var nominationIndex = 0;
 			do{
 				var nomination = document.getElementById("nomination["+nominationIndex+"]");
@@ -49,24 +52,34 @@
 </lams:head>
 <body id="body">
 	<%@ include file="/common/messages.jsp"%>
-	<h4 class="space-left"><fmt:message key="label.nomination"/></h4>
 	<html:form action="/pedagogicalPlanner.do?dispatch=saveOrUpdatePedagogicalPlannerForm" styleId="pedagogicalPlannerForm" method="post">
 		<html:hidden property="toolContentID" />
 		<html:hidden property="valid" styleId="valid" />
 		<html:hidden property="callID" styleId="callID" />
 		<html:hidden property="activityOrderNumber" styleId="activityOrderNumber" />
+		
 		<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+		<h4 class="space-left"><fmt:message key="label.authoring.instructions"/></h4>
+		<lams:FCKEditor id="instructions"
+			value="${formBean.instructions}"
+			contentFolderID="${formBean.contentFolderID}"
+               toolbarSet="Custom-Pedplanner" height="150px"
+               width="760px" displayExpanded="false">
+		</lams:FCKEditor>
 		
-		<c:forEach var="nominationIndex"  begin="1" end="${formBean.nominationCount}" >
-			<div class="FCKdiv">
-				<lams:FCKEditor id="nomination[${nominationIndex-1}]"
-					value="${formBean.nominationList[nominationIndex-1]}"
-					contentFolderID="${formBean.contentFolderID}"
-	                toolbarSet="Custom-Pedplanner" height="150px"
-	                width="760px" displayExpanded="false">
-				</lams:FCKEditor>
-			</div>
-		</c:forEach>
+		<c:if test="${formBean.nominationCount ne 0}">
+			<h4 class="space-left space-top"><fmt:message key="label.vote.nominations"/></h4>
+			<c:forEach var="nominationIndex"  begin="1" end="${formBean.nominationCount}" >
+				<div class="FCKdiv">
+					<lams:FCKEditor id="nomination[${nominationIndex-1}]"
+						value="${formBean.nominationList[nominationIndex-1]}"
+						contentFolderID="${formBean.contentFolderID}"
+		                toolbarSet="Custom-Pedplanner" height="150px"
+		                width="760px" displayExpanded="false">
+					</lams:FCKEditor>
+				</div>
+			</c:forEach>
+		</c:if>
 	</html:form>
 	<a class="button" href="javascript:createQuestion();"><fmt:message key="label.add.new.nomination" /></a>
 </body>