Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java
===================================================================
diff -u -r24757442203ab054339af87ac1128fd737781c63 -rd85be663c5d470c3e362f71e3a81f532431f0e45
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java	(.../VoteUtils.java)	(revision 24757442203ab054339af87ac1128fd737781c63)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java	(.../VoteUtils.java)	(revision d85be663c5d470c3e362f71e3a81f532431f0e45)
@@ -188,22 +188,25 @@
         
         voteGeneralAuthoringDTO.setActivityTitle(defaultVoteContent.getTitle());
         voteGeneralAuthoringDTO.setActivityInstructions(defaultVoteContent.getInstructions());
-
-	    voteAuthoringForm.setAllowText(defaultVoteContent.isAllowText()?ON:OFF);
-	    voteAuthoringForm.setAllowTextEntry(defaultVoteContent.isAllowText()?ON:OFF);
-	    voteAuthoringForm.setVoteChangable(defaultVoteContent.isVoteChangable()?ON:OFF);
-	    voteAuthoringForm.setLockOnFinish(defaultVoteContent.isLockOnFinish()?ON:OFF);
-	    voteAuthoringForm.setReflect(defaultVoteContent.isReflect()?ON:OFF);
+	    
+	    voteAuthoringForm.setAllowText(defaultVoteContent.isAllowText()?"1":"0");
+	    voteAuthoringForm.setAllowTextEntry(defaultVoteContent.isAllowText()?"1":"0");
+	    voteAuthoringForm.setVoteChangable(defaultVoteContent.isVoteChangable()?"1":"0");
+	    voteAuthoringForm.setLockOnFinish(defaultVoteContent.isLockOnFinish()?"1":"0");
+	    voteAuthoringForm.setReflect(defaultVoteContent.isReflect()?"1":"0");
+	    
         voteAuthoringForm.setOnlineInstructions(defaultVoteContent.getOnlineInstructions());
 	    voteAuthoringForm.setOfflineInstructions(defaultVoteContent.getOfflineInstructions());
 	    
-	    voteGeneralAuthoringDTO.setAllowText(defaultVoteContent.isAllowText()?ON:OFF);
-	    voteGeneralAuthoringDTO.setVoteChangable(defaultVoteContent.isVoteChangable()?ON:OFF);
-	    voteGeneralAuthoringDTO.setLockOnFinish(defaultVoteContent.isLockOnFinish()?ON:OFF);
+
+	    voteGeneralAuthoringDTO.setAllowText(defaultVoteContent.isAllowText()?"1":"0");
+	    voteGeneralAuthoringDTO.setVoteChangable(defaultVoteContent.isVoteChangable()?"1":"0");
+	    voteGeneralAuthoringDTO.setLockOnFinish(defaultVoteContent.isLockOnFinish()?"1":"0");
+	    voteAuthoringForm.setReflect(defaultVoteContent.isReflect()?"1":"0");
+	    
 	    voteGeneralAuthoringDTO.setOnlineInstructions(defaultVoteContent.getOnlineInstructions());
 	    voteGeneralAuthoringDTO.setOfflineInstructions(defaultVoteContent.getOfflineInstructions());
 
-	    voteAuthoringForm.setReflect(defaultVoteContent.isReflect()?"1":"0");
 	    
 	    String maxNomcount= defaultVoteContent.getMaxNominationCount();
 	    logger.debug("maxNomcount: " + maxNomcount);
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java
===================================================================
diff -u -r24757442203ab054339af87ac1128fd737781c63 -rd85be663c5d470c3e362f71e3a81f532431f0e45
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision 24757442203ab054339af87ac1128fd737781c63)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision d85be663c5d470c3e362f71e3a81f532431f0e45)
@@ -869,22 +869,18 @@
         logger.debug("richTextTitle: " + richTextTitle);
         logger.debug("richTextInstructions: " + richTextInstructions);
         
-        String voteChangable = voteAuthoringForm.getVoteChangable();
+        String voteChangable = request.getParameter("voteChangable");
         logger.debug("voteChangable: " + voteChangable);
-        
-        String lockOnFinish=voteAuthoringForm.getLockOnFinish();
+
+        String lockOnFinish = request.getParameter("lockOnFinish");
         logger.debug("lockOnFinish: " + lockOnFinish);
-        
-        String allowTextEntry=voteAuthoringForm.getAllowText();
+
+        String allowTextEntry = request.getParameter("allowText");
         logger.debug("allowTextEntry: " + allowTextEntry);
 
-        //String reflect=voteAuthoringForm.getReflect();
-        //logger.debug("reflect: " + reflect);
-        
 		String reflect=request.getParameter(REFLECT);
 		logger.debug("reflect: " + reflect);
 
-        
         String reflectionSubject=voteAuthoringForm.getReflectionSubject();
         logger.debug("reflectionSubject: " + reflectionSubject);
         
@@ -912,25 +908,20 @@
         boolean allowTextBoolean=false;
         boolean reflectBoolean=false;
         
-        if (setCommonContent)
-        {
-            if (voteChangable.equalsIgnoreCase(ON))
-                voteChangableBoolean=true;
             
-            if (lockOnFinish.equalsIgnoreCase(ON))
-                lockedOnFinishBoolean=true;
-
-            if (allowTextEntry.equalsIgnoreCase(ON))
-                allowTextBoolean=true;
-            
-            //if (reflect.equalsIgnoreCase(ON))
-            //    reflectBoolean=true;
-            
-            if ((reflect != null) && (reflect.equalsIgnoreCase("1")))
-                reflectBoolean=true;
-        }
+        if ((voteChangable != null) && (voteChangable.equalsIgnoreCase("1")))
+            voteChangableBoolean=true;
         
+        if ((lockOnFinish != null) && (lockOnFinish.equalsIgnoreCase("1")))
+            lockedOnFinishBoolean=true;
         
+        if ((allowTextEntry != null) && (allowTextEntry.equalsIgnoreCase("1")))
+            allowTextBoolean=true;
+        
+        if ((reflect != null) && (reflect.equalsIgnoreCase("1")))
+            reflectBoolean=true;
+
+        
         long userId=0;
         if (toolUser != null)
         {
@@ -980,7 +971,7 @@
 
      	logger.debug("activeModule: " + activeModule);
      	
-        if ((!activeModule.equals(DEFINE_LATER)) && (setCommonContent))
+     	if (activeModule.equals(AUTHORING))
 		{
         	logger.debug("setting other content values...");
          	voteContent.setVoteChangable(voteChangableBoolean);
@@ -1008,7 +999,7 @@
         voteContent=voteService.retrieveVote(new Long(toolContentID));
      	logger.debug("voteContent: " + voteContent);
         
-        voteContent=createOptiosContent(mapOptionsContent, voteService, voteContent);
+        voteContent=createOptionsContent(mapOptionsContent, voteService, voteContent);
         
         return voteContent;
     }
@@ -1021,7 +1012,7 @@
      * @param voteContent
      * @return
      */
-    protected VoteContent createOptiosContent(Map mapOptionsContent, IVoteService voteService, VoteContent voteContent)
+    protected VoteContent createOptionsContent(Map mapOptionsContent, IVoteService voteService, VoteContent voteContent)
     {    
         logger.debug("starting createOptiosContent: " + voteContent);
         logger.debug("content uid is: " + voteContent.getUid());
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java
===================================================================
diff -u -r369b6c2ca857c6b74ee143e081534f50b0b94106 -rd85be663c5d470c3e362f71e3a81f532431f0e45
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java	(.../VoteAction.java)	(revision 369b6c2ca857c6b74ee143e081534f50b0b94106)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java	(.../VoteAction.java)	(revision d85be663c5d470c3e362f71e3a81f532431f0e45)
@@ -629,7 +629,6 @@
 	    
 	    saveErrors(request,errors);
 
-	    
 	    voteAuthoringForm.resetUserAction();
 	    
 		logger.debug("active module is: " + voteAuthoringForm.getActiveModule());
@@ -649,8 +648,6 @@
 		voteAuthoringForm.setDefineLaterInEditMode(new Boolean(false).toString());
 		voteGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(false).toString());
 
-		
-		
 		logger.debug("voteGeneralAuthoringDTO: " + voteGeneralAuthoringDTO);
 		request.setAttribute(VOTE_GENERAL_AUTHORING_DTO, voteGeneralAuthoringDTO);
 		
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAuthoringForm.java
===================================================================
diff -u -r24757442203ab054339af87ac1128fd737781c63 -rd85be663c5d470c3e362f71e3a81f532431f0e45
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAuthoringForm.java	(.../VoteAuthoringForm.java)	(revision 24757442203ab054339af87ac1128fd737781c63)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAuthoringForm.java	(.../VoteAuthoringForm.java)	(revision d85be663c5d470c3e362f71e3a81f532431f0e45)
@@ -199,10 +199,9 @@
 	
 	public void resetRadioBoxes()
 	{
-    	this.voteChangable		 =OPTION_OFF;
-		this.lockOnFinish		 =OPTION_OFF;
-		this.allowText			 =OPTION_OFF;
-		//this.reflect			 =OPTION_OFF;
+	    this.voteChangable		 ="0";
+		this.lockOnFinish		 ="0";
+		this.allowText			 ="0";
 		this.reflect			 ="0";
 	}
 
Index: lams_tool_vote/web/authoring/AdvancedContent.jsp
===================================================================
diff -u -r24757442203ab054339af87ac1128fd737781c63 -rd85be663c5d470c3e362f71e3a81f532431f0e45
--- lams_tool_vote/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 24757442203ab054339af87ac1128fd737781c63)
+++ lams_tool_vote/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision d85be663c5d470c3e362f71e3a81f532431f0e45)
@@ -38,13 +38,9 @@
 			      			<bean:message key="label.vote.changable"/>:
 					</td>
 					<td>							
-						<html:radio property="voteChangable" value="ON">
-						 <bean:message key="option.on"/>
-						</html:radio>
-
-						<html:radio property="voteChangable" value="OFF">
-						 <bean:message key="option.off"/>
-						</html:radio>
+		      			<html:checkbox property="voteChangable" value="1"
+							styleClass="noBorder" styleId="voteChangable">
+						</html:checkbox>
 	      			</td>
 		         </tr>
 		         
@@ -53,13 +49,9 @@
 			      			<bean:message key="label.vote.lockedOnFinish"/>:
 					</td>
 					<td>							
-						<html:radio property="lockOnFinish" value="ON">
-						 <bean:message key="option.on"/>
-						</html:radio>
-
-						<html:radio property="lockOnFinish" value="OFF">
-						 <bean:message key="option.off"/>
-						</html:radio>
+		      			<html:checkbox property="lockOnFinish" value="1"
+							styleClass="noBorder" styleId="lockOnFinish">
+						</html:checkbox>
 	      			</td>
 		         </tr>
 		         
@@ -68,13 +60,10 @@
 			      			<bean:message key="label.allowText"/>:
 					</td>
 					<td>							
-						<html:radio property="allowText" value="ON">
-						 <bean:message key="option.on"/>
-						</html:radio>
-
-						<html:radio property="allowText" value="OFF">
-						 <bean:message key="option.off"/>
-						</html:radio>
+		      			<html:checkbox property="allowText" value="1"
+							styleClass="noBorder" styleId="allowText">
+						</html:checkbox>
+						
 	      			</td>
 		        </tr>