diff --git a/pom.xml b/pom.xml
index 7782194..0464713 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,14 @@
 
 		<!-- Convenience property to set the GWT version -->
 		<gwtVersion>2.5.1</gwtVersion>
+		<gwtLogVersion>3.2.1</gwtLogVersion>
+		<gxtVersion>3.0.1</gxtVersion>
+		
+		<!-- Next
+		<gwtVersion>2.6.1</gwtVersion>
+		<gwtLogVersion>3.3.2</gwtLogVersion>
+		<gxtVersion>3.1.1</gxtVersion> -->
+		
 
 		<KEYS>${env.KEYS}</KEYS>
 		<!-- GWT needs at least java 1.5 -->
@@ -77,10 +85,12 @@
 		<dependency>
 			<groupId>com.google.gwt</groupId>
 			<artifactId>gwt-servlet</artifactId>
+			<version>${gwtVersion}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.gwt</groupId>
 			<artifactId>gwt-user</artifactId>
+			<version>${gwtVersion}</version>
 		</dependency>
 
 		<dependency>
@@ -106,7 +116,7 @@
 		<dependency>
 			<groupId>com.sencha.gxt</groupId>
 			<artifactId>gxt</artifactId>
-			<version>3.0.1</version>
+			<version>${gxtVersion}</version>
 		</dependency>
 
 
@@ -166,7 +176,7 @@
 		<dependency>
 			<groupId>com.allen-sauer.gwt.log</groupId>
 			<artifactId>gwt-log</artifactId>
-			<version>3.2.1</version>
+			<version>${gwtLogVersion}</version>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/TabResourcesSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/TabResourcesSelectionCard.java
index 6b3283c..a49a2d6 100644
--- a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/TabResourcesSelectionCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/TabResourcesSelectionCard.java
@@ -17,6 +17,9 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.sencha.gxt.widget.core.client.Dialog.PredefinedButton;
 import com.sencha.gxt.widget.core.client.box.AlertMessageBox;
 import com.sencha.gxt.widget.core.client.box.ConfirmMessageBox;
+//Next in GXT 3.1.1
+//import com.sencha.gxt.widget.core.client.event.DialogHideEvent;
+//import com.sencha.gxt.widget.core.client.event.DialogHideEvent.DialogHideHandler;
 import com.sencha.gxt.widget.core.client.event.HideEvent;
 import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler;
 
@@ -133,7 +136,6 @@ public class TabResourcesSelectionCard extends WizardCard {
 				if (mb.getHideButton() == mb.getButtonById(PredefinedButton.YES
 						.name())) {
 					callDeleteLastTable();
-
 				} else if (mb.getHideButton() == mb
 						.getButtonById(PredefinedButton.NO.name())) {
 					getWizardWindow().setEnableNextButton(true);
@@ -141,6 +143,31 @@ public class TabResourcesSelectionCard extends WizardCard {
 				}
 			}
 		});
+		
+		/* Next in GXT 3.1.1
+		 
+		  mb.addDialogHideHandler(new DialogHideHandler() {
+		 
+
+			@Override
+			public void onDialogHide(DialogHideEvent event) {
+				switch (event.getHideButton()) {
+				case NO:
+					getWizardWindow().setEnableNextButton(true);
+					getWizardWindow().setEnableBackButton(true);
+					break;
+				case YES:
+					callDeleteLastTable();
+					break;
+				default:
+					getWizardWindow().setEnableNextButton(true);
+					getWizardWindow().setEnableBackButton(true);
+					break;
+
+				}
+
+			}
+		});*/
 		mb.setWidth(300);
 		mb.show();
 
diff --git a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/TabResourcesSelectionPanel.java b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/TabResourcesSelectionPanel.java
index 3eb551e..7ac72fc 100644
--- a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/TabResourcesSelectionPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/TabResourcesSelectionPanel.java
@@ -45,8 +45,11 @@ import com.sencha.gxt.widget.core.client.button.TextButton;
 import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer;
 import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.VerticalLayoutData;
 import com.sencha.gxt.widget.core.client.event.HideEvent;
-import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler;
+//Next in GXT 3.1.1
+//import com.sencha.gxt.widget.core.client.event.DialogHideEvent;
+//import com.sencha.gxt.widget.core.client.event.DialogHideEvent.DialogHideHandler;
 import com.sencha.gxt.widget.core.client.event.SelectEvent;
+import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler;
 import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler;
 import com.sencha.gxt.widget.core.client.form.TextField;
 import com.sencha.gxt.widget.core.client.grid.CheckBoxSelectionModel;
@@ -341,10 +344,33 @@ public class TabResourcesSelectionPanel extends ContentPanel implements
 					callDeleteTabularResource();
 				} else if (mb.getHideButton() == mb
 						.getButtonById(PredefinedButton.NO.name())) {
-					// perform NO action
+					
 				}
 			}
 		});
+		
+		/*Next in GXT 3.1.1
+		 * 
+		mb.addDialogHideHandler(new DialogHideHandler() {
+
+			@Override
+			public void onDialogHide(DialogHideEvent event) {
+				switch (event.getHideButton()) {
+				case NO:
+					break;
+				case YES:
+					callDeleteTabularResource();
+					break;
+				default:
+					break;
+
+				}
+
+			}
+		});
+		*/
+		
+		
 		mb.setWidth(300);
 		mb.show();