diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabItem.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabItem.java
index 1ff716a..8851b23 100644
--- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabItem.java
+++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabItem.java
@@ -129,11 +129,11 @@ public class TabItem extends HBoxLayoutContainer {
 				useTabularResource();
 			}
 		});
-
 		selectTRButton2.setIcon(DataMinerManagerPanel.resources
 				.tabularResource());
 		selectTRButton2.setToolTip("Use Tabular Resource");
-
+		
+		
 		selectButton = new TextButton("Select Data Set");
 		selectButton.addSelectHandler(new SelectEvent.SelectHandler() {
 
@@ -156,8 +156,7 @@ public class TabItem extends HBoxLayoutContainer {
 				wselectDialog.show();
 			}
 		});
-		selectButton2.setVisible(false);
-
+		
 		downloadButton = new TextButton("");
 		downloadButton.setIcon(DataMinerManagerPanel.resources.download());
 		downloadButton.addSelectHandler(new SelectEvent.SelectHandler() {
@@ -167,7 +166,8 @@ public class TabItem extends HBoxLayoutContainer {
 				downloadFile();
 			}
 		});
-		downloadButton.setVisible(false);
+		downloadButton.setToolTip("Download Data Set");
+		
 
 		addBtn = new TextButton("");
 		addBtn.setIcon(DataMinerManagerPanel.resources.add());
@@ -191,7 +191,7 @@ public class TabItem extends HBoxLayoutContainer {
 
 			}
 		});
-		removeBtn.setVisible(!first);
+		
 
 		setPack(BoxLayoutPack.START);
 		setEnableOverflow(false);
@@ -205,6 +205,11 @@ public class TabItem extends HBoxLayoutContainer {
 		add(addBtn, new BoxLayoutData(new Margins()));
 		add(removeBtn, new BoxLayoutData(new Margins()));
 
+		selectTRButton2.setVisible(false);
+		selectButton2.setVisible(false);
+		downloadButton.setVisible(false);
+		removeBtn.setVisible(!first);
+		
 		forceLayout();
 
 	}
diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabularFld.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabularFld.java
index 7bf91ab..0757e23 100644
--- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabularFld.java
+++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabularFld.java
@@ -319,6 +319,9 @@ public class TabularFld extends AbstractFld implements
 					updateListeners(null);
 				}
 			});
+			
+			cancelButton.setToolTip("Cancel");
+
 
 			downloadButton = new TextButton("");
 			downloadButton.setIcon(DataMinerManagerPanel.resources.download());
@@ -329,6 +332,8 @@ public class TabularFld extends AbstractFld implements
 					downloadFile();
 				}
 			});
+			downloadButton.setToolTip("Download Data Set");
+			
 		} catch (Throwable e) {
 			Log.error("TabularField init: " + e.getLocalizedMessage());
 			e.printStackTrace();