diff --git a/.classpath b/.classpath
index 215c1c9..914db7a 100644
--- a/.classpath
+++ b/.classpath
@@ -13,20 +13,22 @@
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
+			<attribute name="test" value="true"/>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="test" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.dependency"
+				value="/WEB-INF/lib" />
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 6f1f647..9f2d2fd 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,42 +1,72 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-                
+                            
+    
+    
+    
     
     
     <wb-module deploy-name="geoportal-data-entry-app-1.0.0-SNAPSHOT">
-                                
+                                                        
+        
+        
+        
         
         
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-                                
+                                                        
+        
+        
+        
         
         
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-                                
+                                                        
+        
+        
+        
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-                                
+                                                        
+        
+        
+        
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
-                                
+                                                        
+        
+        
+        
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
         <dependent-module archiveName="metadata-profile-form-builder-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/metadata-profile-form-builder-widget/metadata-profile-form-builder-widget">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-                                
+                                                        
+        
+        
+        
         
         
         <property name="java-output-path" value="/geoportal-data-entry-app/target/geoportal-data-entry-app-1.0.0-SNAPSHOT/WEB-INF/classes"/>
-                
+                                        
+        
+        
+        
         <property name="context-root" value="geoportal-data-entry-app"/>
-                            
+                                                    
+    
+    
+    
     
     
     </wb-module>
-            
+                        
+
+
+
 
 
 </project-modules>
diff --git a/pom.xml b/pom.xml
index c83d3c1..09a20eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,6 +104,10 @@
 			<artifactId>common-scope-maps</artifactId>
 			<scope>compile</scope>
 		</dependency>
+		<dependency>
+			<groupId>commons-fileupload</groupId>
+			<artifactId>commons-fileupload</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.gcube.portal</groupId>
 			<artifactId>client-context-library</artifactId>
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java
index d14ecc8..8971abc 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java
@@ -38,8 +38,6 @@ public class GeoPortalDataEntryApp implements EntryPoint {
 	 */
 	private final GreetingServiceAsync greetingService = GWT.create(GreetingService.class);
 
-	private final Messages messages = GWT.create(Messages.class);
-
 	private final HandlerManager eventBus = new HandlerManager(null);
 
 	private LinkedHashMap<String, GeoNaFormCardModel> mapForms = new LinkedHashMap<String, GeoNaFormCardModel>();
@@ -50,7 +48,7 @@ public class GeoPortalDataEntryApp implements EntryPoint {
 	 * This is the entry point method.
 	 */
 	public void onModuleLoad() {
-
+		
 		String scope = "/gcube/devsec/devVRE";
 		String secondaryType = "GeoNaMetadata";
 		
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/Messages.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/Messages.java
deleted file mode 100644
index 51bd2d4..0000000
--- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/Messages.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.gcube.portlets.user.geoportaldataentry.client;
-
-import com.google.gwt.i18n.client.LocalizableResource.Generate;
-
-@Generate(format = "com.google.gwt.i18n.server.PropertyCatalogFactory")
-public interface Messages extends com.google.gwt.i18n.client.Messages {
-  
-  @DefaultMessage("Enter your name")
-  String nameField();
-
-  @DefaultMessage("Send")
-  String sendButton();
-}
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/card/MetadataFormCard.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/card/MetadataFormCard.java
index 782885c..b237c65 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/card/MetadataFormCard.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/card/MetadataFormCard.java
@@ -9,7 +9,6 @@ import org.gcube.portlets.widgets.mpformbuilder.shared.GenericDatasetBean;
 
 import com.github.gwtbootstrap.client.ui.Button;
 import com.github.gwtbootstrap.client.ui.Tab;
-import com.github.gwtbootstrap.client.ui.base.Style;
 import com.github.gwtbootstrap.client.ui.constants.IconType;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;