Index: lams_tool_scratchie/web/includes/css/scratchie-learning.scss
===================================================================
diff -u -r2e61eefa786c0411376091c504812a8931395186 -r866c77698571a608a81502a434281cf1161b417e
--- lams_tool_scratchie/web/includes/css/scratchie-learning.scss	(.../scratchie-learning.scss)	(revision 2e61eefa786c0411376091c504812a8931395186)
+++ lams_tool_scratchie/web/includes/css/scratchie-learning.scss	(.../scratchie-learning.scss)	(revision 866c77698571a608a81502a434281cf1161b417e)
@@ -35,7 +35,7 @@
 	padding-top: 5px;
 }
 
-.burning-question-container {
+.burning-question-container, .question-etherpad-container {
 	padding: 0 15px;
 }
 .answer-description {
@@ -91,6 +91,6 @@
 	font-weight: bold;
 }
 
-.question-etherpad .panel-body {
+.question-etherpad {
 	padding: 0;
 }
\ No newline at end of file
Index: lams_tool_scratchie/web/pages/learning/scratchies.jsp
===================================================================
diff -u -rcb6c263502cb557374502608fd07cc8c317d22c7 -r866c77698571a608a81502a434281cf1161b417e
--- lams_tool_scratchie/web/pages/learning/scratchies.jsp	(.../scratchies.jsp)	(revision cb6c263502cb557374502608fd07cc8c317d22c7)
+++ lams_tool_scratchie/web/pages/learning/scratchies.jsp	(.../scratchies.jsp)	(revision 866c77698571a608a81502a434281cf1161b417e)
@@ -159,19 +159,23 @@
 	</c:otherwise>
 	</c:choose>
 	
+		
+	<%--Display Etherpad for each question --%>
 	<c:if test="${isQuestionEtherpadEnabled}">
-		<%--Display Etherpad for each question --%>
-		<div class="panel panel-default question-etherpad">
-			<div class="panel-heading">
-				<div class="panel-title">
-					<fmt:message key="label.etherpad.discussion" />
+		<div class="form-group question-etherpad-container">
+			<a data-toggle="collapse" data-target="#question-etherpad-${item.uid}" href="#qe${item.uid}" class="collapsed">
+				<span class="if-collapsed"><i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i></span>
+  				<span class="if-not-collapsed"><i class="fa fa-xs fa-minus-square-o roffset5" aria-hidden="true"></i></span>
+				<fmt:message key="label.etherpad.discussion" />
+			</a>
+			
+			<div id="question-etherpad-${item.uid}" class="collapse">
+				<div class="panel panel-default question-etherpad">
+					<lams:Etherpad groupId="etherpad-scratchie-${toolSessionID}-question-${item.uid}" 
+					   showControls="${mode eq 'teacher'}" showChat="false" height="200"
+					>${questionEtherpadContent}</lams:Etherpad>
 				</div>
 			</div>
-			<div class="panel-body">
-				<lams:Etherpad groupId="etherpad-scratchie-${toolSessionID}-question-${item.uid}" 
-				   showControls="${mode eq 'teacher'}" showChat="false" height="200"
-				>${questionEtherpadContent}</lams:Etherpad>
-			</div>
 		</div>
 	</c:if>