Index: lams_admin/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_admin/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_admin/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r225d293907a5e2976e367ee3aa790239bad38699 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/comments/CommentConstants.java
===================================================================
diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_central/src/java/org/lamsfoundation/lams/comments/CommentConstants.java	(.../CommentConstants.java)	(revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa)
+++ lams_central/src/java/org/lamsfoundation/lams/comments/CommentConstants.java	(.../CommentConstants.java)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -26,6 +26,7 @@
 public class CommentConstants {
 
     public static final String ATTR_EXTERNAL_ID = "externalID";
+    public static final String ATTR_EXTERNAL_SECONDARY_ID = "externalSecondaryID";
     public static final String ATTR_EXTERNAL_SIG = "externalSig";
     public static final String ATTR_EXTERNAL_TYPE = "externalType";
     public static final String ATTR_SESSION_MAP_ID = "sessionMapID";
Index: lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java
===================================================================
diff -u -r5fb9d3a732e1f9c643f4c6023e29b25cd2287988 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java	(.../CommentAction.java)	(revision 5fb9d3a732e1f9c643f4c6023e29b25cd2287988)
+++ lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java	(.../CommentAction.java)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -138,6 +138,7 @@
 	SessionMap<String, Object> sessionMap;
 
 	Long externalId;
+	Long externalSecondaryId;
 	int externalType;
 	String externalSignature;
 	String mode;
@@ -150,6 +151,7 @@
 	if (sessionMapID != null) {
 	    sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 	    externalId = (Long) sessionMap.get(CommentConstants.ATTR_EXTERNAL_ID);
+	    externalSecondaryId = (Long) sessionMap.get(CommentConstants.ATTR_EXTERNAL_SECONDARY_ID);
 	    externalType = (Integer) sessionMap.get(CommentConstants.ATTR_EXTERNAL_TYPE);
 	    externalSignature = (String) sessionMap.get(CommentConstants.ATTR_EXTERNAL_SIG);
 	    mode = (String) sessionMap.get(AttributeNames.ATTR_MODE);
@@ -161,6 +163,7 @@
 	    request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 
 	    externalId = WebUtil.readLongParam(request, CommentConstants.ATTR_EXTERNAL_ID);
+	    externalSecondaryId = WebUtil.readLongParam(request, CommentConstants.ATTR_EXTERNAL_SECONDARY_ID, true);
 	    externalType = WebUtil.readIntParam(request, CommentConstants.ATTR_EXTERNAL_TYPE);
 	    externalSignature = WebUtil.readStrParam(request, CommentConstants.ATTR_EXTERNAL_SIG);
 	    likeAndDislike = WebUtil.readBooleanParam(request, CommentConstants.ATTR_LIKE_AND_DISLIKE);
@@ -176,6 +179,9 @@
 
 	    sessionMap.put(CommentConstants.ATTR_EXTERNAL_ID, externalId);
 	    sessionMap.put(CommentConstants.ATTR_EXTERNAL_TYPE, externalType);
+	    if ( externalSecondaryId != null ) {
+		sessionMap.put(CommentConstants.ATTR_EXTERNAL_SECONDARY_ID, externalSecondaryId);
+	    }
 	    sessionMap.put(CommentConstants.ATTR_EXTERNAL_SIG, externalSignature);
 	    sessionMap.put(CommentConstants.ATTR_LIKE_AND_DISLIKE, likeAndDislike);
 	    sessionMap.put(CommentConstants.ATTR_READ_ONLY, readOnly);
@@ -191,7 +197,7 @@
 	    throwException("Unknown comment type ", user.getLogin(), externalId, externalType, externalSignature);
 	}
 
-	Comment rootComment = getCommentService().createOrGetRoot(externalId, externalType, externalSignature, user);
+	Comment rootComment = getCommentService().createOrGetRoot(externalId, externalSecondaryId, externalType, externalSignature, user);
 	sessionMap.put(CommentConstants.ATTR_ROOT_COMMENT_UID, rootComment.getUid());
 	return viewTopicImpl(mapping, form, request, response, sessionMap, pageSize, sortBy, true);
     }
@@ -260,6 +266,7 @@
 	    boolean includeSticky) {
 
 	Long externalId = (Long) sessionMap.get(CommentConstants.ATTR_EXTERNAL_ID);
+	Long externalSecondaryId = (Long) sessionMap.get(CommentConstants.ATTR_EXTERNAL_SECONDARY_ID);
 	Integer externalType = (Integer) sessionMap.get(CommentConstants.ATTR_EXTERNAL_TYPE);
 	String externalSignature = (String) sessionMap.get(CommentConstants.ATTR_EXTERNAL_SIG);
 
@@ -279,14 +286,14 @@
 	    sortBy = (Integer) sessionMap.get(CommentConstants.ATTR_SORT_BY);
 	}
 
-	List<CommentDTO> msgDtoList = commentService.getTopicThread(externalId, externalType, externalSignature,
-		lastMsgSeqId, pageSize, sortBy, currentLikeCount, user.getUserID());
+	List<CommentDTO> msgDtoList = commentService.getTopicThread(externalId, externalSecondaryId, externalType,
+		externalSignature, lastMsgSeqId, pageSize, sortBy, currentLikeCount, user.getUserID());
 	updateMessageFlag(msgDtoList, user.getUserID());
 	request.setAttribute(CommentConstants.ATTR_COMMENT_THREAD, msgDtoList);
 
 	if (includeSticky) {
-	    List<CommentDTO> stickyList = commentService.getTopicStickyThread(externalId, externalType,
-		    externalSignature, sortBy, currentLikeCount, user.getUserID());
+	    List<CommentDTO> stickyList = commentService.getTopicStickyThread(externalId, externalSecondaryId,
+		    externalType, externalSignature, sortBy, currentLikeCount, user.getUserID());
 	    updateMessageFlag(stickyList, user.getUserID());
 	    request.setAttribute(CommentConstants.ATTR_STICKY, stickyList);
 	}
@@ -371,6 +378,7 @@
 
 	SessionMap<String, Object> sessionMap = getSessionMap(request);
 	Long externalId = (Long) sessionMap.get(CommentConstants.ATTR_EXTERNAL_ID);
+	Long externalSecondaryId = (Long) sessionMap.get(CommentConstants.ATTR_EXTERNAL_SECONDARY_ID);
 	Integer externalType = (Integer) sessionMap.get(CommentConstants.ATTR_EXTERNAL_TYPE);
 	String externalSignature = (String) sessionMap.get(CommentConstants.ATTR_EXTERNAL_SIG);
 
@@ -396,7 +404,7 @@
 			externalId, externalType, externalSignature);
 	    }
 
-	    Comment rootSeq = commentService.getRoot(externalId, externalType, externalSignature);
+	    Comment rootSeq = commentService.getRoot(externalId, externalSecondaryId, externalType, externalSignature);
 
 	    // save message into database
 	    Comment newComment = commentService.createReply(rootSeq, commentText, user, isMonitor);
Index: lams_central/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r193efdb1be106871ad2482c5004373692a70b598 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_central/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 193efdb1be106871ad2482c5004373692a70b598)
+++ lams_central/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
Index: lams_central/web/comments/new.jsp
===================================================================
diff -u -r8db199a300d8f5c1b477c927cd74e111af4aecb9 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_central/web/comments/new.jsp	(.../new.jsp)	(revision 8db199a300d8f5c1b477c927cd74e111af4aecb9)
+++ lams_central/web/comments/new.jsp	(.../new.jsp)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -84,7 +84,7 @@
 	}
 </script>
 
-<div class="row no-gutter">
+<%-- <div class="row no-gutter">
 	<div class="col-xs-12">
 		<div class="panel panel-default">
 			<div class="panel-heading">
@@ -94,7 +94,7 @@
 			</div>
 			<div class="panel-body">
 
-				<div class="form-group">
+ --%>				<div class="form-group">
 					<div class="comment-entry">
 						<form id="newForm" method="GET"
 							action="<lams:LAMSURL />comments/newComment.do">
@@ -116,14 +116,14 @@
 						</form>
 					</div>
 				</div>
-
+<!-- 
 			</div>
-			<!-- end panel body -->
+			end panel body
 		</div>
-		<!-- end comment panel -->
+		end comment panel
 	</div>
-	<!-- end col-*-12 -->
+	end col-*-12
 </div>
-<!-- end row no-gutter -->
+end row no-gutter
+ -->
 
-
Index: lams_central/web/comments/topicview.jsp
===================================================================
diff -u -r4583983b64efe1d91fbb47cdde6a759a6a30e859 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_central/web/comments/topicview.jsp	(.../topicview.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
+++ lams_central/web/comments/topicview.jsp	(.../topicview.jsp)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -162,7 +162,7 @@
 			</table>
 			<script> 
 				$("#${messageTablename}").treetable({${isSticky?tableCommandSticky:tableCommand}});
-			</script>	
+ 			</script>	
 			</div>
 		</c:if>
 		<c:set var="messageTablename" value="tree${commentDto.comment.uid}"/>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/CommentSession.hbm.xml
===================================================================
diff -u -r9ab6da017a5180a0ee0e766740571644972ce628 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/CommentSession.hbm.xml	(.../CommentSession.hbm.xml)	(revision 9ab6da017a5180a0ee0e766740571644972ce628)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/CommentSession.hbm.xml	(.../CommentSession.hbm.xml)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -44,6 +44,15 @@
             column="external_signature"
         />
 
+        <property
+            name="externalSecondaryId"
+            type="java.lang.Long"
+            update="true"
+            insert="true"
+            column="external_secondary_id"
+        />
+
+
     </class>
 
 </hibernate-mapping>
Index: lams_common/src/java/org/lamsfoundation/lams/comments/CommentSession.java
===================================================================
diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_common/src/java/org/lamsfoundation/lams/comments/CommentSession.java	(.../CommentSession.java)	(revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa)
+++ lams_common/src/java/org/lamsfoundation/lams/comments/CommentSession.java	(.../CommentSession.java)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -33,6 +33,7 @@
     private Long externalId;
     private Integer externalIdType;
     private String externalSignature;
+    private Long externalSecondaryId;
 
     public CommentSession() {
     }
@@ -69,4 +70,12 @@
 	this.externalSignature = externalSignature;
     }
 
+    public Long getExternalSecondaryId() {
+	return externalSecondaryId;
+    }
+
+    public void setExternalSecondaryId(Long externalSecondaryId) {
+	this.externalSecondaryId = externalSecondaryId;
+    }
+
 }
Index: lams_common/src/java/org/lamsfoundation/lams/comments/dao/ICommentDAO.java
===================================================================
diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_common/src/java/org/lamsfoundation/lams/comments/dao/ICommentDAO.java	(.../ICommentDAO.java)	(revision 5773f84ed608838de3521ecde87c52f3c72d478c)
+++ lams_common/src/java/org/lamsfoundation/lams/comments/dao/ICommentDAO.java	(.../ICommentDAO.java)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -16,7 +16,7 @@
      * @param sessionId
      * @return
      */
-    public abstract Comment getRootTopic(Long externalId, Integer externalIdType, String externalSignature);
+    public abstract Comment getRootTopic(Long externalId, Long externalSecondaryId, Integer externalIdType, String externalSignature);
 
     public abstract SortedSet<Comment> getThreadByThreadId(Long threadCommentId, Integer sortBy, Integer userId);
 
Index: lams_common/src/java/org/lamsfoundation/lams/comments/dao/hibernate/CommentDAO.java
===================================================================
diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_common/src/java/org/lamsfoundation/lams/comments/dao/hibernate/CommentDAO.java	(.../CommentDAO.java)	(revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa)
+++ lams_common/src/java/org/lamsfoundation/lams/comments/dao/hibernate/CommentDAO.java	(.../CommentDAO.java)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -62,11 +62,25 @@
 	    + " where cs.parent is null and cs.session.externalId=:externalId and "
 	    + " cs.session.externalIdType=:externalIdType and cs.session.externalSignature=:externalSignature";
 
+    private static final String SQL_QUERY_FIND_ROOT_TOPICS_EXTRA_ID = "from " + Comment.class.getName() + " cs "
+	    + " where cs.parent is null and cs.session.externalId=:externalId and "
+	    + " cs.session.externalSecondaryId=:externalSecondaryId and "
+	    + " cs.session.externalIdType=:externalIdType and cs.session.externalSignature=:externalSignature";
+
     @Override
-    public Comment getRootTopic(Long externalId, Integer externalIdType, String externalSignature) {
+    public Comment getRootTopic(Long externalId, Long externalSecondaryId, Integer externalIdType,
+	    String externalSignature) {
 	@SuppressWarnings("rawtypes")
-	List list = getSession().createQuery(SQL_QUERY_FIND_ROOT_TOPICS).setLong("externalId", externalId)
-		.setInteger("externalIdType", externalIdType).setString("externalSignature", externalSignature).list();
+	List list = null;
+	if (externalSecondaryId == null)
+	    list = getSession().createQuery(SQL_QUERY_FIND_ROOT_TOPICS).setLong("externalId", externalId)
+		    .setInteger("externalIdType", externalIdType).setString("externalSignature", externalSignature)
+		    .list();
+	else
+	    list = getSession().createQuery(SQL_QUERY_FIND_ROOT_TOPICS_EXTRA_ID).setLong("externalId", externalId)
+		    .setLong("externalSecondaryId", externalSecondaryId).setInteger("externalIdType", externalIdType)
+		    .setString("externalSignature", externalSignature).list();
+
 	if (list != null && list.size() > 0) {
 	    return (Comment) list.get(0);
 	}
Index: lams_common/src/java/org/lamsfoundation/lams/comments/service/CommentService.java
===================================================================
diff -u -r5fb9d3a732e1f9c643f4c6023e29b25cd2287988 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_common/src/java/org/lamsfoundation/lams/comments/service/CommentService.java	(.../CommentService.java)	(revision 5fb9d3a732e1f9c643f4c6023e29b25cd2287988)
+++ lams_common/src/java/org/lamsfoundation/lams/comments/service/CommentService.java	(.../CommentService.java)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -62,13 +62,14 @@
     private ICommentLikeDAO commentLikeDAO;
 
     @Override
-    public List<CommentDTO> getTopicThread(Long externalId, Integer externalType, String externalSignature,
-	    Long lastCommentSeqId, Integer pageSize, Integer sortBy, String extraSortParam, Integer userId) {
+    public List<CommentDTO> getTopicThread(Long externalId, Long externalSecondaryId, Integer externalType,
+	    String externalSignature, Long lastCommentSeqId, Integer pageSize, Integer sortBy, String extraSortParam,
+	    Integer userId) {
 
 	long lastThreadMessageUid = lastCommentSeqId != null ? lastCommentSeqId.longValue() : 0L;
 
 	// hidden root of all the threads!
-	Comment rootTopic = commentDAO.getRootTopic(externalId, externalType, externalSignature);
+	Comment rootTopic = commentDAO.getRootTopic(externalId, externalSecondaryId, externalType, externalSignature);
 
 	// first time through - no root topic.
 	if (rootTopic == null) {
@@ -81,11 +82,11 @@
     }
 
     @Override
-    public List<CommentDTO> getTopicStickyThread(Long externalId, Integer externalType, String externalSignature,
+    public List<CommentDTO> getTopicStickyThread(Long externalId, Long externalSecondaryId, Integer externalType, String externalSignature,
 	    Integer sortBy, String extraSortParam, Integer userId) {
 
 	// hidden root of all the threads!
-	Comment rootTopic = commentDAO.getRootTopic(externalId, externalType, externalSignature);
+	Comment rootTopic = commentDAO.getRootTopic(externalId, externalSecondaryId, externalType, externalSignature);
 
 	// first time through - no root topic.
 	if (rootTopic == null) {
@@ -117,20 +118,21 @@
     // Do we need to synchronize this method? Would be nice but it is the equivalent of tool session creation
     // and we don't synchonize them!
     @Override
-    public Comment createOrGetRoot(Long externalId, Integer externalIdType, String externalSignature, User user) {
-	Comment rootComment = commentDAO.getRootTopic(externalId, externalIdType, externalSignature);
-	return (rootComment != null ? rootComment : createRoot(externalId, externalIdType, externalSignature, user));
+    public Comment createOrGetRoot(Long externalId, Long externalSecondaryId, Integer externalIdType, String externalSignature, User user) {
+	Comment rootComment = commentDAO.getRootTopic(externalId, externalSecondaryId, externalIdType, externalSignature);
+	return (rootComment != null ? rootComment : createRoot(externalId, externalSecondaryId, externalIdType, externalSignature, user));
     }
 
     @Override
-    public Comment getRoot(Long externalId, Integer externalIdType, String externalSignature) {
-	return commentDAO.getRootTopic(externalId, externalIdType, externalSignature);
+    public Comment getRoot(Long externalId, Long externalSecondaryId, Integer externalIdType, String externalSignature) {
+	return commentDAO.getRootTopic(externalId, externalSecondaryId, externalIdType, externalSignature);
     }
 
-    private Comment createRoot(Long externalId, Integer externalIdType, String externalSignature, User user) {
+    private Comment createRoot(Long externalId, Long externalSecondaryId, Integer externalIdType, String externalSignature, User user) {
 
 	CommentSession session = new CommentSession();
 	session.setExternalId(externalId);
+	session.setExternalSecondaryId(externalSecondaryId);
 	session.setExternalIdType(externalIdType);
 	session.setExternalSignature(externalSignature);
 
Index: lams_common/src/java/org/lamsfoundation/lams/comments/service/ICommentService.java
===================================================================
diff -u -r5fb9d3a732e1f9c643f4c6023e29b25cd2287988 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_common/src/java/org/lamsfoundation/lams/comments/service/ICommentService.java	(.../ICommentService.java)	(revision 5fb9d3a732e1f9c643f4c6023e29b25cd2287988)
+++ lams_common/src/java/org/lamsfoundation/lams/comments/service/ICommentService.java	(.../ICommentService.java)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -39,23 +39,25 @@
      * Gets the comments for a tool, based on the tool session and the tool's id. Allows for paging.
      * Will not include the sticky - get them using getTopicStickyThread()
      */
-    List<CommentDTO> getTopicThread(Long externalId, Integer externalType, String externalSignature, Long lastMsgSeqId,
-	    Integer pageSize, Integer sortBy, String extraSortParam, Integer userId);
+    List<CommentDTO> getTopicThread(Long externalId, Long externalSecondaryId, Integer externalType,
+	    String externalSignature, Long lastMsgSeqId, Integer pageSize, Integer sortBy, String extraSortParam,
+	    Integer userId);
 
     /** Gets all the sticky comments for a tool, based on the tool session and the tool's id */
-    List<CommentDTO> getTopicStickyThread(Long externalId, Integer externalType, String externalSignature,
-	    Integer sortBy, String extraSortParam, Integer userId);
+    List<CommentDTO> getTopicStickyThread(Long externalId, Long externalSecondaryId, Integer externalType,
+	    String externalSignature, Integer sortBy, String extraSortParam, Integer userId);
 
     /** Saves a comment - either creating a whole tree one if there is no parent or saving under the given parent. */
     Comment createReply(Long parentId, String replyText, User user, boolean isMonitor);
 
     Comment createReply(Comment parent, String replyText, User user, boolean isMonitor);
 
     /** Gets the dummy root for the comment system and if one doesn't exist for this session then set it up! */
-    Comment createOrGetRoot(Long externalId, Integer externalIdType, String externalSignature, User user);
+    Comment createOrGetRoot(Long externalId, Long externalSecondaryId, Integer externalIdType, String externalSignature,
+	    User user);
 
     /** Gets the dummy root. If it doesn't exist, returns null. */
-    Comment getRoot(Long externalId, Integer externalIdType, String externalSignature);
+    Comment getRoot(Long externalId, Long externalSecondaryId, Integer externalIdType, String externalSignature);
 
     /**
      * Get one complete thread within a topic Note that the return type is DTO.
Index: lams_gradebook/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r6e11b20353d23ae1ef9a153af2109ec0e5c4049f -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_gradebook/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 6e11b20353d23ae1ef9a153af2109ec0e5c4049f)
+++ lams_gradebook/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
Index: lams_learning/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -rd2f94d212eba580a02bd50de662a6a7a486bd885 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_learning/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision d2f94d212eba580a02bd50de662a6a7a486bd885)
+++ lams_learning/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
Index: lams_monitoring/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -rd2f94d212eba580a02bd50de662a6a7a486bd885 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_monitoring/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision d2f94d212eba580a02bd50de662a6a7a486bd885)
+++ lams_monitoring/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
Index: lams_tool_assessment/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_assessment/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_assessment/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
Index: lams_tool_bbb/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_bbb/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_bbb/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
Index: lams_tool_chat/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_chat/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_chat/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
Index: lams_tool_daco/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_daco/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_daco/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
Index: lams_tool_doku/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r2fc3c196b706f247820267da4439c301a1a77805 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_doku/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2fc3c196b706f247820267da4439c301a1a77805)
+++ lams_tool_doku/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
Index: lams_tool_doku/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_doku/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_tool_doku/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,14 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +294,52 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>
Index: lams_tool_forum/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_forum/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_forum/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
Index: lams_tool_gmap/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_gmap/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_gmap/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
Index: lams_tool_images/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_images/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_images/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
Index: lams_tool_imscc/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_imscc/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_imscc/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
Index: lams_tool_kaltura/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_kaltura/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_kaltura/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
Index: lams_tool_lamc/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_lamc/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_lamc/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
Index: lams_tool_laqa/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_laqa/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_laqa/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
Index: lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml
===================================================================
diff -u -r942b2a5bf6dac160bf9e00bac22e6232ae65ef98 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml	(.../ResourceItem.hbm.xml)	(revision 942b2a5bf6dac160bf9e00bac22e6232ae65ef98)
+++ lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml	(.../ResourceItem.hbm.xml)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -195,7 +195,15 @@
             column="is_allow_rating"
         />
 
+        <property
+            name="allowComments"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="is_allow_comments"
+        />
 
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-ResourceItem.xml
Index: lams_tool_larsrc/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r8e090b3ddf269cdffececa4bc55a9333da5b0858 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_larsrc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8e090b3ddf269cdffececa4bc55a9333da5b0858)
+++ lams_tool_larsrc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -180,5 +180,7 @@
 error.loaderror  =There was an error loading the grid. If this problem persists, please contact your system administrator.
 label.ok  =OK
 
-
+label.comments=Comments
+label.enable.comments=Enable Comments
+label.view.comments=View Comments
 #======= End labels: Exported 170 labels for en AU =====
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java
===================================================================
diff -u -r942b2a5bf6dac160bf9e00bac22e6232ae65ef98 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	(.../ResourceConstants.java)	(revision 942b2a5bf6dac160bf9e00bac22e6232ae65ef98)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	(.../ResourceConstants.java)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -123,6 +123,8 @@
     public static final String ATTR_IS_GROUPED_ACTIVITY = "isGroupedActivity";
 
     public static final String ATTR_IS_URL_ITEM_TYPE = "isUrlItemType";
+    
+    public static final String ATTR_ALLOW_COMMENTS = "allowComments";
 
     // error message keys
     public static final String ERROR_MSG_TITLE_BLANK = "error.resource.item.title.blank";
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/ResourceItemDTO.java
===================================================================
diff -u -r942b2a5bf6dac160bf9e00bac22e6232ae65ef98 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/ResourceItemDTO.java	(.../ResourceItemDTO.java)	(revision 942b2a5bf6dac160bf9e00bac22e6232ae65ef98)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/ResourceItemDTO.java	(.../ResourceItemDTO.java)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -56,6 +56,7 @@
     private String username;
     private int viewNumber;
     private boolean allowRating;
+    private boolean allowComments;
     private ItemRatingDTO ratingDTO;
 
     // true: initial group item, false, belong to some group.
@@ -82,6 +83,7 @@
 	    this.itemTitle = item.getTitle();
 	    this.username = item.getCreateBy() == null ? "" : item.getCreateBy().getLoginName();
 	    this.setAllowRating(item.isAllowRating());
+	    this.setAllowComments(item.isAllowComments());
 	} else {
 	    this.itemUid = new Long(-1);
 	}
@@ -174,4 +176,12 @@
     public void setAllowRating(boolean allowRating) {
 	this.allowRating = allowRating;
     }
+
+    public boolean isAllowComments() {
+        return allowComments;
+    }
+
+    public void setAllowComments(boolean allowComments) {
+        this.allowComments = allowComments;
+    }
 }
\ No newline at end of file
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/SessionDTO.java
===================================================================
diff -u -r942b2a5bf6dac160bf9e00bac22e6232ae65ef98 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/SessionDTO.java	(.../SessionDTO.java)	(revision 942b2a5bf6dac160bf9e00bac22e6232ae65ef98)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/SessionDTO.java	(.../SessionDTO.java)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -32,6 +32,7 @@
     private String sessionName;
     private List<ResourceItemDTO> items;
     private boolean allowRating;
+    private boolean allowComments;
 
     public SessionDTO() {
 	items = new LinkedList<ResourceItemDTO>();
@@ -68,4 +69,12 @@
     public void setAllowRating(boolean allowRating) {
 	this.allowRating = allowRating;
     }
+
+    public boolean isAllowComments() {
+	return allowComments;
+    }
+
+    public void setAllowComments(boolean allowComments) {
+	this.allowComments = allowComments;
+    }
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java
===================================================================
diff -u -r942b2a5bf6dac160bf9e00bac22e6232ae65ef98 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java	(.../ResourceItem.java)	(revision 942b2a5bf6dac160bf9e00bac22e6232ae65ef98)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java	(.../ResourceItem.java)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -79,6 +79,7 @@
     private ResourceUser createBy;
     
     private boolean allowRating;
+    private boolean allowComments;
 
     // ***********************************************
     // DTO fields:
@@ -377,4 +378,13 @@
 	this.allowRating = allowRating;
     }
 
+    public boolean isAllowComments() {
+        return allowComments;
+    }
+
+    public void setAllowComments(boolean allowComments) {
+        this.allowComments = allowComments;
+    }
+
+
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
===================================================================
diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision 64ee69765400783a3e284e7856aa91cdd01f4831)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -32,7 +32,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
@@ -454,6 +453,7 @@
 
 	    // get all item which is accessed by users in this session
 	    Map<Long, Integer> visitCountMap = resourceItemVisitDao.getSummary(contentId, session.getSessionId());
+	    boolean allowComments = false;
 	    for (ResourceItem item : items) {
 		ResourceItemDTO resourceItemDTO = new ResourceItemDTO(item);
 		// set viewNumber according visit log
@@ -464,6 +464,7 @@
 		if ( item.isAllowRating() ) {
 		    itemsToRate.add(item.getUid());
 		}
+		allowComments = allowComments || item.isAllowComments();
 	    }
 	    
 	    List<ItemRatingDTO> itemRatingDtos = null;
@@ -485,6 +486,8 @@
 		    }
 		}
 	    }
+	    
+	    group.setAllowComments(allowComments);
 
 	    groupList.add(group);
 	}
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
diff -u -r942b2a5bf6dac160bf9e00bac22e6232ae65ef98 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 942b2a5bf6dac160bf9e00bac22e6232ae65ef98)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -778,6 +778,7 @@
 	form.setUrl(item.getUrl());
 	form.setOpenUrlNewWindow(item.isOpenUrlNewWindow());
 	form.setAllowRating(item.isAllowRating());
+	form.setAllowComments(item.isAllowComments());
 	if (itemIdx >= 0) {
 	    form.setItemIndex(new Integer(itemIdx).toString());
 	}
@@ -886,6 +887,7 @@
 	item.setCreateByAuthor(true);
 	item.setHide(false);
 	item.setAllowRating(itemForm.isAllowRating());
+	item.setAllowComments(itemForm.isAllowComments());
 	// set instructions
 	Set instructions = new LinkedHashSet();
 	int idx = 0;
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
===================================================================
diff -u -r8e090b3ddf269cdffececa4bc55a9333da5b0858 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 8e090b3ddf269cdffececa4bc55a9333da5b0858)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -49,6 +49,7 @@
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.rsrc.ResourceConstants;
 import org.lamsfoundation.lams.tool.rsrc.dto.ReflectDTO;
+import org.lamsfoundation.lams.tool.rsrc.dto.ResourceItemDTO;
 import org.lamsfoundation.lams.tool.rsrc.dto.SessionDTO;
 import org.lamsfoundation.lams.tool.rsrc.dto.VisitLogDTO;
 import org.lamsfoundation.lams.tool.rsrc.model.Resource;
@@ -89,6 +90,9 @@
 	if (param.equals("viewReflection")) {
 	    return viewReflection(mapping, form, request, response);
 	}
+	if (param.equals("viewComments")) {
+	    return viewComments(mapping, form, request, response);
+	}
 
 	return mapping.findForward(ResourceConstants.ERROR);
     }
@@ -243,6 +247,33 @@
 	return mapping.findForward("success");
     }
 
+    private ActionForward viewComments(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+
+	Long itemUid = WebUtil.readLongParam(request, ResourceConstants.ATTR_RESOURCE_ITEM_UID);
+	Long sessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
+
+	String sessionMapID = WebUtil.readStrParam(request, ResourceConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		.getAttribute(sessionMapID);
+	List<SessionDTO> sessionList = (List<SessionDTO>) sessionMap.get(ResourceConstants.ATTR_SUMMARY_LIST);
+	for (SessionDTO session : sessionList) {
+	    if (session.getSessionId().equals(sessionId)) {
+		for (ResourceItemDTO item : session.getItems()) {
+		    if (item.getItemUid().equals(itemUid)) {
+			request.setAttribute("itemTitle", item.getItemTitle());
+			break;
+		    }
+		}
+		break;
+	    }
+	}
+
+	request.setAttribute(ResourceConstants.ATTR_RESOURCE_ITEM_UID, itemUid);
+	request.setAttribute(ResourceConstants.ATTR_TOOL_SESSION_ID, sessionId);
+	request.setAttribute("mode", "teacher");
+	return mapping.findForward("success");
+    }
     // *************************************************************************************
     // Private method
     // *************************************************************************************
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java	(.../ViewItemAction.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java	(.../ViewItemAction.java)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -130,6 +130,8 @@
 	request.setAttribute(ResourceConstants.ATTR_RESOURCE_REVIEW_URL,
 		getReviewUrl(item, sessionMapID, mode, itemIdx));
 
+	request.setAttribute(ResourceConstants.ATTR_ALLOW_COMMENTS, item.isAllowComments());
+	
 	// these attribute will be use to instruction navigator page
 	request.setAttribute(AttributeNames.ATTR_MODE, mode);
 	request.setAttribute(ResourceConstants.PARAM_ITEM_INDEX, itemIdx);
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceItemForm.java
===================================================================
diff -u -r942b2a5bf6dac160bf9e00bac22e6232ae65ef98 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceItemForm.java	(.../ResourceItemForm.java)	(revision 942b2a5bf6dac160bf9e00bac22e6232ae65ef98)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceItemForm.java	(.../ResourceItemForm.java)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -52,6 +52,8 @@
     private String fileName;
     private FormFile file;
     private boolean allowRating;
+    private boolean allowComments;
+    
 
     public String getDescription() {
 	return description;
@@ -164,4 +166,12 @@
     public void setAllowRating(boolean allowRating) {
 	this.allowRating = allowRating;
     }
+
+    public boolean isAllowComments() {
+        return allowComments;
+    }
+
+    public void setAllowComments(boolean allowComments) {
+        this.allowComments = allowComments;
+    }
 }
Index: lams_tool_larsrc/web/WEB-INF/struts-config.xml
===================================================================
diff -u -rd383fad17aadef12e0382c9067713b4180b6a0d4 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_larsrc/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision d383fad17aadef12e0382c9067713b4180b6a0d4)
+++ lams_tool_larsrc/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -285,6 +285,11 @@
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.MonitoringAction"
 			parameter="changeItemVisibility" >
 		</action>
+		<action path="/monitoring/viewComments"
+			type="org.lamsfoundation.lams.tool.rsrc.web.action.MonitoringAction"
+			parameter="viewComments" >
+			<forward name="success" path="/pages/monitoring/comments.jsp" />
+		</action>
 		<!-- ========== BEGIN: Common ============================== -->
 		<action path="/clearsession"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.ClearSessionAction">
Index: lams_tool_larsrc/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_larsrc/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_larsrc/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
Index: lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp
===================================================================
diff -u -r942b2a5bf6dac160bf9e00bac22e6232ae65ef98 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision 942b2a5bf6dac160bf9e00bac22e6232ae65ef98)
+++ lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -90,10 +90,9 @@
 					</span>
 					<lams:WaitingSpinner id="itemAttachmentArea_Busy"/>
 				</div>			
-	
+
 				<div class="form-group">
-					<html:checkbox property="allowRating" styleId="allowRating"/>
-					&nbsp;<label for="allowRating"><fmt:message key="label.enable.rating" /></label>
+					<%@ include file="ratings.jsp"%>	
 				</div>
 			</html:form>
 	
Index: lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp
===================================================================
diff -u -r942b2a5bf6dac160bf9e00bac22e6232ae65ef98 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp	(.../addlearningobject.jsp)	(revision 942b2a5bf6dac160bf9e00bac22e6232ae65ef98)
+++ lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp	(.../addlearningobject.jsp)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -94,10 +94,8 @@
 				<lams:WaitingSpinner id="itemAttachmentArea_Busy"/>
 	
 				<div class="form-group">
-					<html:checkbox property="allowRating" styleId="allowRating"/>
-					&nbsp;<label for="allowRating"><fmt:message key="label.enable.rating" /></label>
+					<%@ include file="ratings.jsp"%>	
 				</div>
-				
 			</html:form>
 
 			<!-- Instructions -->
Index: lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp
===================================================================
diff -u -r116f7c20951970301f5e099490432f7cfe11ee5f -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	(.../addurl.jsp)	(revision 116f7c20951970301f5e099490432f7cfe11ee5f)
+++ lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	(.../addurl.jsp)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -65,8 +65,7 @@
 					&nbsp;<label for="openUrlNewWindow"><fmt:message key="open.in.new.window" /></label>
 					<br/>
 					
-					<html:checkbox property="allowRating" styleId="allowRating" styleClass="loffset5"/>
-					&nbsp;<label for="allowRating"><fmt:message key="label.enable.rating" /></label>
+					<%@ include file="ratings.jsp"%>	
 				</div>
 
 			</html:form>
Index: lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp
===================================================================
diff -u -r942b2a5bf6dac160bf9e00bac22e6232ae65ef98 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp	(.../addwebsite.jsp)	(revision 942b2a5bf6dac160bf9e00bac22e6232ae65ef98)
+++ lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp	(.../addwebsite.jsp)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -95,8 +95,7 @@
 				<lams:WaitingSpinner id="itemAttachmentArea_Busy"/>
 	
 				<div class="form-group">
-					<html:checkbox property="allowRating" styleId="allowRating"/>
-					&nbsp;<label for="allowRating"><fmt:message key="label.enable.rating" /></label>
+					<%@ include file="ratings.jsp"%>	
 				</div>
 				
 			</html:form>
Index: lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp
===================================================================
diff -u -r8cf2f45d764b57426e681cfd444666370e20dbfb -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp	(.../instructionsnav.jsp)	(revision 8cf2f45d764b57426e681cfd444666370e20dbfb)
+++ lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp	(.../instructionsnav.jsp)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -24,17 +24,13 @@
 <lams:html>
 	<lams:head>
 		<title><c:out value="${instructions.title}" escapeXml="true"/></title>
-
-		<%@ include file="/common/header.jsp"%>
 		
 		<%-- param has higher level for request attribute --%>
 		<c:if test="${not empty param.mode}">
 			<c:set var="mode" value="${param.mode}" />
 		</c:if>
 		<script type="text/JavaScript">
-				jQuery.noConflict();
-		
-				function finishIns(){
+ 				function finishIns(){
 				//learner and author(preview mode) will mark the finish
 					if(${mode == "learner"} || ${mode == "author"}){
 					   var reqIDVar = new Date();
@@ -43,17 +39,17 @@
 					        location.href='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${param.toolSessionID}&itemUid=${param.itemUid}"/>';
 					   }else{
 						    var url="<c:url value="/learning/completeItem"/>?sessionMapID=${sessionMapID}&mode=${mode}&itemUid=${param.itemUid}&reqID="+reqIDVar.getTime();
-							jQuery.ajax({
+							$.ajax({
 								type:   'GET',
 								dataType: 	'script',
 								url:    url,
 								timeout: 5000,
 
 								beforeSend:  function() {
 									// disable button
-									jQuery("input#FinishInstruction").attr("disabled", true);
-									jQuery("input#FinishInstruction").removeClass("button");
-									jQuery("input#FinishInstruction").addClass("disabled");
+									$("input#FinishInstruction").attr("disabled", true);
+									$("input#FinishInstruction").removeClass("button");
+									$("input#FinishInstruction").addClass("disabled");
 								},
 
 								error: function(jqXHR, textStatus, errorThrown) {
@@ -73,9 +69,9 @@
 
 								complete:  function() {
 									//enable button
-									jQuery("input#FinishInstruction").attr("disabled", false);
-									jQuery("input#FinishInstruction").removeClass("disabled");
-									jQuery("input#FinishInstruction").addClass("button");
+									$("input#FinishInstruction").attr("disabled", false);
+									$("input#FinishInstruction").removeClass("disabled");
+									$("input#FinishInstruction").addClass("button");
 								}
 							});
 							
@@ -93,27 +89,24 @@
 					var nextUrl="<c:url value='/nextInstruction.do'/>?mode=${mode}&insIdx=" + currIns + "&sessionMapID=${sessionMapID}&itemUid=${param.itemUid}&itemIndex=${param.itemIndex}";
 					$.ajaxSetup({ cache: true });
 					$('#headerFrame').load(nextUrl);
-				}
+				} 
 		</script>
 	</lams:head>
 	<body>
 
 		<div class="container-fluid" id="instructions">
-		  <div class="row">
+ 
+		<c:if test="${instructions.total > 0}" >
+		<div class="row">
 			<div class="col-xs-12 ">
-			<h4>
-				<c:if test="${instructions.total > 0}" >
-					<fmt:message key="message.step.of">
+			<h4><fmt:message key="message.step.of">
 						<fmt:param value="${instructions.current}" />
 						<fmt:param value="${instructions.total}" />
 					</fmt:message>
-				</c:if>
-				<c:if test="${instructions.total <= 0}" >
-					&nbsp;
-				</c:if>
 			</h4>
 			</div>
 		</div>
+		</c:if>
 		
 		<div class="row">
 			<div class="col-xs-12 ">
@@ -152,7 +145,7 @@
 					</c:otherwise>
 				</c:choose>
 			</div>
-		</div>
+		</div> 
 	</div>
 	
 	</body>
Index: lams_tool_larsrc/web/pages/itemreview/mainframe.jsp
===================================================================
diff -u -ref8d9a9e7303e6f5d108db3ac7f5413add6b66d2 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_larsrc/web/pages/itemreview/mainframe.jsp	(.../mainframe.jsp)	(revision ef8d9a9e7303e6f5d108db3ac7f5413add6b66d2)
+++ lams_tool_larsrc/web/pages/itemreview/mainframe.jsp	(.../mainframe.jsp)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <%-- 
 Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 License Information: http://lamsfoundation.org/licensing/lams/2.0/
@@ -19,18 +20,29 @@
   http://www.gnu.org/licenses/gpl.txt 
 --%>
 <%@ include file="/common/taglibs.jsp" %>
+<%@ page import="org.lamsfoundation.lams.tool.rsrc.ResourceConstants"%>
+
 <lams:html>
 <lams:head>
 	<%@ include file="/common/header.jsp"%>
 
 	<c:set var="initNavUrl"><c:url value="/pages/itemreview/initnav.jsp"/>?mode=${mode}&itemIndex=${itemIndex}&itemUid=${itemUid}&toolSessionID=${toolSessionID}&sessionMapID=${sessionMapID}</c:set>
 	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 	
+	<style media="screen,projection" type="text/css">
+ 	 	#collapseComments, #collapseComments .row {
+	 		padding-left: 6px;
+	 		padding-right: 6px;
+	 	}
+	}
+	
+	</style>
+
 	<script type="text/javascript">
 		$(document).ready(function(){
 			$.ajaxSetup({ cache: true });
-			$('#headerFrame').load('${initNavUrl}');
-		});
+    			$('#headerFrame').load('${initNavUrl}');
+   		});
 		
 		function setIframeHeight() {
 			var rscFrame = document.getElementById('resourceFrame');
@@ -48,13 +60,17 @@
 
 	<lams:Page title="" type="learner" usePanel="false" hideProgressBar="${!sessionMap.runAuto}">
 		<div class="panel panel-default">
-			<div class="panel-heading">
+ 			<div class="panel-heading">
 				<div id="headerFrame"></div>
 			</div>
-			<div class="panel-body" style="height:100vh;">
-				<iframe src="<c:url value='${resourceItemReviewUrl}'/>" id="resourceFrame" style="border:0px;width:100%;height:100%;" onload="setIframeHeight()"></iframe>
-				</div>
-		</div>
+ 			<c:if test="${allowComments and (mode eq 'learner' or mode eq 'author') and not empty toolSessionID}">
+ 				<c:set var="accordianTitle"><fmt:message key="label.comments"/></c:set>
+				<lams:Comments toolSessionId="${toolSessionID}" toolSignature="<%=ResourceConstants.TOOL_SIGNATURE%>" embedInAccordian="true" accordionTitle="${accordianTitle}" mode="${mode}" toolItemId="${itemUid}" readOnly="${sessionMap.finishedLock}"/>	
+			</c:if>
+   			<div class="panel-body" style="height:100vh;">
+ 				<iframe src="<c:url value='${resourceItemReviewUrl}'/>" id="resourceFrame" style="border:0px;width:100%;height:100%;" onload="setIframeHeight()"></iframe>
+ 			</div> 
+   		</div>
 	</lams:Page>
 
 </body>	
Index: lams_tool_larsrc/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -rce92f0b193ab5e4ce9a9c161e515cdca982b7ffd -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_larsrc/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision ce92f0b193ab5e4ce9a9c161e515cdca982b7ffd)
+++ lams_tool_larsrc/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -27,6 +27,11 @@
 				var myUrl = "<c:url value="/reviewItem.do"/>?mode=teacher&itemUid=" + itemUid + "&sessionMapID=${sessionMapID}";
 				launchPopup(myUrl,"MonitoringReview");
 			}
+			
+			function viewComments(itemUid, toolSessionID){
+				var myUrl = "<c:url value='/monitoring/viewComments.do'/>?mode=teacher&itemUid=" + itemUid + "&toolSessionID=" + toolSessionID + "&sessionMapID=${sessionMapID}";
+				launchPopup(myUrl,"MonitoringReview");
+			}
 		</script>		 
 	</lams:head>
 	<body class="stripes" onLoad="init()">
Index: lams_tool_larsrc/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r8e090b3ddf269cdffececa4bc55a9333da5b0858 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_larsrc/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 8e090b3ddf269cdffececa4bc55a9333da5b0858)
+++ lams_tool_larsrc/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -59,6 +59,9 @@
 						<c:if test="${groupSummary.allowRating}">
 					    "<fmt:message key="label.rating" />",
 					   	</c:if>
+						<c:if test="${groupSummary.allowComments}">
+					    "<fmt:message key="label.comments" />",
+					   	</c:if>
 					    "<fmt:message key="monitoring.label.actions" />" 
 				],
 			   	colModel:[
@@ -71,6 +74,9 @@
 					<c:if test="${groupSummary.allowRating}">
 					{name:'rating', index:'rating', width:200, align:"center"},
 				   	</c:if>
+					<c:if test="${groupSummary.allowComments}">
+					{name:'comments', index:'comments', width:200, align:"center"},
+				   	</c:if>
 			   		{name:'actions', index:'actions', width:120, align:"center"}		
 			   	],
 			   	// caption: "${groupSummary.sessionName}",
@@ -158,6 +164,18 @@
 				<c:set var="ratingHTML">${ratingHTML}</div></c:set>
 				</c:if>
 				
+				<c:if test="${groupSummary.allowComments}">
+				<c:set var="commentButtonText"><fmt:message key="label.view.comments"/></c:set>
+				<c:choose>
+				<c:when test="${item.allowComments}">
+					<c:set var="commentHTML"><a href="#nogo" onclick="javascript:viewComments(${item.itemUid}, ${groupSummary.sessionId}); return false;">${commentButtonText}</a></c:set>
+				</c:when>
+				<c:otherwise>
+					<c:set var="commentHTML">&nbsp;</c:set>
+				</c:otherwise>
+				</c:choose>
+				</c:if>
+				
    	     		jQuery("#group${groupSummary.sessionId}").addRowData(${i.index + 1}, {
    	   	     		id:		"${i.index + 1}",
    	   	     		itemUid:	"${item.itemUid}",
@@ -168,6 +186,9 @@
 					<c:if test="${groupSummary.allowRating}">
 					rating: '${ratingHTML}',
 				   	</c:if>
+					<c:if test="${groupSummary.allowComments}">
+					comments: '${commentHTML}',
+					</c:if>
    	   	     		actions:	"${changeItemVisibility}"
    	   	   	    });
 	        </c:forEach>
Index: lams_tool_leader/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_leader/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_leader/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
Index: lams_tool_mindmap/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_mindmap/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_mindmap/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
Index: lams_tool_nb/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -rdacc31e9241837ffb98f895d0a25facc3f4e04c4 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_nb/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision dacc31e9241837ffb98f895d0a25facc3f4e04c4)
+++ lams_tool_nb/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
Index: lams_tool_notebook/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_notebook/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_notebook/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
Index: lams_tool_pixlr/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_pixlr/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_pixlr/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
Index: lams_tool_preview/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_preview/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_preview/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
Index: lams_tool_preview/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_preview/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_tool_preview/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,14 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +294,52 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>
Index: lams_tool_sbmt/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r1b24571dc2f9958311c8508f68e20711994418bb -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_sbmt/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1b24571dc2f9958311c8508f68e20711994418bb)
+++ lams_tool_sbmt/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
Index: lams_tool_scratchie/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_scratchie/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_scratchie/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
Index: lams_tool_scribe/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_scribe/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_scribe/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_spreadsheet/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
Index: lams_tool_survey/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_survey/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_survey/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
Index: lams_tool_task/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_task/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_task/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
Index: lams_tool_vote/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_vote/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_vote/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
Index: lams_tool_wiki/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_tool_wiki/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_tool_wiki/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
Index: lams_www/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -r2af3df00f43a845436372dd415da5ce02f466024 -r1bf70a335f5b30a1907ccae506908b05374c6c8c
--- lams_www/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2af3df00f43a845436372dd415da5ce02f466024)
+++ lams_www/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 1bf70a335f5b30a1907ccae506908b05374c6c8c)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolItemId" required="false" rtexprvalue="true"%>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
@@ -11,6 +12,8 @@
 <%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
 <%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
 <%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+<%@ attribute name="embedInAccordian" required="false" rtexprvalue="true"%>
+<%@ attribute name="accordionTitle" required="false" rtexprvalue="true"%>
 
 
 <c:if test="${empty width}">
@@ -38,10 +41,33 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
+<c:if test="${empty embedInAccordian}">
+	<c:set var="embedInAccordian" value="false" />
+</c:if>	
+
+<c:if test="${embedInAccordian}">
+<div class="panel-group" id="accordionComments" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="headingComments">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseComments" aria-expanded="false" aria-controls="collapseComments">
+          	${not empty accordionTitle?accordionTitle:"Comments"}</a>
+      		</span>
+        </div>
+        <div id="collapseComments" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingComments" aria-expanded="false" style="">
+</c:if>
+
 <div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+
+<c:if test="${embedInAccordian}">
+		</div>
+	</div>
+</div>
+</c:if>
+
 <script>
 $(document).ready(function(){
-	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });