Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java,v
diff -u -r1.7 -r1.8
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java	6 Sep 2012 10:19:19 -0000	1.7
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java	6 Jun 2013 19:25:58 -0000	1.8
@@ -28,6 +28,7 @@
 import java.util.Set;
 
 import org.lamsfoundation.lams.gradebook.util.GBGridView;
+import org.lamsfoundation.lams.gradebook.util.GradebookUtil;
 import org.lamsfoundation.lams.learningdesign.CompetenceMapping;
 import org.lamsfoundation.lams.learningdesign.ToolActivity;
 
@@ -107,8 +108,7 @@
 	    ret.add(startDate != null ? convertDateToString(startDate, DEFAULT_DATE_FORMAT) : CELL_EMPTY);
 	    ret.add(timeTaken != null ? convertTimeToString(timeTaken) : CELL_EMPTY);
 	    ret.add(feedback);
-	    
-	    ret.add(markToString());
+	    ret.add(mark != null ? GradebookUtil.niceFormatting(mark) : CELL_EMPTY);
 
 	} else if (view == GBGridView.MON_ACTIVITY) {
 	    
@@ -123,19 +123,17 @@
 	    
 	    ret.add((averageTimeTaken != null) ? convertTimeToString(averageTimeTaken) : CELL_EMPTY);
 	    ret.add(competences);
+	    ret.add(mark != null ? GradebookUtil.niceFormatting(mark) : CELL_EMPTY);
 	    
-	    
-	    ret.add(averageMarkToString());
 	} else if (view == GBGridView.LRN_ACTIVITY) {
 	    ret.add(rowName);
 	    ret.add(status);
 	    ret.add(feedback);
 	    ret.add((averageTimeTaken != null) ? convertTimeToString(averageTimeTaken) : CELL_EMPTY);
 	    ret.add((timeTaken != null) ? convertTimeToString(timeTaken) : CELL_EMPTY);
-	    ret.add(averageMarkToString()); 
+	    ret.add(averageMark != null ? GradebookUtil.niceFormatting(averageMark) : CELL_EMPTY); 
+	    ret.add(mark != null ? GradebookUtil.niceFormatting(mark) : CELL_EMPTY);  
 	    
-	    
-	    ret.add(markToString()); 
 	}
 	
 	return ret;
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java,v
diff -u -r1.3 -r1.4
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java	6 Sep 2012 10:19:20 -0000	1.3
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java	6 Jun 2013 19:25:58 -0000	1.4
@@ -26,6 +26,7 @@
 import java.util.ArrayList;
 
 import org.lamsfoundation.lams.gradebook.util.GBGridView;
+import org.lamsfoundation.lams.gradebook.util.GradebookUtil;
 
 public class GBLessonGridRowDTO extends GradebookGridRowDTO {
 
@@ -61,7 +62,7 @@
 	    ret.add(subGroup);
 	    ret.add(startDate);
 	    ret.add((averageTimeTaken != null && averageTimeTaken != 0) ? convertTimeToString(averageTimeTaken) : CELL_EMPTY);
-	    ret.add((averageMark != null) ? averageMark.toString() : CELL_EMPTY);
+	    ret.add((averageMark != null) ? GradebookUtil.niceFormatting(averageMark) : CELL_EMPTY);
 	    
 	} else if ((view == GBGridView.LRN_COURSE) || (view == GBGridView.MON_USER)) {
 	    if (gradebookLearnerURL != null && gradebookLearnerURL.length() != 0) {
@@ -77,8 +78,8 @@
 	    ret.add((finishDate != null) ? finishDate : CELL_EMPTY);
 	    ret.add((averageTimeTaken != null && averageTimeTaken != 0) ? toItalic(convertTimeToString(averageTimeTaken)) : CELL_EMPTY);
 	    ret.add((timeTaken != null) ? convertTimeToString(timeTaken) : CELL_EMPTY);
-	    ret.add((averageMark != null) ? toItalic(averageMark.toString()) : CELL_EMPTY);
-	    ret.add((mark != null) ? mark.toString() : CELL_EMPTY);
+	    ret.add((averageMark != null) ? toItalic(GradebookUtil.niceFormatting(averageMark)) : CELL_EMPTY);
+	    ret.add((mark != null) ? GradebookUtil.niceFormatting(mark) : CELL_EMPTY);
 	    
 	}
 	return ret;
@@ -132,5 +133,4 @@
         this.finishDate = finishDate;
     }
     
-    
 }
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java,v
diff -u -r1.9 -r1.10
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java	6 Sep 2012 10:19:20 -0000	1.9
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java	6 Jun 2013 19:25:58 -0000	1.10
@@ -27,6 +27,7 @@
 import java.util.Date;
 
 import org.lamsfoundation.lams.gradebook.util.GBGridView;
+import org.lamsfoundation.lams.gradebook.util.GradebookUtil;
 import org.lamsfoundation.lams.usermanagement.User;
 
 public class GBUserGridRowDTO extends GradebookGridRowDTO {
@@ -63,9 +64,8 @@
 	    ret.add(status);
 	    ret.add((timeTaken != null) ? convertTimeToString(timeTaken) : CELL_EMPTY);
 	    ret.add(feedback);
-	    //ret.add((mark != null) ? mark.toString() : CELL_EMPTY);
-	    ret.add(markToString());
-	    
+	    ret.add((mark != null) ? GradebookUtil.niceFormatting(mark) : CELL_EMPTY);
+	    	    
 	} else if (view == GBGridView.MON_ACTIVITY){
 	    
 	    ret.add(marksAvailable != null ? marksAvailable.toString() : "");
@@ -80,16 +80,14 @@
 	    ret.add((timeTaken != null) ? convertTimeToString(timeTaken) : CELL_EMPTY);
 	    ret.add((output != null) ? output.toString() : CELL_EMPTY);
 	    ret.add(feedback);
-	    //ret.add((mark != null) ? mark.toString() : CELL_EMPTY);
-	    ret.add(markToString());
+	    ret.add((mark != null) ? GradebookUtil.niceFormatting(mark) : CELL_EMPTY);
 	    
 	} else if (view == GBGridView.MON_COURSE){
 	    ret.add(rowName);
 	    ret.add(status);
 	    ret.add((timeTaken != null) ? convertTimeToString(timeTaken) : CELL_EMPTY);
 	    ret.add(feedback);
-	    //ret.add((mark != null) ? mark.toString() : CELL_EMPTY);
-	    ret.add(markToString());
+	    ret.add((mark != null) ? GradebookUtil.niceFormatting(mark) : CELL_EMPTY);
 	}
 
 	return ret;
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java,v
diff -u -r1.7 -r1.8
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java	20 Dec 2012 15:07:31 -0000	1.7
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java	6 Jun 2013 19:25:58 -0000	1.8
@@ -27,6 +27,7 @@
 import java.io.OutputStream;
 import java.io.StringWriter;
 import java.text.SimpleDateFormat;
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
@@ -176,7 +177,15 @@
 
 	return xml;
     }
-
+    
+    public static String niceFormatting(Double mark) {
+    	
+    	String markStr = new DecimalFormat("##0.00").format(mark);
+    	return markStr;
+    	
+    }
+    
+    
     private static Document getDocument() throws ParserConfigurationException {
 	DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
 	DocumentBuilder builder = factory.newDocumentBuilder();
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java,v
diff -u -r1.7 -r1.8
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java	18 Feb 2013 13:17:29 -0000	1.7
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java	6 Jun 2013 19:25:58 -0000	1.8
@@ -362,7 +362,7 @@
 
     	if (lesson != null && learner != null) {
     	    GradebookUserLesson lessonMark = gradebookService.getGradebookUserLesson(lessonID, userID);
-    	    writeResponse(response, CONTENT_TYPE_TEXT_PLAIN, ENCODING_UTF8, lessonMark.getMark().toString());
+    	    writeResponse(response, CONTENT_TYPE_TEXT_PLAIN, ENCODING_UTF8, GradebookUtil.niceFormatting(lessonMark.getMark()));
     	} else {
     	    // Grid will handle error, just log and return null
     	    logger.error("Error: request for course gradebook data with null user or lesson. lessonID: " + lessonID);
@@ -406,7 +406,7 @@
     	    Double averageMark = gradebookService.getAverageMarkForActivity(activityID, groupID);
     	    
     	    if (averageMark != null) {
-    		writeResponse(response, CONTENT_TYPE_TEXT_PLAIN, ENCODING_UTF8, averageMark.toString());
+    		writeResponse(response, CONTENT_TYPE_TEXT_PLAIN, ENCODING_UTF8, GradebookUtil.niceFormatting(averageMark));
     	    } else {
     		writeResponse(response, CONTENT_TYPE_TEXT_PLAIN, ENCODING_UTF8, GradebookConstants.CELL_EMPTY);
     	    }
@@ -439,7 +439,7 @@
     	    Double averageMark = gradebookService.getAverageMarkForLesson(lessonID);
     	    
     	    if (averageMark != null) {
-    		writeResponse(response, CONTENT_TYPE_TEXT_PLAIN, ENCODING_UTF8, averageMark.toString());
+    		writeResponse(response, CONTENT_TYPE_TEXT_PLAIN, ENCODING_UTF8, GradebookUtil.niceFormatting(averageMark));
     	    } else {
     		writeResponse(response, CONTENT_TYPE_TEXT_PLAIN, ENCODING_UTF8, GradebookConstants.CELL_EMPTY);
     	    }