Index: lams_tool_laqa/web/authoring/AdvancedContent.jsp
===================================================================
diff -u -rf7c4163d7f916da8b431030a3a36ae6f6cef607a -r110fa726a5bde19d707fcf5367de6b5e29e81b66
--- lams_tool_laqa/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision f7c4163d7f916da8b431030a3a36ae6f6cef607a)
+++ lams_tool_laqa/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 110fa726a5bde19d707fcf5367de6b5e29e81b66)
@@ -1,6 +1,7 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+<c:set var="sessionMap" value="${sessionScope[formBean.httpSessionID]}" />
 
 <script type="text/javascript">
 	
@@ -27,11 +28,8 @@
 			}
 		});
 		
-		$(".rating-criteria-tag").hide();
-		
-		
 		 $('#allowRateAnswers').click(function() {
-		    	$(".rating-criteria-tag").toggle("slow");
+		    	$("#criterias-holder").toggle("slow");
 		    });
 		
 		 $('#reflect').click(function() {
@@ -117,8 +115,11 @@
 			</label>
 		</div>
 	
+		<div id="criterias-holder" <c:if test="${formBean.allowRateAnswers == 0}"> style="display:none;"</c:if>>
 		<lams:AuthoringRatingCriteria criterias="${sessionMap.ratingCriterias}" hasRatingLimits="true"
 			upLabel="label.authoring.up" downLabel="label.authoring.down" />
+		</div>
+		
 	</div>
 	
 </lams:SimplePanel>
Index: lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp
===================================================================
diff -u -rf6abd239c49b4c7ec52cc0a425efd6b599ef0f3a -r110fa726a5bde19d707fcf5367de6b5e29e81b66
--- lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision f6abd239c49b4c7ec52cc0a425efd6b599ef0f3a)
+++ lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision 110fa726a5bde19d707fcf5367de6b5e29e81b66)
@@ -60,10 +60,8 @@
 <lams:Page title="${title}" type="navbar">
 	<lams:Tabs control="true" title="${title}" helpToolSignature="<%= QaAppConstants.MY_SIGNATURE %>" helpModule="authoring">
 		<lams:Tab id="1" key="label.basic" />
-		<c:if test="${mode == 'author'}">
-			<lams:Tab id="2" key="label.advanced" />
-			<lams:Tab id="3" key="label.conditions" />
-		</c:if>
+		<lams:Tab id="2" key="label.advanced" />
+		<lams:Tab id="3" key="label.conditions" />
 	</lams:Tabs>
 
 	<lams:TabBodyArea>
@@ -77,10 +75,8 @@
 		
 		<lams:TabBodys>
 			<lams:TabBody id="1" titleKey="label.basic" page="BasicContent.jsp"/>
-			<c:if test="${mode == 'author'}">
-				<lams:TabBody id="2" titleKey="label.advanced" page="AdvancedContent.jsp" />
-				<lams:TabBody id="3" titleKey="label.conditions" page="conditions.jsp" />
-			</c:if>
+			<lams:TabBody id="2" titleKey="label.advanced" page="AdvancedContent.jsp" />
+			<lams:TabBody id="3" titleKey="label.conditions" page="conditions.jsp" />
 	    </lams:TabBodys>
 	    
 		<lams:AuthoringButton formID="authoringForm"