diff --git a/src/main/java/org/gcube/portlets/user/td/openwidget/client/TDOpen.java b/src/main/java/org/gcube/portlets/user/td/openwidget/client/TDOpen.java
index 1ad9516..e660411 100644
--- a/src/main/java/org/gcube/portlets/user/td/openwidget/client/TDOpen.java
+++ b/src/main/java/org/gcube/portlets/user/td/openwidget/client/TDOpen.java
@@ -1,6 +1,6 @@
 package org.gcube.portlets.user.td.openwidget.client;
 
-import org.gcube.portlets.user.td.openwidget.client.general.WizardWindow;
+import org.gcube.portlets.user.td.wizardwidget.client.WizardWindow;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.open.TDOpenSession;
 
 import com.allen_sauer.gwt.log.client.Log;
diff --git a/src/main/java/org/gcube/portlets/user/td/openwidget/client/TabResourcesSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/openwidget/client/TabResourcesSelectionCard.java
index 0b8163c..4d3d72a 100644
--- a/src/main/java/org/gcube/portlets/user/td/openwidget/client/TabResourcesSelectionCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/openwidget/client/TabResourcesSelectionCard.java
@@ -6,7 +6,7 @@ package org.gcube.portlets.user.td.openwidget.client;
 import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.open.TDOpenSession;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource;
-import org.gcube.portlets.user.td.openwidget.client.general.WizardCard;
+import org.gcube.portlets.user.td.wizardwidget.client.WizardCard;
 
 import com.allen_sauer.gwt.log.client.Log;
 import com.google.gwt.event.logical.shared.SelectionEvent;
@@ -66,10 +66,9 @@ public class TabResourcesSelectionCard extends WizardCard {
 
 			@Override
 			public void execute() {
-				TabResource tabResource = tdOpenSession
-						.getSelectedTabResource();
-
-				TDGWTServiceAsync.INSTANCE.setTabResource(tabResource,
+				
+				TDGWTServiceAsync.INSTANCE.setTabResource(tdOpenSession
+						.getSelectedTabResource(),
 						new AsyncCallback<Void>() {
 							@Override
 							public void onFailure(Throwable caught) {
@@ -91,20 +90,22 @@ public class TabResourcesSelectionCard extends WizardCard {
 
 							@Override
 							public void onSuccess(Void result) {
-							
+								getWizardWindow().fireCompleted(tdOpenSession
+										.getSelectedTabResource().getTrId());
+								getWizardWindow().close(false);
+								Log.info("OpenTD Tabular Resource selected :" + tdOpenSession
+										.getSelectedTabResource());
 							}
 
 						});
-				getWizardWindow().fireCompleted(tabResource.getTrId());
-				Log.info("OpenTD Tabular Resource selected :" + tabResource);
-				getWizardWindow().close(false);
-
+				
+			
 			}
 
 		};
 
-		//getWizardWindow().setNextButtonCommand(sayFinish);
-		getWizardWindow().setFinishCommand(sayFinish);
+		getWizardWindow().setNextButtonCommand(sayFinish);
+		//getWizardWindow().setFinishCommand(sayFinish);
 
 	}
 
diff --git a/src/main/java/org/gcube/portlets/user/td/openwidget/client/TabResourcesSelectionPanel.java b/src/main/java/org/gcube/portlets/user/td/openwidget/client/TabResourcesSelectionPanel.java
index 45edc22..12614ed 100644
--- a/src/main/java/org/gcube/portlets/user/td/openwidget/client/TabResourcesSelectionPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/openwidget/client/TabResourcesSelectionPanel.java
@@ -7,7 +7,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.gcube.portlets.user.td.openwidget.client.dataresource.ResourceBundle;
+import org.gcube.portlets.user.td.wizardwidget.client.dataresource.ResourceBundle;
 import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource;