Index: lams_tool_lamc/web/authoring/BasicContent.jsp
===================================================================
diff -u -rd8e8e7c67dd36ff75f5436902741d85008cd86a3 -ra9512154c624c83ef76373ede64af104251f4101
--- lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision d8e8e7c67dd36ff75f5436902741d85008cd86a3)
+++ lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision a9512154c624c83ef76373ede64af104251f4101)
@@ -169,7 +169,7 @@
 							 <tr>
 								  	<td NOWRAP bgcolor="#EEEEEE" colspan=5 class="input" valign=top align=right>
 									  	<font size=2>
-											<html:submit onclick="javascript:submitMethod('addNewQuestion');" styleClass="longButton">
+											<html:submit onclick="javascript:submitMethod('addNewQuestion');" styleClass="button">
 												<bean:message key="label.add.question"/>
 											</html:submit>	 				 		  										  		
 										</font>
@@ -184,7 +184,7 @@
 							 <tr>
 								  	<td NOWRAP bgcolor="#EEEEEE" colspan=5 class="input" valign=top align=right>
 									  	<font size=2>
-											<html:submit styleClass="longButton" disabled="true" onclick="javascript:alert('This button is disabled in this [view-only] mode.');" >
+											<html:submit styleClass="button" disabled="true" onclick="javascript:alert('This button is disabled in this [view-only] mode.');" >
 												<bean:message key="label.add.question"/>
 											</html:submit>	 				 		  										  		
 										</font>
@@ -263,39 +263,19 @@
 						</tr>
 						
 						
-					<c:if test="${ (sessionScope.activeModule == 'defineLater') &&
-								   (sessionScope.defineLaterEditActivity == 'false') 
-								  }"> 			
-							 <tr>
-		 						<td NOWRAP valign=top> </td> 
-								<td NOWRAP class="input" colspan=3 align=left valign=top>								
-									<font size=2>
-										<html:submit onclick="javascript:submitMethod('editActivityQuestions');" disabled="true" styleClass="buttonLeft">
-											<bean:message key="label.edit"/>
-										</html:submit>	 				 		  					
-									</font>
-				 			  	</td>
-								<td NOWRAP valign=top> </td> 
-								<td NOWRAP valign=top> </td>
-							</tr>
-						</c:if> 													
-					<c:if test="${ (sessionScope.activeModule == 'defineLater') &&
-								   (sessionScope.defineLaterEditActivity != 'false') 
-								  }"> 			
+						 <tr>
+	 						<td NOWRAP valign=top> </td> 
+							<td NOWRAP class="input" colspan=3 align=left valign=top>								
+								<font size=2>
+									<html:submit onclick="javascript:submitMethod('editActivityQuestions');" styleClass="buttonLeft">
+										<bean:message key="label.edit"/>
+									</html:submit>	 				 		  					
+								</font>
+			 			  	</td>
+							<td NOWRAP valign=top> </td> 
+							<td NOWRAP valign=top> </td>
+						</tr>
 
-							 <tr>
-		 						<td NOWRAP valign=top> </td> 
-								<td NOWRAP class="input" colspan=3 align=left valign=top>								
-									<font size=2>
-										<html:submit onclick="javascript:submitMethod('editActivityQuestions');" styleClass="buttonLeft">
-											<bean:message key="label.edit"/>
-										</html:submit>	 				 		  					
-									</font>
-				 			  	</td>
-								<td NOWRAP valign=top> </td> 
-								<td NOWRAP valign=top> </td>
-							</tr>
-						</c:if> 						
 						
 					</c:if> 																																						
  				</table> 	 
Index: lams_tool_lamc/web/authoring/OptionsContent.jsp
===================================================================
diff -u -re2f8a1a56e8c878afecaed39754101f8331e130d -ra9512154c624c83ef76373ede64af104251f4101
--- lams_tool_lamc/web/authoring/OptionsContent.jsp	(.../OptionsContent.jsp)	(revision e2f8a1a56e8c878afecaed39754101f8331e130d)
+++ lams_tool_lamc/web/authoring/OptionsContent.jsp	(.../OptionsContent.jsp)	(revision a9512154c624c83ef76373ede64af104251f4101)
@@ -126,7 +126,7 @@
 						 <tr>
 							  	<td bgcolor="#EEEEEE" colspan=4 class="input" valign=top align=right>
 				  					<font size=2>
-										<html:submit onclick="javascript:submitMethod('addOption');" styleClass="longButton">
+										<html:submit onclick="javascript:submitMethod('addOption');" styleClass="button">
 												<bean:message key="label.add.option"/>
 										</html:submit>	 				 		  										  		
 									</font>									
@@ -152,7 +152,7 @@
 	 				 <td valign=top> </td>
 	 				 <td class="input" align=left colspan=3 valign=top>
 						<font size=2>
-							<html:submit onclick="javascript:submitMethod('doneOptions');" styleClass="buttonLeft">
+							<html:submit onclick="javascript:submitMethod('doneOptions');" styleClass="button">
 									<bean:message key="button.done"/>
 							</html:submit>	 				 		  										  		
 						</font>