diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index c826c2b..de87247 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,6 +4,15 @@
     <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="/src/main/resources"/>
+        <dependent-module archiveName="tabular-data-widget-td-source-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-widget-td-source/tabular-data-widget-td-source">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="SDMXImportWizardTD-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/SDMXImportWizardTD/SDMXImportWizardTD">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="tabular-data-gxtservice-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-gxtservice/tabular-data-gxtservice">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
     <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
         <property name="context-root" value="tabular-data-portlet"/>
   </wb-module>
diff --git a/src/main/java/org/gcube/portlets/user/td/client/TabularDataPortlet.java b/src/main/java/org/gcube/portlets/user/td/client/TabularDataPortlet.java
index e607956..116013e 100644
--- a/src/main/java/org/gcube/portlets/user/td/client/TabularDataPortlet.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/TabularDataPortlet.java
@@ -99,13 +99,14 @@ public class TabularDataPortlet implements EntryPoint {
 
 		// Layout
 		mainPanelLayout = new BorderLayoutContainer();
+		mainPanelLayout.setId("mainPanelLayout");
 		mainPanelLayout.setBorders(true);
 
 		// Ribbon Menu
 		TabularDataRibbon tabularDataTooBar = new TabularDataRibbon(eventBus);
 		TabPanel toolBarPanel = tabularDataTooBar.getContainer();
 
-		BorderLayoutData toolBarData = new BorderLayoutData(122);
+		BorderLayoutData toolBarData = new BorderLayoutData(111);
 		toolBarData.setMargins(new Margins(5));
 		toolBarData.setCollapsible(false);
 		toolBarData.setSplit(false);
diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java
index 6cbeb9e..4f88bc7 100644
--- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java
@@ -140,6 +140,7 @@ public class FileToolBar {
 		propertiesButton = new TextButton("Properties", TabularDataResources.INSTANCE.properties());
 		propertiesButton.setId("propertiesButton");
 		propertiesButton.setToolTip("Show properties");
+		
 		dataLayout.setWidget(1, 2, propertiesButton);
 		propertiesButton.addSelectHandler(new SelectHandler() {
 			
@@ -211,6 +212,7 @@ public class FileToolBar {
 		exportGroup.setStyleName("ribbon");
 		exportGroup.setHeadingText("Export");
 		exportGroup.disable();
+		
 		toolBar.add(exportGroup);
 		
 		FlexTable exportLayout = new FlexTable();
diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/TabularDataRibbon.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/TabularDataRibbon.java
index 9902a5a..5faf2e8 100644
--- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/TabularDataRibbon.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/TabularDataRibbon.java
@@ -29,6 +29,7 @@ public class TabularDataRibbon {
 		try {
 			ribbon = new TabPanel();
 			ribbon.setId("Ribbon");
+			ribbon.setHeight("106px");
 			
 			
 			fileToolBar = new FileToolBar(eventBus);
diff --git a/src/main/resources/org/gcube/portlets/user/td/TabularDataPortlet.gwt.xml b/src/main/resources/org/gcube/portlets/user/td/TabularDataPortlet.gwt.xml
index 04b0a0e..39da7f4 100644
--- a/src/main/resources/org/gcube/portlets/user/td/TabularDataPortlet.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/td/TabularDataPortlet.gwt.xml
@@ -26,7 +26,7 @@
 	<!-- Specify the app entry point class. -->
 	<entry-point class='org.gcube.portlets.user.td.client.TabularDataPortlet' />
 
-	<set-property name="log_DivLogger" value="ENABLED" />
+	<set-property name="log_DivLogger" value="DISABLED" />
 	<set-property name="log_ConsoleLogger" value="ENABLED" />
 	<set-property name="log_FirebugLogger" value="ENABLED" />
 	<set-property name="log_GWTLogger" value="ENABLED" />
diff --git a/src/main/resources/org/gcube/portlets/user/td/client/resource/arrow-undo-all.png b/src/main/resources/org/gcube/portlets/user/td/client/resource/arrow-undo-all.png
index 5f4f45d..54755c7 100644
Binary files a/src/main/resources/org/gcube/portlets/user/td/client/resource/arrow-undo-all.png and b/src/main/resources/org/gcube/portlets/user/td/client/resource/arrow-undo-all.png differ
diff --git a/src/main/resources/org/gcube/portlets/user/td/client/resource/arrow-undo.png b/src/main/resources/org/gcube/portlets/user/td/client/resource/arrow-undo.png
index bbc7321..5a6c52e 100644
Binary files a/src/main/resources/org/gcube/portlets/user/td/client/resource/arrow-undo.png and b/src/main/resources/org/gcube/portlets/user/td/client/resource/arrow-undo.png differ
diff --git a/src/main/resources/org/gcube/portlets/user/td/client/resource/close-red.png b/src/main/resources/org/gcube/portlets/user/td/client/resource/close-red.png
index 1312670..978f945 100644
Binary files a/src/main/resources/org/gcube/portlets/user/td/client/resource/close-red.png and b/src/main/resources/org/gcube/portlets/user/td/client/resource/close-red.png differ
diff --git a/src/main/resources/org/gcube/portlets/user/td/client/resource/csv.png b/src/main/resources/org/gcube/portlets/user/td/client/resource/csv.png
index 041c5c7..8d1eac0 100644
Binary files a/src/main/resources/org/gcube/portlets/user/td/client/resource/csv.png and b/src/main/resources/org/gcube/portlets/user/td/client/resource/csv.png differ
diff --git a/src/main/resources/org/gcube/portlets/user/td/client/resource/csv_32.png b/src/main/resources/org/gcube/portlets/user/td/client/resource/csv_32.png
index 189bcc7..70f3e0b 100644
Binary files a/src/main/resources/org/gcube/portlets/user/td/client/resource/csv_32.png and b/src/main/resources/org/gcube/portlets/user/td/client/resource/csv_32.png differ
diff --git a/src/main/resources/org/gcube/portlets/user/td/client/resource/json.png b/src/main/resources/org/gcube/portlets/user/td/client/resource/json.png
index 34587fc..dc21fe8 100644
Binary files a/src/main/resources/org/gcube/portlets/user/td/client/resource/json.png and b/src/main/resources/org/gcube/portlets/user/td/client/resource/json.png differ
diff --git a/src/main/resources/org/gcube/portlets/user/td/client/resource/json_32.png b/src/main/resources/org/gcube/portlets/user/td/client/resource/json_32.png
index 07140df..7ca2b39 100644
Binary files a/src/main/resources/org/gcube/portlets/user/td/client/resource/json_32.png and b/src/main/resources/org/gcube/portlets/user/td/client/resource/json_32.png differ
diff --git a/src/main/resources/org/gcube/portlets/user/td/client/resource/properties.png b/src/main/resources/org/gcube/portlets/user/td/client/resource/properties.png
index 6e1932f..fbc4813 100644
Binary files a/src/main/resources/org/gcube/portlets/user/td/client/resource/properties.png and b/src/main/resources/org/gcube/portlets/user/td/client/resource/properties.png differ
diff --git a/src/main/webapp/TabularDataPortlet.css b/src/main/webapp/TabularDataPortlet.css
index 397c5b2..bc381a5 100644
--- a/src/main/webapp/TabularDataPortlet.css
+++ b/src/main/webapp/TabularDataPortlet.css
@@ -1,6 +1,7 @@
 /** Add css rules here for your application. */
 table {
 	border-spacing: 1px !important;
+	top: 0px !important;
 }