diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index a9d431c..9b9bcc6 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-                                                                                                                                                                                                                                                	
+                                                                                                                                                                                                                                                    	
+    
     
     
     
@@ -60,7 +61,8 @@
     
     
     <wb-module deploy-name="geoportal-data-entry-app-3.0.0-SNAPSHOT">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                		
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        		
+        
         
         
         
@@ -121,7 +123,8 @@
         
         
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                		
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        		
+        
         
         
         
@@ -182,7 +185,8 @@
         
         
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                		
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        		
+        
         
         
         
@@ -243,7 +247,8 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-                                                                                                        
+                                                                                                                
+        
         
         
         
@@ -256,10 +261,8 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="geoportal-data-common-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/geoportal-data-common/geoportal-data-common">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+        
         
         
         
@@ -320,7 +323,8 @@
         
         
         <property name="context-root" value="geoportal-data-entry-app"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                		
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        		
+        
         
         
         
@@ -381,7 +385,8 @@
         
         
         <property name="java-output-path" value="/geoportal-data-entry-app/target/geoportal-data-entry-app-2.0.0-SNAPSHOT/WEB-INF/classes"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                	
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        	
+    
     
     
     
@@ -442,7 +447,8 @@
     
     
     </wb-module>
-                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                    
+
 
 
 
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/form/GeonaDataEntryMainForm.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/form/GeonaDataEntryMainForm.java
index de23f00..1ea47da 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/form/GeonaDataEntryMainForm.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/form/GeonaDataEntryMainForm.java
@@ -157,6 +157,8 @@ public class GeonaDataEntryMainForm extends Composite {
 	public void setSelectedForm(CreateMetadataForm form) {
 		inputPanel.clear();
 		GWT.log("Showing form: " + form);
+		
+		form.getElement().addClassName("gna-dataentry-form-fieldset");
 		inputPanel.add(form);
 	}
 
diff --git a/src/main/webapp/GeoPortalDataEntryApp.css b/src/main/webapp/GeoPortalDataEntryApp.css
index 039b5e0..bfceb03 100644
--- a/src/main/webapp/GeoPortalDataEntryApp.css
+++ b/src/main/webapp/GeoPortalDataEntryApp.css
@@ -110,6 +110,12 @@ h1 {
 	padding: 10px !important;
 }
 
+.gna-dataentry-form-fieldset fieldset {
+	margin: 10px 0px !important;
+	border: 1px groove #ddd !important;
+	padding: 10px !important;
+}
+
 .table-current-content {
 	width: 100%;
 	background-color: #efefef !important;