diff --git a/pom.xml b/pom.xml
index 3c750fb..02261de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,6 +55,7 @@
 		<gwtVersion>2.6.1</gwtVersion>
 		<gwtLogVersion>3.3.2</gwtLogVersion>
 		<gxtVersion>3.1.1</gxtVersion>
+		<gxt2Version>2.6.1-SNAPSHOT</gxt2Version>
 
 		<!-- To make this work on gwt-run you need to set up global env vars. on 
 			MacOSX edit this file /etc/launchd.conf and put "setenv GLOBUS_LOCATION /Users/massi/portal/Portal-Bundle/gCore" 
@@ -112,11 +113,15 @@
 
 		<!-- GXT 2 -->
 		<dependency>
-			<groupId>com.extjs.gxt</groupId>
-			<artifactId>gxt</artifactId>
-			<version>2.2.5</version>
+			<groupId>com.sencha.gxt</groupId>
+			<artifactId>gxt2.2.5-gwt2.X</artifactId>
+			<version>${gxt2Version}</version>
 		</dependency>
 
+		<!-- <dependency> <groupId>com.extjs.gxt</groupId> <artifactId>gxt</artifactId> 
+			<version>2.2.5</version> </dependency> -->
+
+
 		<!-- GXT 3 -->
 		<dependency>
 			<groupId>com.sencha.gxt</groupId>
diff --git a/src/main/java/org/gcube/portlets/user/td/client/PortalViewport.java b/src/main/java/org/gcube/portlets/user/td/client/PortalViewport.java
index 25f4423..70d0504 100644
--- a/src/main/java/org/gcube/portlets/user/td/client/PortalViewport.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/PortalViewport.java
@@ -5,9 +5,11 @@ package org.gcube.portlets.user.td.client;
 
 import com.allen_sauer.gwt.log.client.Log;
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.dom.client.Element;
 import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
 import com.google.gwt.user.client.Window;
 import com.sencha.gxt.core.client.dom.XDOM;
+import com.sencha.gxt.core.client.dom.XElement;
 import com.sencha.gxt.widget.core.client.container.SimpleContainer;
 import com.sencha.gxt.widget.core.client.container.Viewport.ViewportAppearance;
 
@@ -43,7 +45,8 @@ public class PortalViewport extends SimpleContainer {
 
 			SafeHtmlBuilder sb = new SafeHtmlBuilder();
 			appearance.render(sb);
-			setElement(XDOM.create(sb.toSafeHtml()));
+			XElement element=XDOM.create(sb.toSafeHtml());
+			setElement((Element)element);
 			monitorWindowResize = true;
 			forceLayoutOnResize = true;
 			getFocusSupport().setIgnore(false);
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 ace8110..ae864fb 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
@@ -86,7 +86,7 @@ public class TabularDataPortlet implements EntryPoint {
 		TabularDataRibbon tabularDataRibbon = new TabularDataRibbon(eventBus);
 		TabPanel ribbonBarPanel = tabularDataRibbon.getContainer();
 
-		BorderLayoutData ribbonBarData = new BorderLayoutData(109);
+		BorderLayoutData ribbonBarData = new BorderLayoutData(105);
 		ribbonBarData.setMargins(new Margins(5));
 		ribbonBarData.setCollapsible(false);
 		ribbonBarData.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 2e8b78f..98d4201 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
@@ -84,7 +84,7 @@ public class FileToolBar {
 		toolBar = new ToolBar();
 		toolBar.setSpacing(1);
 		toolBar.setEnableOverflow(false);
-
+		
 		// File
 		ButtonGroup fileGroup = new ButtonGroup();
 		fileGroup.setId("File");
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 160176f..54a1291 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
@@ -18,6 +18,8 @@ import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.Verti
  */
 public class TabularDataRibbon {
 
+	private static final String RIBBON_HEIGHT = "100px";
+
 	protected TabPanel ribbon;
 	
 	//protected PlainTabPanel ribbon;
@@ -31,7 +33,7 @@ public class TabularDataRibbon {
 		try {
 			ribbon = new TabPanel();
 			ribbon.setId("Ribbon");
-			ribbon.setHeight("102px");
+			ribbon.setHeight(RIBBON_HEIGHT);
 			
 			VerticalLayoutData vldata=new VerticalLayoutData(1, -1);