diff --git a/.gwt/.gwt-log b/.gwt/.gwt-log
new file mode 100644
index 0000000..69e1f07
--- /dev/null
+++ b/.gwt/.gwt-log
@@ -0,0 +1,32 @@
+Public resources found in...
+Translatable source found in...
+Found 0 cached/archived units.  Used 0 / 2737 units from cache.
+Compiling...
+   30% complete (ETR: 9 seconds)
+   30% complete (ETR: 9 seconds)
+   30% complete (ETR: 9 seconds)
+   30% complete (ETR: 9 seconds)
+   40% complete (ETR: 8 seconds)
+   50% complete (ETR: 6 seconds)
+   60% complete (ETR: 5 seconds)
+   70% complete (ETR: 3 seconds)
+   80% complete (ETR: 2 seconds)
+   90% complete (ETR: 1 seconds)
+   100% complete (ETR: 0 seconds)
+   Compilation completed in 25.92 seconds
+Removing invalidated units
+Finding entry point classes
+Public resources found in...
+Translatable source found in...
+Found 2737 cached/archived units.  Used 2737 / 2737 units from cache.
+Compiling...
+   Compilation completed in 0.00 seconds
+Removing invalidated units
+Finding entry point classes
+Public resources found in...
+Translatable source found in...
+Found 2737 cached/archived units.  Used 2737 / 2737 units from cache.
+Compiling...
+   Compilation completed in 0.00 seconds
+Removing invalidated units
+Finding entry point classes
diff --git a/src/main/java/org/gcube/portlets/user/td/rulewidget/client/multicolumn/RuleOnTableApplyMapColumnCard.java b/src/main/java/org/gcube/portlets/user/td/rulewidget/client/multicolumn/RuleOnTableApplyMapColumnCard.java
index 533e18b..f9d2a90 100644
--- a/src/main/java/org/gcube/portlets/user/td/rulewidget/client/multicolumn/RuleOnTableApplyMapColumnCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/rulewidget/client/multicolumn/RuleOnTableApplyMapColumnCard.java
@@ -36,6 +36,7 @@ import com.sencha.gxt.core.client.util.Margins;
 import com.sencha.gxt.core.client.util.Padding;
 import com.sencha.gxt.data.shared.ListStore;
 import com.sencha.gxt.widget.core.client.box.AlertMessageBox;
+import com.sencha.gxt.widget.core.client.button.TextButton;
 import com.sencha.gxt.widget.core.client.container.MarginData;
 import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer;
 import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.VerticalLayoutData;
@@ -202,8 +203,15 @@ public class RuleOnTableApplyMapColumnCard extends WizardCard {
 		final GridRowEditing<MapPlaceHolderToColumnRow> editing = new GridRowEditing<MapPlaceHolderToColumnRow>(
 				grid);
 
+		TextButton btnSave=editing.getSaveButton();
+		btnSave.setText(msgsCommon.btnSaveText());
+		btnSave.setToolTip(msgsCommon.btnSaveToolTip());
+		
+		TextButton btnCancel=editing.getCancelButton();
+		btnCancel.setText(msgsCommon.btnCancelText());
+		btnCancel.setToolTip(msgsCommon.btnCancelToolTip());
+	
 		editing.addEditor(columnCol, comboColumnData);
-
 		editing.addBeforeStartEditHandler(new BeforeStartEditHandler<MapPlaceHolderToColumnRow>() {
 
 			@Override
diff --git a/src/main/java/org/gcube/portlets/user/td/rulewidget/client/multicolumn/RuleOnTableNewDefinitionCard.java b/src/main/java/org/gcube/portlets/user/td/rulewidget/client/multicolumn/RuleOnTableNewDefinitionCard.java
index ec8ad43..ddf6170 100644
--- a/src/main/java/org/gcube/portlets/user/td/rulewidget/client/multicolumn/RuleOnTableNewDefinitionCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/rulewidget/client/multicolumn/RuleOnTableNewDefinitionCard.java
@@ -179,6 +179,15 @@ public class RuleOnTableNewDefinitionCard extends WizardCard {
 
 		final GridRowEditing<RuleColumnPlaceHolderDescriptor> editing = new GridRowEditing<RuleColumnPlaceHolderDescriptor>(
 				grid);
+		
+		TextButton btnSave=editing.getSaveButton();
+		btnSave.setText(msgsCommon.btnSaveText());
+		btnSave.setToolTip(msgsCommon.btnSaveToolTip());
+		
+		TextButton btnCancel=editing.getCancelButton();
+		btnCancel.setText(msgsCommon.btnCancelText());
+		btnCancel.setToolTip(msgsCommon.btnCancelToolTip());
+	
 		editing.addEditor(labelCol, labelField);
 		editing.addEditor(columnDataTypeCol, comboColumnDataType);