Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityArchiveGridRowDTO.java
===================================================================
diff -u -r308a211e76761aa819633d3f72c817671e01739a -r693e7c3c9dae87bce413e123e3e45612ca604087
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityArchiveGridRowDTO.java	(.../GBActivityArchiveGridRowDTO.java)	(revision 308a211e76761aa819633d3f72c817671e01739a)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityArchiveGridRowDTO.java	(.../GBActivityArchiveGridRowDTO.java)	(revision 693e7c3c9dae87bce413e123e3e45612ca604087)
@@ -38,15 +38,26 @@
 
     @Override
     public ArrayList<String> toStringArray(GBGridView view) {
-	ArrayList<String> ret = new ArrayList<String>();
-	ret.add(id);
-	ret.add(status);
-	ret.add(timeTaken != null ? convertTimeToString(timeTaken) : CELL_EMPTY);
-	ret.add(startDate != null ? convertDateToString(startDate, null) : CELL_EMPTY);
-	ret.add(finishDate != null ? convertDateToString(finishDate, null) : CELL_EMPTY);
-	ret.add(feedback);
-	ret.add(lessonMark.toString());
-	ret.add(mark != null ? GradebookUtil.niceFormatting(mark) : CELL_EMPTY);
+	ArrayList<String> ret = new ArrayList<>();
+	if (view == GBGridView.MON_ACTIVITY) {
+	    ret.add(id);
+	    ret.add(feedback);
+	    ret.add(lessonMark.toString());
+	    ret.add(status);
+	    ret.add(timeTaken != null ? convertTimeToString(timeTaken) : CELL_EMPTY);
+	    ret.add(startDate != null ? convertDateToString(startDate, null) : CELL_EMPTY);
+	    ret.add(finishDate != null ? convertDateToString(finishDate, null) : CELL_EMPTY);
+	    ret.add(mark != null ? GradebookUtil.niceFormatting(mark) : CELL_EMPTY);
+	} else {
+	    ret.add(id);
+	    ret.add(status);
+	    ret.add(timeTaken != null ? convertTimeToString(timeTaken) : CELL_EMPTY);
+	    ret.add(startDate != null ? convertDateToString(startDate, null) : CELL_EMPTY);
+	    ret.add(finishDate != null ? convertDateToString(finishDate, null) : CELL_EMPTY);
+	    ret.add(feedback);
+	    ret.add(lessonMark.toString());
+	    ret.add(mark != null ? GradebookUtil.niceFormatting(mark) : CELL_EMPTY);
+	}
 
 	return ret;
     }
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
===================================================================
diff -u -r471b903caa3365758fbdec0a22440b1b0b3f2947 -r693e7c3c9dae87bce413e123e3e45612ca604087
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java	(.../GradebookAction.java)	(revision 471b903caa3365758fbdec0a22440b1b0b3f2947)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java	(.../GradebookAction.java)	(revision 693e7c3c9dae87bce413e123e3e45612ca604087)
@@ -136,7 +136,7 @@
 	    }
 	}
 
-	List<GradebookGridRowDTO> gradebookActivityDTOs = new ArrayList<GradebookGridRowDTO>();
+	List<GradebookGridRowDTO> gradebookActivityDTOs = new ArrayList<>();
 
 	// Get the user gradebook list from the db
 	// A slightly different list is needed for userview or activity view
@@ -174,19 +174,19 @@
 	// Getting userID param, it is passed differently from different views
 	UserDTO currentUserDTO = getUser();
 	Integer userID = null;
-	if (view == GBGridView.MON_USER) {
+	if (view == GBGridView.MON_USER || view == GBGridView.MON_ACTIVITY) {
 	    userID = WebUtil.readIntParam(request, GradebookConstants.PARAM_USERID);
 	} else if (view == GBGridView.LRN_ACTIVITY) {
 	    if (currentUserDTO != null) {
 		userID = currentUserDTO.getUserID();
 	    }
 	}
 
-	List<GradebookGridRowDTO> gradebookActivityDTOs = new ArrayList<GradebookGridRowDTO>();
+	List<GradebookGridRowDTO> gradebookActivityDTOs = new ArrayList<>();
 
 	// Get the user gradebook list from the db
 	// A slightly different list is needed for userview or activity view
-	if ((view == GBGridView.MON_USER) || (view == GBGridView.LRN_ACTIVITY)) {//2nd level && from personal marks page (2nd level or 1st)
+	if ((view == GBGridView.MON_USER) || (view == GBGridView.LRN_ACTIVITY) || (view == GBGridView.MON_ACTIVITY)) {//2nd level && from personal marks page (2nd level or 1st)
 	    gradebookActivityDTOs = getGradebookService().getGBActivityArchiveRowsForLearner(activityID, userID,
 		    currentUserDTO.getTimeZone());
 	}
@@ -317,7 +317,7 @@
 	}
 
 	// Get the user gradebook list from the db
-	List<GBUserGridRowDTO> gradebookUserDTOs = new ArrayList<GBUserGridRowDTO>();
+	List<GBUserGridRowDTO> gradebookUserDTOs = new ArrayList<>();
 
 	int totalUsers = 0;
 	// if leesonID is specified show results based on lesson
Index: lams_gradebook/web/gradebookMonitor.jsp
===================================================================
diff -u -r54a14306d3b36e6da9aedbaa6700c91048ebc53a -r693e7c3c9dae87bce413e123e3e45612ca604087
--- lams_gradebook/web/gradebookMonitor.jsp	(.../gradebookMonitor.jsp)	(revision 54a14306d3b36e6da9aedbaa6700c91048ebc53a)
+++ lams_gradebook/web/gradebookMonitor.jsp	(.../gradebookMonitor.jsp)	(revision 693e7c3c9dae87bce413e123e3e45612ca604087)
@@ -404,7 +404,7 @@
 									     colModel: [
 									       	{name:'id', index:'id',  sortable:false, editable: false ,width:140, align:"right"},
 											{name:'status',  index:'status', sortable:false, editable:false, width:30, align:"center"},
-											{name:'timeTaken',index:'timeTaken', sortable:true, editable: false, width:50, title : true, align:"center",
+											{name:'timeTaken',index:'timeTaken', sortable:true, editable: false, width:52, title : true, align:"center",
 												cellattr: function(rowID, val, rawObject, cm, rdata) {
 													if (rdata.startDate != "-") {
 														return 'title="' + rdata.startDate + ' - ' + rdata.finishDate + '"';
@@ -614,30 +614,36 @@
 										 autoencode:false,
 									     datatype: "xml",
 									     url: "<lams:LAMSURL />/gradebook/gradebook.do?dispatch=getActivityArchiveGridData&lessonID=${lessonDetails.lessonID}&activityID="
-										      + activityID + "&view=monUserView&userID=" + userID,
+										      + activityID + "&view=monActivityView&userID=" + userID,
 									     height: "100%",
 									     autowidth:true,
 									     cellEdit:false,
 									     pager: false,
 									     colNames: [
 									    	"<fmt:message key="gradebook.columntitle.attempt"/>",
+									     	"<fmt:message key="gradebook.columntitle.activityFeedback"/>", 
+									     	"<fmt:message key="gradebook.columntitle.lesson.mark"/>",
 									     	"<fmt:message key="gradebook.columntitle.progress"/>",
 									     	"<fmt:message key="gradebook.columntitle.timeTaken"/>", 
 									    	"<fmt:message key="gradebook.columntitle.startDate"/>", 
 									    	"<fmt:message key="gradebook.columntitle.completeDate"/>", 
-									     	"<fmt:message key="gradebook.columntitle.activityFeedback"/>", 
-									     	"<fmt:message key="gradebook.columntitle.lesson.mark"/>",
 									     	"<fmt:message key="gradebook.columntitle.mark"/>"
 									     ],
 									     colModel: [
-									       	{name:'id', index:'id',  sortable:false, editable: false ,width:70, align:"right"},
-											{name:'status',  index:'status', sortable:false, editable:false, width:50, align:"center"},
-											{name:'timeTaken',index:'timeTaken', sortable:false, editable: false, width:80, align:"center"},
-										    {name:'startDate',index:'startDate', sortable:false, editable:false, search:false, width:85, align:"left"},
-										    {name:'finishDate',index:'finishDate', sortable:false, editable:false, search:false, width:85, align:"left"},
-											{name:'feedback',  index:'feedback', sortable:false, editable: false, width:200, hidden:true},
-											{name:'lessonMark',  index:'lessonMark', sortable:false, editable: false, width:80, align:"center" },
-											{name:'mark', index:'mark', sortable:false, editable: false, width:50, align:"center" }
+									       	{name:'id', index:'id',  sortable:false, editable: false, align:"right"},
+											{name:'feedback',  index:'feedback', sortable:false, editable: false, hidden:true},
+											{name:'lessonMark',  index:'lessonMark', sortable:false, editable: false,width: 180, align:"center" },
+											{name:'status',  index:'status', sortable:false, editable:false, width:65, align:"center"},
+											{name:'timeTaken',index:'timeTaken', sortable:true, editable: false, width:112, title : true, align:"center",
+												cellattr: function(rowID, val, rawObject, cm, rdata) {
+													if (rdata.startDate != "-") {
+														return 'title="' + rdata.startDate + ' - ' + rdata.finishDate + '"';
+													}
+										    	}
+									    	},
+										    {name:'startDate',index:'startDate', width:0, hidden: true},
+										    {name:'finishDate',index:'finishDate', width:0, hidden: true},
+											{name:'mark', index:'mark', sortable:false, editable: false, width:108, align:"center" }
 									     ],
 									     loadError: function(xhr,st,err) {
 									    	jQuery("#"+subgrid_table_id).clearGridData();