diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index b83d38d..07d3f48 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    	
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            	
+    
+    
     
     
     
@@ -129,7 +131,9 @@
     
     
     <wb-module deploy-name="geoportal-data-viewer-app-3.7.0-SNAPSHOT">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        		
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        		
+        
+        
         
         
         
@@ -259,7 +263,9 @@
         
         
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        		
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        		
+        
+        
         
         
         
@@ -389,7 +395,9 @@
         
         
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        		
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        		
+        
+        
         
         
         
@@ -519,7 +527,9 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        		
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        		
+        
+        
         
         
         
@@ -649,7 +659,9 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-                                                                                                                                
+                                                                                                                                                
+        
+        
         
         
         
@@ -668,10 +680,18 @@
         <dependent-module archiveName="geoportal-data-mapper-1.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/geoportal-data-mapper/geoportal-data-mapper">
             <dependency-type>uses</dependency-type>
         </dependent-module>
+        <dependent-module archiveName="geoportal-data-common-2.4.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/geoportal-data-common/geoportal-data-common">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="geoportal-client-1.2.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/geoportal-client/geoportal-client">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
         <dependent-module archiveName="uri-resolver-manager-1.8.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/uri-resolver-manager/uri-resolver-manager">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        		
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        		
+        
+        
         
         
         
@@ -801,7 +821,9 @@
         
         
         <property name="java-output-path" value="/geoportal-data-viewer-app/target/geoportal-data-viewer-app-0.0.1-SNAPSHOT/WEB-INF/classes"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        		
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        		
+        
+        
         
         
         
@@ -931,7 +953,9 @@
         
         
         <property name="context-root" value="geoportal-data-viewer-app"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        	
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        	
+    
+    
     
     
     
@@ -1061,7 +1085,9 @@
     
     
     </wb-module>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+
+
 
 
 
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectViewer.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectViewer.java
index c582248..0ecf7e1 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectViewer.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectViewer.java
@@ -152,7 +152,7 @@ public class ProjectViewer extends Composite {
 			@Override
 			public void onSuccess(Boolean result) {
 				GWT.log("Export as PDF visible: " + result);
-				exportButton.setEnabled(result);
+				exportButton.setVisible(result);
 
 			}
 		});
@@ -207,7 +207,7 @@ public class ProjectViewer extends Composite {
 		exportButton.setType(ButtonType.LINK);
 		exportButton.setIcon(IconType.FILE);
 		exportButton.setTitle("Export as PDF");
-		exportButton.setEnabled(false);
+		exportButton.setVisible(false);
 
 		exportButton.addClickHandler(new ClickHandler() {
 
@@ -240,46 +240,8 @@ public class ProjectViewer extends Composite {
 				builder.append(GeoportalDataViewerConstants.USER_ID_PARAMETER + "=" + currentUserId);
 
 				String geoportalExportActionServlet = builder.toString();
-
-//				Method httpMethod = RequestBuilder.GET;
-//				RequestBuilder requestBuilder = new RequestBuilder(httpMethod, geoportalExportActionServlet);
-
+				
 				NewBrowserWindow.open(geoportalExportActionServlet, "_blank", "");
-
-//				try {
-//					requestBuilder.sendRequest("", new RequestCallback() {
-//
-//						@Override
-//						public void onResponseReceived(Request request, Response response) {
-//							newBrowserWindow.setUrl(geoportalExportActionServlet);
-//
-//						}
-//
-//						@Override
-//						public void onError(Request request, Throwable exception) {
-//							newBrowserWindow.close();
-//							Modal errorModal = new Modal(true, true);
-//							errorModal.setCloseVisible(true);
-//							errorModal.setTitle("Oops...");
-//							Image geoportalError = new Image(GeoportalImages.ICONS.warningError());
-//							FlowPanel errorPanelMsg = new FlowPanel();
-//							errorPanelMsg.getElement().addClassName("general_warning");
-//							errorPanelMsg.add(geoportalError);
-//							errorPanelMsg.add(new HTML("D4S GeoPortal"));
-//							HTML erroMessage = new HTML(
-//									"Oops something went wrong, error occurred when exporting the project. Error is: "
-//											+ exception.getMessage());
-//							errorPanelMsg.add(erroMessage);
-//							errorModal.add(errorPanelMsg);
-//							errorModal.show();
-//
-//						}
-//
-//					});
-//				} catch (RequestException e) {
-//					// TODO Auto-generated catch block
-//					e.printStackTrace();
-//				}
 			}
 		});