diff --git a/.classpath b/.classpath
index aa0884f..ccde11f 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/tabular-data-unionwizard-widget-1.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/tabular-data-replacebyexternal-widget-1.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/tabular-data-unionwizard-widget-1.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/tabular-data-replacebyexternal-widget-1.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -33,5 +33,5 @@
 			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/tabular-data-unionwizard-widget-1.0.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/tabular-data-replacebyexternal-widget-1.0.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/ColumnMappingCard.java b/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/ColumnMappingCard.java
index eb96795..67e9275 100644
--- a/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/ColumnMappingCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/ColumnMappingCard.java
@@ -65,7 +65,7 @@ public class ColumnMappingCard extends WizardCard {
 		getWizardWindow().setEnableBackButton(false);
 		
 		ArrayList<ReplaceByExternalColumnsMapping>  columnsMatch=columnMappingPanel.getSelectedMap();
-		if(columnsMatch==null){
+		if(columnsMatch==null || columnsMatch.size()<=0){
 			Log.debug("No columns match created: "
 				+columnsMatch);
 			UtilsGXT3
diff --git a/src/main/resources/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/UnionWizardTD.css b/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/ReplaceByExternal.css
similarity index 100%
rename from src/main/resources/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/UnionWizardTD.css
rename to src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/ReplaceByExternal.css
diff --git a/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/UnionCSS.java b/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/ReplaceByExternalCSS.java
similarity index 93%
rename from src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/UnionCSS.java
rename to src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/ReplaceByExternalCSS.java
index 3bcea93..b4ea569 100644
--- a/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/UnionCSS.java
+++ b/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/ReplaceByExternalCSS.java
@@ -11,7 +11,7 @@ import com.google.gwt.resources.client.CssResource;
  * <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
  *
  */
-public interface UnionCSS extends CssResource {
+public interface ReplaceByExternalCSS extends CssResource {
 	
     @ClassName("wizard-title")
     public String getWizardTitle(); 
diff --git a/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/ReplaceByExternalResourceBundle.java b/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/ReplaceByExternalResourceBundle.java
index 1c45706..c1cb91f 100644
--- a/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/ReplaceByExternalResourceBundle.java
+++ b/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/ReplaceByExternalResourceBundle.java
@@ -11,8 +11,8 @@ public interface ReplaceByExternalResourceBundle extends ClientBundle {
 	
 	public static final ReplaceByExternalResourceBundle INSTANCE=GWT.create(ReplaceByExternalResourceBundle.class);
 	
-	@Source("UnionWizardTD.css")
-	UnionCSS unionCss();
+	@Source("ReplaceByExternal.css")
+	ReplaceByExternalCSS replaceByExternalCss();
 	
 	@Source("arrow-refresh.png")
 	ImageResource refresh();
@@ -24,10 +24,10 @@ public interface ReplaceByExternalResourceBundle extends ClientBundle {
 	ImageResource refresh32();
 	
 	@Source("accept.png")
-	ImageResource csvCheckSuccess();
+	ImageResource success();
 
 	@Source("error.png")
-	ImageResource csvCheckFailure();
+	ImageResource failure();
 
 	@Source("loading.gif")
 	ImageResource loading();
@@ -46,6 +46,12 @@ public interface ReplaceByExternalResourceBundle extends ClientBundle {
 	
 	@Source("delete_32.png")
 	ImageResource delete32();
+	
+	@Source("table-replace-by-external.png")
+	ImageResource tableReplaceByExternal();
+	
+	@Source("table-replace-by-external_32.png")
+	ImageResource tableReplaceByExternal32();
 
 }
  
\ No newline at end of file
diff --git a/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/accept.png b/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/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/replacebyexternalwidget/client/resources/accept.png differ
diff --git a/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/add.png b/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/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/replacebyexternalwidget/client/resources/add.png differ
diff --git a/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/add_32.png b/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/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/replacebyexternalwidget/client/resources/add_32.png differ
diff --git a/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/arrow-refresh.png b/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/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/replacebyexternalwidget/client/resources/arrow-refresh.png differ
diff --git a/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/arrow-refresh_16.png b/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/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/replacebyexternalwidget/client/resources/arrow-refresh_16.png differ
diff --git a/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/arrow-refresh_32.png b/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/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/replacebyexternalwidget/client/resources/arrow-refresh_32.png differ
diff --git a/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/delete.png b/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/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/replacebyexternalwidget/client/resources/delete.png differ
diff --git a/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/delete_32.png b/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/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/replacebyexternalwidget/client/resources/delete_32.png differ
diff --git a/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/error.png b/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/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/replacebyexternalwidget/client/resources/error.png differ
diff --git a/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/information.png b/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/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/replacebyexternalwidget/client/resources/information.png differ
diff --git a/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/loading.gif b/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/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/replacebyexternalwidget/client/resources/loading.gif differ
diff --git a/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/table-replace-by-external-col.png b/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/table-replace-by-external-col.png
new file mode 100644
index 0000000..4278827
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/table-replace-by-external-col.png differ
diff --git a/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/table-replace-by-external-col_32.png b/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/table-replace-by-external-col_32.png
new file mode 100644
index 0000000..06716c8
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/table-replace-by-external-col_32.png differ
diff --git a/src/main/resources/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/ReplaceByExternal.css b/src/main/resources/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/ReplaceByExternal.css
new file mode 100644
index 0000000..553fd48
--- /dev/null
+++ b/src/main/resources/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/ReplaceByExternal.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/resources/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/codelistmapping.png b/src/main/resources/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/codelistmapping.png
deleted file mode 100644
index 0485079..0000000
Binary files a/src/main/resources/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/codelistmapping.png and /dev/null differ
diff --git a/src/main/resources/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/codelistmapping_32.png b/src/main/resources/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/codelistmapping_32.png
deleted file mode 100644
index b5624ab..0000000
Binary files a/src/main/resources/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/codelistmapping_32.png and /dev/null differ
diff --git a/src/main/resources/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/table-replace-by-external-col.png b/src/main/resources/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/table-replace-by-external-col.png
new file mode 100644
index 0000000..4278827
Binary files /dev/null and b/src/main/resources/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/table-replace-by-external-col.png differ
diff --git a/src/main/resources/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/table-replace-by-external-col_32.png b/src/main/resources/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/table-replace-by-external-col_32.png
new file mode 100644
index 0000000..06716c8
Binary files /dev/null and b/src/main/resources/org/gcube/portlets/user/td/replacebyexternalwidget/client/resources/table-replace-by-external-col_32.png differ