diff --git a/UnionWizardTD.launch b/UnionWizardTD.launch
index 0aca07c..908caf4 100644
--- a/UnionWizardTD.launch
+++ b/UnionWizardTD.launch
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="com.google.gdt.eclipse.suite.webapp">
+<stringAttribute key="com.google.gdt.eclipse.suiteMainTypeProcessor.PREVIOUSLY_SET_MAIN_TYPE_NAME" value="com.google.gwt.dev.GWTShell"/>
 <stringAttribute key="com.google.gwt.eclipse.core.URL" value="UnionWizardTD.html"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/tabular-data-unionwizard-widget"/>
@@ -8,7 +9,8 @@
 <listEntry value="4"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="com.google.gdt.eclipse.maven.mavenClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value=""/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.GWTShell"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-remoteUI &quot;${gwt_remote_ui_server_port}:${unique_id}&quot; -logLevel INFO -codeServerPort 9997 -port 8888 UnionWizardTD.html"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="tabular-data-unionwizard-widget"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m -Dgwt.nowarn.legacy.tools"/>
 </launchConfiguration>
diff --git a/pom.xml b/pom.xml
index 1c0bc0c..5beea98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,14 @@
 		<configDirectory>config</configDirectory>
 
 		<!-- Convenience property to set the GWT version -->
-		<gwtVersion>2.5.1</gwtVersion>
+		<!--  <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 -->
@@ -76,10 +83,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>
@@ -105,7 +114,7 @@
 		<dependency>
 			<groupId>com.sencha.gxt</groupId>
 			<artifactId>gxt</artifactId>
-			<version>3.0.1</version>
+			<version>${gxtVersion}</version>
 		</dependency>
 
 	
@@ -148,7 +157,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/unionwizardwidget/client/TabResourcesSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/TabResourcesSelectionCard.java
index 165ec39..3ba5530 100644
--- a/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/TabResourcesSelectionCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/TabResourcesSelectionCard.java
@@ -16,9 +16,10 @@ import com.google.gwt.event.logical.shared.SelectionEvent;
 import com.google.gwt.event.logical.shared.SelectionHandler;
 import com.google.gwt.user.client.Command;
 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;
+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;
 
@@ -124,9 +125,36 @@ public class TabResourcesSelectionCard extends WizardCard {
 	protected void deleteTRWithLastTableNull() {
 		final ConfirmMessageBox mb = new ConfirmMessageBox("Delete",
 				"Would you like to delete this tabular resource without table?");
+		/*Next in GXT 3.1.1 */
+		 
+		mb.addDialogHideHandler(new DialogHideHandler() {
+
+			@Override
+			public void onDialogHide(DialogHideEvent event) {
+				switch (event.getHideButton()) {
+				case NO:
+					getWizardWindow().setEnableNextButton(false);
+					getWizardWindow().setEnableBackButton(false);
+					break;
+				case YES:
+					callDeleteLastTable();
+					break;
+				default:
+					break;
+
+				}
+
+			}
+		});
+		
+		
+		
+		/* GXT 3.0.1
 		mb.addHideHandler(new HideHandler() {
 			public void onHide(HideEvent event) {
-				if (mb.getHideButton() == mb.getButtonById(PredefinedButton.YES
+				
+				  if (mb.getHideButton() == mb.getButtonById(PredefinedButton.YES
+				 
 						.name())) {
 					callDeleteLastTable();
 
@@ -135,8 +163,10 @@ public class TabResourcesSelectionCard extends WizardCard {
 					getWizardWindow().setEnableNextButton(false);
 					getWizardWindow().setEnableBackButton(false);
 				}
+			
 			}
-		});
+			
+		});*/
 		mb.setWidth(300);
 		mb.show();
 
diff --git a/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/TabResourcesSelectionPanel.java b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/TabResourcesSelectionPanel.java
index 2592524..4dca5fd 100644
--- a/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/TabResourcesSelectionPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/TabResourcesSelectionPanel.java
@@ -38,13 +38,12 @@ import com.sencha.gxt.data.shared.loader.ListLoadResultBean;
 import com.sencha.gxt.data.shared.loader.ListLoader;
 import com.sencha.gxt.data.shared.loader.LoadResultListStoreBinding;
 import com.sencha.gxt.widget.core.client.ContentPanel;
-import com.sencha.gxt.widget.core.client.Dialog.PredefinedButton;
 import com.sencha.gxt.widget.core.client.box.ConfirmMessageBox;
 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;
+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.SelectEvent.SelectHandler;
 import com.sencha.gxt.widget.core.client.form.TextField;
@@ -320,8 +319,32 @@ public class TabResourcesSelectionPanel extends ContentPanel implements
 		removableTR = tabResource;
 		final ConfirmMessageBox mb = new ConfirmMessageBox("Delete",
 				"Would you like to delete this tabular resource?");
+		
+		/*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;
+
+				}
+
+			}
+		});
+		
+		/* GXT 3.0.1
 		mb.addHideHandler(new HideHandler() {
 			public void onHide(HideEvent event) {
+				
+				
 				if (mb.getHideButton() == mb.getButtonById(PredefinedButton.YES
 						.name())) {
 					callDeleteTabularResource();
@@ -329,8 +352,10 @@ public class TabResourcesSelectionPanel extends ContentPanel implements
 						.getButtonById(PredefinedButton.NO.name())) {
 					// perform NO action
 				}
+				
 			}
 		});
+		*/
 		mb.setWidth(300);
 		mb.show();
 
diff --git a/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/UnionWizardTD.css b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/UnionWizardTD.css
new file mode 100644
index 0000000..553fd48
--- /dev/null
+++ b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/UnionWizardTD.css
@@ -0,0 +1,54 @@
+@CHARSET "UTF-8";
+
+
+.wizard-title {
+	padding: 5px;
+	font-weight: bold;
+	font-size: small;
+	background-color: #C3D9FF;
+}
+
+.wizard-footer {
+	padding: 5px;
+	font-weight: bold;
+	font-size: small;
+	text-align: right;
+	background-color: #CDEB8B
+}
+
+.source-selection-hover:hover {
+	cursor: pointer;
+}
+
+
+
+.column-excluded {
+	background-color: #e6e0da !important;
+	color: #bfa698;
+}
+
+.importSelection-sources {
+	padding: 30px; 
+    display: block;
+    margin-top: 20px;
+	
+}
+
+.importSelection-source {
+	padding-bottom: 20px;
+}
+
+
+
+.sdmxRegistryUrlStyle {
+	padding-top:5px;
+}
+
+.sdmxRegistryUrlInputStyle {
+	width:300px!important;
+}
+
+
+input#sdmxRegistryUrlInputFieldId-input {
+	width:300px!important;
+}
diff --git a/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/accept.png b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/accept.png
new file mode 100644
index 0000000..89c8129
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/accept.png differ
diff --git a/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/add.png b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/add.png
new file mode 100644
index 0000000..6b1ab47
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/add.png differ
diff --git a/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/add_32.png b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/add_32.png
new file mode 100644
index 0000000..6981821
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/add_32.png differ
diff --git a/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/arrow-refresh.png b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/arrow-refresh.png
new file mode 100644
index 0000000..764f995
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/arrow-refresh.png differ
diff --git a/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/arrow-refresh_16.png b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/arrow-refresh_16.png
new file mode 100644
index 0000000..72edf8a
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/arrow-refresh_16.png differ
diff --git a/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/arrow-refresh_32.png b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/arrow-refresh_32.png
new file mode 100644
index 0000000..f3521ea
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/arrow-refresh_32.png differ
diff --git a/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/codelistmapping.png b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/codelistmapping.png
new file mode 100644
index 0000000..0485079
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/codelistmapping.png differ
diff --git a/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/codelistmapping_32.png b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/codelistmapping_32.png
new file mode 100644
index 0000000..b5624ab
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/codelistmapping_32.png differ
diff --git a/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/delete.png b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/delete.png
new file mode 100644
index 0000000..b639afd
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/delete.png differ
diff --git a/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/delete_32.png b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/delete_32.png
new file mode 100644
index 0000000..020b555
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/delete_32.png differ
diff --git a/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/error.png b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/error.png
new file mode 100644
index 0000000..c37bd06
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/error.png differ
diff --git a/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/information.png b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/information.png
new file mode 100644
index 0000000..12cd1ae
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/information.png differ
diff --git a/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/loading.gif b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/loading.gif
new file mode 100644
index 0000000..e846e1d
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/resources/loading.gif differ