diff --git a/distro/changelog.xml b/distro/changelog.xml
index f529e41..7b6b166 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,8 @@
 <ReleaseNotes>	
+	<Changeset component="org.gcube.portlets-user.report-generator-portlet.5-0-0"
+		date="2015-09-29">
+		<Change>Replaced the Workspace light tree  with workspace explorer #804</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets-user.report-generator-portlet.4-13-0"
 		date="2015-07-03">
 		<Change>Ported to GWT 2.7.0</Change>
diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Headerbar.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Headerbar.java
index 7098caa..5e50732 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Headerbar.java
+++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Headerbar.java
@@ -13,10 +13,10 @@ import org.gcube.portlets.user.reportgenerator.client.dialog.PagePropertiesDialo
 import org.gcube.portlets.user.reportgenerator.client.model.ExportManifestationType;
 import org.gcube.portlets.user.reportgenerator.client.model.TemplateModel;
 import org.gcube.portlets.user.reportgenerator.shared.VMETypeIdentifier;
-import org.gcube.portlets.widgets.wsexplorer.shared.*;
 import org.gcube.portlets.widgets.wsexplorer.client.notification.WorkspaceExplorerSelectNotification.WorskpaceExplorerSelectNotificationListener;
 import org.gcube.portlets.widgets.wsexplorer.client.select.WorkspaceExplorerSelectDialog;
-import org.gcube.portlets.widgets.wsexplorer.shared.FilterCriteria;
+import org.gcube.portlets.widgets.wsexplorer.shared.Item;
+import org.gcube.portlets.widgets.wsexplorer.shared.ItemType;
 
 import com.extjs.gxt.ui.client.widget.MessageBox;
 import com.google.gwt.core.client.GWT;
@@ -159,7 +159,7 @@ public class Headerbar extends Composite{
 		captionPanel.setWidth("100%");
 
 		HorizontalPanel pageHandlerPanel = new HorizontalPanel();
-		pageHandlerPanel.setHeight("24");
+		pageHandlerPanel.setHeight("24px");
 		pageHandlerPanel.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE);
 
 		captionPanel.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_CENTER);
@@ -167,8 +167,8 @@ public class Headerbar extends Composite{
 		mainLayout.add(pageHandlerPanel);
 		mainLayout.setCellHorizontalAlignment(menuBar, HasHorizontalAlignment.ALIGN_LEFT);
 		mainLayout.setCellHorizontalAlignment(captionPanel, HasHorizontalAlignment.ALIGN_LEFT);
-		mainLayout.setCellWidth(menuBar, "200");
-		mainLayout.setCellWidth(pageHandlerPanel, "200");
+		mainLayout.setCellWidth(menuBar, "200px");
+//		mainLayout.setCellWidth(pageHandlerPanel, "200");
 		initWidget(mainLayout);
 	}
 
diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/ReportGenerator.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/ReportGenerator.java
index 264dcde..7d26542 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/ReportGenerator.java
+++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/ReportGenerator.java
@@ -87,7 +87,7 @@ public class ReportGenerator implements EntryPoint {
 	public void onModuleLoad() {
 				singleton = this;
 				presenter = new Presenter();
-				mainLayout.setWidth("100%");
+				mainLayout.setWidth("95%");
 				mainLayout.setHeight("100%");
 				//
 				workSpacePanel = new WorkspacePanel(presenter);
@@ -132,30 +132,30 @@ public class ReportGenerator implements EntryPoint {
 				// Add image and button to the RootPanel
 				RootPanel.get("ReportGeneratorDIV").add(mainLayout);
 		
-				int scrollerWidth = Window.getClientWidth()- TEMPLATE_LEFT - 30;
-				bottomScrollerPanel.setPixelSize(scrollerWidth, 1000);
-		
-				if ( Window.getClientWidth() < 1070 ) {
-					int scrollerWidth2 = Window.getClientWidth()- TEMPLATE_LEFT;
-					bottomScrollerPanel.setPixelSize(scrollerWidth2, 1000);
-				}
-		
-				Window.addResizeHandler(new ResizeHandler() {			
-					public void onResize(ResizeEvent event) {
-						int scrollerHeight = event.getHeight() - bottomScrollerPanel.getAbsoluteTop();
-						if (scrollerHeight < toolBoxPanel.getTreePanelHeight())
-							scrollerHeight = toolBoxPanel.getTreePanelHeight(); 
-						int scrollerWidth = Window.getClientWidth()- TEMPLATE_LEFT - 30;
-						bottomScrollerPanel.setPixelSize(scrollerWidth , 1000);	
-		
-		
-						if ( Window.getClientWidth() < 1060 ) {
-							int scrollerWidth2 = Window.getClientWidth()- TEMPLATE_LEFT;
-							bottomScrollerPanel.setPixelSize(scrollerWidth2, 1000);
-						}
-					}
-		
-				});			
+//				int scrollerWidth = Window.getClientWidth()- TEMPLATE_LEFT - 30;
+//				bottomScrollerPanel.setPixelSize(scrollerWidth, 1000);
+//		
+//				if ( Window.getClientWidth() < 1070 ) {
+//					int scrollerWidth2 = Window.getClientWidth()- TEMPLATE_LEFT;
+//					bottomScrollerPanel.setPixelSize(scrollerWidth2, 1000);
+//				}
+//		
+//				Window.addResizeHandler(new ResizeHandler() {			
+//					public void onResize(ResizeEvent event) {
+//						int scrollerHeight = event.getHeight() - bottomScrollerPanel.getAbsoluteTop();
+//						if (scrollerHeight < toolBoxPanel.getTreePanelHeight())
+//							scrollerHeight = toolBoxPanel.getTreePanelHeight(); 
+//						int scrollerWidth = Window.getClientWidth()- TEMPLATE_LEFT - 30;
+//						bottomScrollerPanel.setPixelSize(scrollerWidth , 1000);	
+//		
+//		
+//						if ( Window.getClientWidth() < 1060 ) {
+//							int scrollerWidth2 = Window.getClientWidth()- TEMPLATE_LEFT;
+//							bottomScrollerPanel.setPixelSize(scrollerWidth2, 1000);
+//						}
+//					}
+//		
+//				});			
 				//presenter.showExportPanel("", "", null, "");
 		 //showGuidedTour() ;
 				
diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/WorkspacePanel.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/WorkspacePanel.java
index 48b7146..8721f59 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/WorkspacePanel.java
+++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/WorkspacePanel.java
@@ -70,8 +70,6 @@ public class WorkspacePanel extends Composite {
 		presenter = c;
 		
 		templateModel = presenter.getModel();
-		mainLayout.setWidth(""+(templateModel.getPageWidth()));
-
 		mainLayout.setStyleName("wpFlow");	
 		
 		initWidget(mainLayout);