diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/dialog/CommentDialog.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/dialog/CommentDialog.java
index 33eed62..3ab5386 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/dialog/CommentDialog.java
+++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/dialog/CommentDialog.java
@@ -1,10 +1,12 @@
 package org.gcube.portlets.user.reportgenerator.client.dialog;
 
 import org.gcube.portlets.d4sreporting.common.client.ImageConstants;
+import org.gcube.portlets.d4sreporting.common.client.uicomponents.resources.Images;
 import org.gcube.portlets.user.reportgenerator.client.events.AddCommentEvent;
 import org.gcube.portlets.user.reportgenerator.client.events.RemovedUserCommentEvent;
 import org.gcube.portlets.user.reportgenerator.client.targets.ReportTextArea;
 
+import com.google.gwt.core.client.GWT;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.event.shared.HandlerManager;
@@ -21,7 +23,7 @@ public class CommentDialog extends DialogBox {
 	VerticalPanel mainPanel = new VerticalPanel();
 	AbsolutePanel header = new AbsolutePanel();
 	TextArea area;
-
+	Images images = GWT.create(Images.class);
 	public CommentDialog(final HandlerManager eventBus, final ReportTextArea source, final String username, final String previousComment, int areaHeight) {
 		super(true);
 		setStyleName("comment-popup");
@@ -39,7 +41,7 @@ public class CommentDialog extends DialogBox {
 		setSize(PANEL_WIDTH+"px", "100px");
 		header.setPixelSize(PANEL_WIDTH, 15);
 		final Image enterImage = new Image(ImageConstants.IMAGE_ARROW_ENTER);
-		final Image closeImage = new Image(ImageConstants.IMAGE_CLOSE_15x15);
+		final Image closeImage = new Image(images.close());
 		final Image binImage = new Image(ImageConstants.IMAGE_BIN);
 		closeImage.setStyleName("selectable");
 		binImage.setStyleName("selectable");
diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateModel.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateModel.java
index 02c0cf4..03bf588 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateModel.java
+++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateModel.java
@@ -276,7 +276,7 @@ public class TemplateModel {
 		this.templateName = toLoad.getTemplateName(); 
 		this.pageWidth = toLoad.getPageWidth();
 		this.pageHeight = toLoad.getPageHeight();
-		this.currentPage = 1;
+		this.currentPage = toLoad.getCurrPage();
 		this.totalPages = toLoad.getTotalPages();
 		this.marginLeft = toLoad.getMarginLeft();
 		this.marginRight = toLoad.getMarginRight();
diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java
index 2256a09..6552a3a 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java
@@ -1093,7 +1093,7 @@ public class ReportServiceImpl  extends RemoteServiceServlet implements ReportSe
 			return d4Session.getAttribute(CURRENT_REPORT_ID_ATTRIBUTE).toString();		
 	}
 	/**
-	 * used to save  the report in the same basket	 *
+	 * used to save  the report in the same folder	 *
 	 */
 	public void saveReport() {
 		Workspace root = null;
@@ -1135,7 +1135,7 @@ public class ReportServiceImpl  extends RemoteServiceServlet implements ReportSe
 
 
 	/**
-	 * @param basketidToSaveIn .
+	 * @param save a report in another folder .
 	 * 
 	 */
 	public void saveReport(String folderid, String newname) {
diff --git a/src/main/webapp/images/comment.gif b/src/main/webapp/images/comment.gif
index 49c4c8c..04f1667 100644
Binary files a/src/main/webapp/images/comment.gif and b/src/main/webapp/images/comment.gif differ
diff --git a/src/main/webapp/images/comment.jpg b/src/main/webapp/images/comment.jpg
new file mode 100644
index 0000000..26a3926
Binary files /dev/null and b/src/main/webapp/images/comment.jpg differ