Index: lams_tool_task/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r7e5ebaceffd43ff691062c0de86f16125d3c3425 -r125488b240966768429db725f4eaa19c425d8964
--- lams_tool_task/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 7e5ebaceffd43ff691062c0de86f16125d3c3425)
+++ lams_tool_task/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 125488b240966768429db725f4eaa19c425d8964)
@@ -110,7 +110,7 @@
 label.monitoring.summary.title.reflection  =Notebook entry
 label.monitoring.summary.reflection  =Notebook entry
 label.monitoring.tasksummary.task.summary  =Task summary
-label.monitoring.tasksummary.task.required.to.finish  =this task is required to finish this activity
+label.monitoring.tasksummary.task.required.to.finish  =(This task is required to finish this activity.)
 label.monitoring.tasksummary.parent.activity  =Parent task
 label.monitoring.tasksummary.comments.files.enabled  =Comments/files enabled
 label.monitoring.tasksummary.user  =Learner
Index: lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r7e5ebaceffd43ff691062c0de86f16125d3c3425 -r125488b240966768429db725f4eaa19c425d8964
--- lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 7e5ebaceffd43ff691062c0de86f16125d3c3425)
+++ lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 125488b240966768429db725f4eaa19c425d8964)
@@ -110,7 +110,7 @@
 label.monitoring.summary.title.reflection  =Notebook entry
 label.monitoring.summary.reflection  =Notebook entry
 label.monitoring.tasksummary.task.summary  =Task summary
-label.monitoring.tasksummary.task.required.to.finish  =this task is required to finish this activity
+label.monitoring.tasksummary.task.required.to.finish  =(This task is required to finish this activity.)
 label.monitoring.tasksummary.parent.activity  =Parent task
 label.monitoring.tasksummary.comments.files.enabled  =Comments/files enabled
 label.monitoring.tasksummary.user  =Learner
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListUserDAOHibernate.java
===================================================================
diff -u -r83ca314c18ea866bb79570b6e7da25eb8729b3b4 -r125488b240966768429db725f4eaa19c425d8964
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListUserDAOHibernate.java	(.../TaskListUserDAOHibernate.java)	(revision 83ca314c18ea866bb79570b6e7da25eb8729b3b4)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListUserDAOHibernate.java	(.../TaskListUserDAOHibernate.java)	(revision 125488b240966768429db725f4eaa19c425d8964)
@@ -177,7 +177,7 @@
 
 		Long userId = ((Number) element[0]).longValue();
 		String fullName = (String) element[1];
-		boolean isCompleted = element[2] == null ? false : new Boolean(((Byte) element[2]).intValue() == 1);
+		boolean isCompleted = element[2] == null ? false : (Boolean) element[2];
 		Date accessDate = element[3] == null ? null : new Date(((Timestamp) element[3]).getTime());
 
 		TaskListUserDTO userDto = new TaskListUserDTO();
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java
===================================================================
diff -u -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b -r125488b240966768429db725f4eaa19c425d8964
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 125488b240966768429db725f4eaa19c425d8964)
@@ -331,9 +331,24 @@
 	SortedSet<TaskListItem> items = getTaskListItemList(sessionMap);
 	for (TaskListItem item : items) {
 	    if (item != null) {
-		// This flushs user UID info to message if this user is a new user.
-		item.setCreateBy(taskListUser);
-		itemList.add(item);
+		if ( item.getUid() == null ) {
+		    // This flushs user UID info to message if this user is a new user.
+		    item.setCreateBy(taskListUser);
+		    itemList.add(item);
+		} else {
+		    // Do not update if it is not null otherwise Edit Activity will overwrite the learner id for learner entered tasks
+		    // But taskListUser & .getCreatedBy() are a stale lazy loaded object so need to the real things from the session
+		    TaskListItem itemPO = service.getTaskListItemByUid(item.getUid());
+		    if ( itemPO != null ) {
+			updateTaskListItemFromSession(itemPO, item);
+			itemList.add(itemPO);
+		    } else {
+			// something weird happened. Uid exists but can't find the task. Make it an authored task
+			item.setCreateBy(taskListUser);
+			item.setCreateByAuthor(true);
+			itemList.add(item);
+		    }
+		}
 	    }
 	}
 	taskListPO.setTaskListItems(itemList);
@@ -753,6 +768,30 @@
     }
 
     /**
+     * Extract session request version of a taskListItem update the DB version of the taskListItem.
+     * @throws TaskListException
+     */
+    private void updateTaskListItemFromSession(TaskListItem itemPO, TaskListItem itemFromSession) throws Exception {
+	/*
+	 * BE CAREFUL: This method will copy necessary info from session to an existing TaskListItem instance. It
+	 * gets all info EXCEPT uid, createDate, createBy, createByAuthor, attachments and comments which need be left the same
+	 * as they were previously. If you change them then LiveEdit will change Learner created items.
+	 */
+
+	itemPO.setTitle(itemFromSession.getTitle());
+	itemPO.setDescription(itemFromSession.getDescription());
+	itemPO.setSequenceId(itemFromSession.getSequenceId());
+	itemPO.setRequired(itemFromSession.isRequired());
+	itemPO.setCommentsAllowed(itemFromSession.isCommentsAllowed());
+	itemPO.setCommentsRequired(itemFromSession.isCommentsRequired());
+	itemPO.setFilesAllowed(itemFromSession.isFilesAllowed());
+	itemPO.setFilesRequired(itemFromSession.isFilesRequired());
+	itemPO.setCommentsFilesAllowed(itemFromSession.isCommentsFilesAllowed());
+	itemPO.setShowCommentsToAll(itemFromSession.getShowCommentsToAll());
+	itemPO.setChildTask(itemFromSession.isChildTask());
+	itemPO.setParentTaskName(itemFromSession.getParentTaskName());
+    }
+    /**
      * Vaidate taskList item regards to their type (url/file/learning object/website zip file)
      *
      * @param itemForm
Index: lams_tool_task/web/pages/monitoring/itemsummary.jsp
===================================================================
diff -u -r0d14800c7ef0085f17e151c167408984eb55f1ff -r125488b240966768429db725f4eaa19c425d8964
--- lams_tool_task/web/pages/monitoring/itemsummary.jsp	(.../itemsummary.jsp)	(revision 0d14800c7ef0085f17e151c167408984eb55f1ff)
+++ lams_tool_task/web/pages/monitoring/itemsummary.jsp	(.../itemsummary.jsp)	(revision 125488b240966768429db725f4eaa19c425d8964)
@@ -94,23 +94,18 @@
 </lams:head>
 	
 <body class="stripes">
-	<div id="content">
 
-		<h2>
-			<fmt:message key="label.monitoring.tasksummary.task.summary" />
-		</h2>
+	<c:set var="title"><fmt:message key="label.monitoring.tasksummary.task.summary" /></c:set>
+	<lams:Page type="admin" title="${title}">
+
+		<h4><c:out value="${item.title}" escapeXml="true"/></h4>
 				
-		<div>
-			<c:out value="${item.title}" escapeXml="true"/>
-				
-			<c:if test="${item.required}">
-					(<fmt:message key="label.monitoring.tasksummary.task.required.to.finish" />)
-			</c:if>				
-		</div>
-		<br/>
-				
+		<c:if test="${item.required}">
+		<div><em><fmt:message key="label.monitoring.tasksummary.task.required.to.finish" /></em></div>
+		</c:if>				
+
 		<c:if test="${item.childTask || item.commentsFilesAllowed || item.commentsAllowed || item.filesAllowed}">
-			<ul>
+			<ul class="list-unstyled">
 				<c:if test="${item.childTask}">
 					<li>
 						(<fmt:message key="label.monitoring.tasksummary.parent.activity" />: ${item.parentTaskName})
@@ -152,30 +147,40 @@
 				</c:if>
 			</ul>
 		</c:if>
-		<br>
-		<br>
 			
+			
+		<c:if test="${sessionMap.isGroupedActivity}">
+			<div class="panel-group" id="accordionSessions" role="tablist" aria-multiselectable="true"> 
+		</c:if>
+
 		<c:forEach var="sessionDto" items="${sessionDtos}" varStatus="status">
+
+		<c:if test="${sessionMap.isGroupedActivity}">	
+		    <div class="panel panel-default" >
+		       <div class="panel-heading" id="heading${sessionDto.sessionId}">
+		       	<span class="panel-title collapsable-icon-left">
+		       	<a class="${status.first ? '' : 'collapsed'}" role="button" data-toggle="collapse" href="#collapse${sessionDto.sessionId}" 
+						aria-expanded="${status.first ? 'false' : 'true'}" aria-controls="collapse${sessionDto.sessionId}" >
+				<fmt:message key="monitoring.label.group" />&nbsp;${sessionDto.sessionName}</a>
+				</span>
+		       </div>
+		       
+		       <div id="collapse${sessionDto.sessionId}" class="panel-collapse collapse ${status.first ? 'in' : ''}" role="tabpanel" aria-labelledby="heading${sessionDto.sessionId}">
+		</c:if>
 		
-			<div style="padding-left: 30px; <c:if test='${! status.last}'>padding-bottom: 30px;</c:if><c:if test='${ status.last}'>padding-bottom: 15px;</c:if> ">
-				<c:if test="${sessionMap.isGroupedActivity}">
-					<div style="padding-bottom: 5px; font-size: small;">
-						<B><fmt:message key="monitoring.label.group" /></B> ${sessionDto.sessionName}
-					</div>
-				</c:if>
-				<c:if test="${sessionMap.isGroupedActivity}">
-					<h1>
-						<fmt:message key="monitoring.label.group" /> ${groupSummary.sessionName}
-					</h1>
-				</c:if>
-					
-				<table id="group${sessionDto.sessionId}"></table>
-				<div id="pager-${sessionDto.sessionId}"></div>
-			</div>
+		<table id="group${sessionDto.sessionId}"></table>
+		<div id="pager-${sessionDto.sessionId}"></div>
+
+
+		<c:if test="${sessionMap.isGroupedActivity}">
+			</div> <!-- end collapse area  -->
+			</div> <!-- end collapse panel  -->
+		</c:if>
+		${ !sessionMap.isGroupedActivity || ! status.last ? '<div class="voffset5">&nbsp;</div>' :  ''}
 							
 		</c:forEach>
 
-	</div>
+	</lams:Page>
 	<!--closes content-->
 	
 	<div id="footer">