diff --git a/pom.xml b/pom.xml
index 1243ccf..8f7e4a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -232,7 +232,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>gwt-maven-plugin</artifactId>
-				<version>2.4.0</version>
+				<version>${gwtVersion}</version>
 				<executions>
 					<execution>
 						<goals>
@@ -241,7 +241,7 @@
 					</execution>
 				</executions>
 				<configuration>
-					<runTarget>Messages.html</runTarget>
+					<runTarget>ReportGenerator.html</runTarget>
 					<hostedWebapp>${webappDirectory}</hostedWebapp>
 				</configuration>
 			</plugin>
diff --git a/src/main/resources/org/gcube/portlets/user/reportgenerator/ReportGenerator.gwt.xml b/src/main/resources/org/gcube/portlets/user/reportgenerator/ReportGenerator.gwt.xml
index ebf9a7e..ddc425c 100644
--- a/src/main/resources/org/gcube/portlets/user/reportgenerator/ReportGenerator.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/reportgenerator/ReportGenerator.gwt.xml
@@ -3,20 +3,17 @@
 
 	<!-- Inherit the core Web Toolkit stuff. -->
 	<inherits name='com.google.gwt.user.User' />
-	
-	
-	<!-- To Comment out -->
-<!-- 	<set-property name="user.agent" value="gecko1_8" /> -->
-	
-	<inherits name='org.gcube.portlets.widgets.guidedtour.GuidedTour' />
-	<inherits name='org.gcube.portlets.d4sreporting.common.Reporting' />
-		<inherits name='org.gcube.portlets.user.workspace.lighttree.WorkspacePortletLightTree' />
-	<inherits name='org.gcube.portlets.user.gcubewidgets.WidgetFactory' />
-	<inherits name='com.extjs.gxt.ui.GXT' />
-	<inherits name='com.extjs.gxt.themes.Themes' />
-	<inherits name='org.gcube.portlets.user.workspace.WorkspaceTree' />
 
+
+	<!-- To Comment out -->
+	<!-- <set-property name="user.agent" value="gecko1_8" /> -->
 	<inherits name='org.gcube.portlets.widgets.exporter.Report_exporter_widget' />
+	<inherits name='org.gcube.portlets.widgets.guidedtour.GuidedTour' />
+	<inherits name='org.gcube.portlets.widgets.lighttree.WorkspacePortletLightTree' />
+	<inherits name='org.gcube.portlets.user.gcubewidgets.WidgetFactory' />
+	<inherits name='org.gcube.portlets.d4sreporting.common.Reporting' />
+	<inherits name='com.extjs.gxt.ui.GXT' />
+	<inherits name='org.gcube.portlets.user.workspace.WorkspaceTree' />
 
 	<!-- Specify the app entry point class. -->
 	<entry-point