Index: assignment-api/api/src/java/org/sakaiproject/assignment/api/model/PeerAssessmentItem.java
===================================================================
--- assignment-api/api/src/java/org/sakaiproject/assignment/api/model/PeerAssessmentItem.java	(revision 133768)
+++ assignment-api/api/src/java/org/sakaiproject/assignment/api/model/PeerAssessmentItem.java	(revision 133769)
@@ -71,4 +71,8 @@
 	public void setSubmitted(boolean submitted) {
 		this.submitted = submitted;
 	}
+	
+	public boolean isDraft(){
+		return !submitted && (getScore() != null || (getComment() != null && !"".equals(getComment().trim())));
+	}
 }
Index: assignment-bundles/resources/assignment.properties
===================================================================
--- assignment-bundles/resources/assignment.properties	(revision 133768)
+++ assignment-bundles/resources/assignment.properties	(revision 133769)
@@ -902,3 +902,10 @@
 peerassessment.restored=Successfully restored review for student's submission
 peerassessment.peerReviewDueDate=Peer review due date:
 peerassessment.peerGradeInfo=You are able to accept or override the averaged peer review grade in this section.  Once this grade is released, this is the grade that will appear in the gradebook.
+peerassessment.submissionReq=Assignment submission required
+peerassessment.notOpen=Not open
+peerassessment.notStarted=Not started
+peerassessment.incomplete=Incomplete
+peerassessment.submitted=Submitted
+peerassessment.student=Student {0}
+peerassessment.draftInProgress=Draft - in progress
\ No newline at end of file
Index: assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
===================================================================
--- assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java	(revision 133768)
+++ assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java	(revision 133769)
@@ -2049,27 +2049,14 @@
 
 		context.put("assignments", assignments.iterator());
 		// allow add assignment?
-		Map<String, Integer> peerAssessmentItemsMap = new HashMap<String, Integer>();
+		Map<String, List<PeerAssessmentItem>> peerAssessmentItemsMap = new HashMap<String, List<PeerAssessmentItem>>();
 		boolean allowAddAssignment = AssignmentService.allowAddAssignment(contextString);
 		if(!allowAddAssignment){
 			//this is the same requirement for displaying the assignment link for students
 			//now lets create a map for peer reviews for each eligible assignment
 			for(Assignment assignment : (List<Assignment>) assignments){
-				if(assignment.getAllowPeerAssessment() && assignment.isPeerAssessmentOpen()){
-					List<PeerAssessmentItem> items = assignmentPeerAssessmentService.getPeerAssessmentItems(assignment.getId(), UserDirectoryService.getCurrentUser().getId());
-					if(items == null || items.size() == 0){
-						//something is wrong here, there are no peer assessments for this user, set to -1 for UI to know
-						peerAssessmentItemsMap.put(assignment.getId(), -1);
-					}else{
-						Integer count = 0;
-						//only count peer review items that the student hasn't submitted
-						for(PeerAssessmentItem item : items){
-							if(!item.isSubmitted()){
-								count++;
-							}
-						}
-						peerAssessmentItemsMap.put(assignment.getId(), count);
-					}
+				if(assignment.getAllowPeerAssessment() && (assignment.isPeerAssessmentOpen() || assignment.isPeerAssessmentClosed())){
+					peerAssessmentItemsMap.put(assignment.getId(), assignmentPeerAssessmentService.getPeerAssessmentItems(assignment.getId(), UserDirectoryService.getCurrentUser().getId()));
 				}
 			}
 		}
Index: assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_student_review_edit.vm
===================================================================
--- assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_student_review_edit.vm	(revision 133768)
+++ assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_student_review_edit.vm	(revision 133769)
@@ -93,7 +93,7 @@
 					<span class="highlight"> -
 					$tlang.getString("gen.reviewing"):&nbsp;
 					#if(!$view_only && $assignment.getPeerAssessmentAnonEval())
-						$tlang.getString("gen.student") #$!anonNumber
+						$tlang.getString("gen.student")
 					#else
 						#set ($submitterNames = "")
 						## replace it with submitter sort names
Index: assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_list_assignments.vm
===================================================================
--- assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_list_assignments.vm	2014-08-01 14:34:41.000000000 +0200
+++ assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_list_assignments.vm	2014-08-01 14:41:27.000000000 +0200
@@ -504,27 +504,12 @@
 								   $!assignment.getStatus()
 								#else								
 									#if ($!submission)
-									                                                                                #if($assignment.isPeerAssessmentOpen())
-									                                                                                        ##student has submitted, check if the assignment is peer assessment
-									                                                                                        ##and if the time is available
-											#set($totalReviews = $peerAssessmentItemsMap.get($assignment.id))
-											#if($totalReviews == -1)
-												##something is wrong here, don't show anything to the user, just show the peer review start date (could be waiting for the job to run)
-												$tlang.getString("peerassessment.reviewStarts") $!assignment.closeTime.toStringLocalFull()
-											#elseif($totalReviews == 0)
-												##user has submitted every review already
-												$tlang.getString("gen.peerreview") ($tlang.getString("gen.subm4"))
-											#else
-												##user still has at least one review to submit
-												<a href="#toolLinkParam("$action" "doEdit_review" "assignmentId=$validator.escapeUrl($assignmentReference)")">$tlang.getString("gen.peerreview") ($totalReviews)</a>
-												&nbsp;($tlang.getString("gen.due")&nbsp;$!assignment.peerAssessmentPeriod.toStringLocalFull())
-											#end
-                                                                                 #elseif ($assignment.isPeerAssessmentPending() && $submission.getSubmitted())
-                                                                                        $tlang.getString("peerassessment.reviewStarts") $!assignment.closeTime.toStringLocalFull()
-                                                                                 #else
-                                                                                         $submission.getStatus()
-                                                                                 #end
-
+										$submission.getStatus()
+										#if ($submission.getSubmitted()) 
+											#if ($assignment.getDueTime() && $submission.getTimeSubmitted() && $submission.getTimeSubmitted().after($assignment.getDueTime()))
+												<span class="highlight">$tlang.getString("gen.late2")</span>
+											#end
+										#end
 									#else
 										$tlang.getString("gen.notsta")
 									#end
@@ -593,6 +578,167 @@
 								</td>
 							#end
 						</tr>
+						<!-- Peer assessment rows -->
+						#if($assignment.getAllowPeerAssessment() && !($allowAddAssignment && $!view.equals('lisofass1')))
+							#set($reviews = $peerAssessmentItemsMap.get($assignment.id))
+							<!-- only show to "students" -->
+							<!-- peer assessment overview row -->
+							<tr>
+								<!-- attachments col -->
+								<td></td>
+								<!-- title col -->
+								<td>
+									<span class="indnt1">
+										$tlang.getString("peerAssessmentName")
+									</span>
+								</td>
+								#if ($!groups && $!allowGradeSubmission)
+									<!-- groups col -->
+									<td></td>
+								#end
+								<!-- status col -->
+								<td>
+									#if ($!submission)
+										#if($assignment.isPeerAssessmentPending())
+											<!-- peer review hasn't opened and user submitted -->
+											#if ($submission.getSubmitted())
+												$tlang.getString("peerassessment.notOpen")
+											#else
+												<!-- user has only submitted a draft, tell the user submission is required to encourage submission (although technically it isn't) -->
+												$tlang.getString("peerassessment.submissionReq")
+											#end
+										#else
+											<!-- peer review is open (or over) and user submitted 
+												status will be "not started", "incomplete", or "submitted"
+											-->
+											
+											#if(!$reviews || $reviews.size() == 0)
+												<!-- something is wrong here, don't show anything to the user, just show not open -->
+												$tlang.getString("peerassessment.notOpen")
+											#else
+												#set($completedReviews = true)
+												#set($anyDraftReviews = false)
+												#set($anyCompleteReviews = false)
+												#foreach ($review in $reviews)
+													#if(!$review.isSubmitted())
+														#set($completedReviews = false)		
+														#if($review.isDraft())
+															#set($anyDraftReviews = true)
+														#end
+													#else
+														#set($anyCompleteReviews = true)	
+													#end
+												#end
+												#if($completedReviews)
+													<!-- all reviews are completed -->
+													$tlang.getString("peerassessment.submitted")
+												#elseif($anyDraftReviews || $anyCompleteReviews)
+													<!-- some are still in draft -->
+													$tlang.getString("peerassessment.incomplete")
+												#else
+													<!-- user hasn't started -->
+													$tlang.getString("peerassessment.notStarted")
+												#end												
+											#end
+										#end
+									#else
+										<!-- submission required -->
+										$tlang.getString("peerassessment.submissionReq")
+									#end
+								</td>
+								<!-- open col -->
+								<td>
+									$!assignment.closeTime.toStringLocalFull()
+								</td>
+								<!-- due col -->
+								<td>
+									$!assignment.peerAssessmentPeriod.toStringLocalFull()
+								</td>
+								<!-- the following are empty columns as place holders -->
+								#if ($!allowGradeSubmission)
+									#if ($!view.equals('lisofass1'))
+									#if ($!showNumSubmissionColumn)
+										<!-- num submissions col -->
+										<td></td>
+									#end
+									#end
+								#end
+								#if ($withGrade && $!allowGradeSubmission)
+									<!-- grade scale col -->
+									<td></td>
+								#end
+								#if ($!allowRemoveAssignment && $!view.equals('lisofass1'))
+									<!-- remove col -->
+									<td></td>
+								#end
+							</tr>
+						
+							<!-- end peer assessment overview row -->
+							<!-- peer assessment items rows->
+							#if ($!submission && $assignment.isPeerAssessmentOpen() && $!reviews)
+								<!-- peer assessment is open and user has submitted, show item details
+								#set ($reviewCount = 0)
+								#foreach ($review in $reviews)
+									#set ($reviewCount = $reviewCount + 1)
+									<tr>
+										<!-- attachments col -->
+										<td></td>
+										<!-- title col -->
+										<td>
+											<span class="indnt2">
+												#if($review.isSubmitted())
+													$tlang.getFormattedMessage("peerassessment.student", $reviewCount)&nbsp;<img src="/library/image/silk/accept.png"/>
+												#else
+													<a href="#toolLinkParam("$action" "doEdit_review" "assignmentId=$validator.escapeUrl($assignmentReference)&submissionId=$validator.escapeUrl($review.getSubmissionId())")">
+														$tlang.getFormattedMessage("peerassessment.student", $reviewCount)
+													</a>
+												#end
+											</span>
+										</td>
+										#if ($!groups && $!allowGradeSubmission)
+											<!-- groups col -->
+											<td></td>
+										#end
+										<!-- status col -->
+										<td>
+											#if($review.isSubmitted())
+												$tlang.getString("peerassessment.submitted")
+											#elseif($review.isDraft())
+												$tlang.getString("peerassessment.draftInProgress")
+											#else
+												$tlang.getString("peerassessment.notStarted")
+											#end
+										</td>
+										<!-- open col -->
+										<td>
+										</td>
+										<!-- due col -->
+										<td>
+										</td>
+										<!-- the following are empty columns as place holders -->
+										#if ($!allowGradeSubmission)
+											#if ($!view.equals('lisofass1'))
+											#if ($!showNumSubmissionColumn)
+												<!-- num submissions col -->
+												<td></td>
+											#end
+											#end
+										#end
+										#if ($withGrade && $!allowGradeSubmission)
+											<!-- grade scale col -->
+											<td></td>
+										#end
+										#if ($!allowRemoveAssignment && $!view.equals('lisofass1'))
+											<!-- remove col -->
+											<td></td>
+										#end
+									</tr>
+								#end
+							#end
+						<!-- End peer assessment items rows->
+						
+						<!-- End Peer assessment rows -->
+						#end
 				#end
 			</table>
 			#if ($!allowRemoveAssignment && $!view.equals('lisofass1'))