diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/ChangeTableTypePanel.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/ChangeTableTypePanel.java
index dd964ed..0685db7 100644
--- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/ChangeTableTypePanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/ChangeTableTypePanel.java
@@ -93,10 +93,10 @@ public class ChangeTableTypePanel extends FramedPanel implements
 		comboTableType.setEditable(false);
 		comboTableType.setTriggerAction(TriggerAction.ALL);
 
-		change = new TextButton("Change");
+		change = new TextButton("Apply");
 		change.setIcon(ResourceBundle.INSTANCE.tableType());
 		change.setIconAlign(IconAlign.RIGHT);
-		change.setTitle("Change Table Type");
+		change.setTitle("Apply Table Type");
 
 		change.addSelectHandler(new SelectHandler() {
 
diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/rows/EditRowPanel.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/rows/EditRowPanel.java
index 344fdaf..b40ba41 100644
--- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/rows/EditRowPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/rows/EditRowPanel.java
@@ -83,6 +83,7 @@ public class EditRowPanel extends FramedPanel implements MonitorDialogListener {
 	private static final String HEIGHT = "370px";
 	private static final String CONTAINERHEIGHT = "370px";
 	private static final int LABELSIZE = 120;
+	private static final int LABEL_SIZE_IN_CHAR = 17;
 	private static final String FIELDSETWIDTH = "640px";
 
 	private EditRowDialog parent;
@@ -240,11 +241,10 @@ public class EditRowPanel extends FramedPanel implements MonitorDialogListener {
 				fieldSetLayout.add(fl, new VerticalLayoutData(1, -1,
 						new Margins(0)));
 			}
-			
 
 			v.add(fieldSet, new VerticalLayoutData(1, -1, new Margins(1)));
 		}
-		
+
 		container.add(v, new MarginData(0));
 		container.forceLayout();
 
@@ -293,9 +293,9 @@ public class EditRowPanel extends FramedPanel implements MonitorDialogListener {
 			String label = new String();
 			if (col != null && col.getLabel() != null) {
 				label = SafeHtmlUtils.htmlEscape(col.getLabel());
-				if (label.length() > LABELSIZE - 1) {
-					label = label.substring(0, LABELSIZE - 3);
-					label += "..";
+				if (label.length() > LABEL_SIZE_IN_CHAR + 2) {
+					label = label.substring(0, LABEL_SIZE_IN_CHAR);
+					label += "...";
 				}
 			}
 			if (!col.isViewColumn()) {
@@ -800,7 +800,8 @@ public class EditRowPanel extends FramedPanel implements MonitorDialogListener {
 	}
 
 	@Override
-	public void operationStopped(OperationResult operationResult, String reason, String details) {
+	public void operationStopped(OperationResult operationResult,
+			String reason, String details) {
 		ChangeTableWhy why = ChangeTableWhy.TABLECURATION;
 		ChangeTableRequestEvent changeTableRequestEvent = new ChangeTableRequestEvent(
 				ChangeTableRequestType.EDITROW, operationResult.getTrId(), why);