diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/MultiColumnExpressionPanel.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/MultiColumnExpressionPanel.java
index 053bea7..5e4ce34 100644
--- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/MultiColumnExpressionPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/MultiColumnExpressionPanel.java
@@ -57,6 +57,7 @@ public class MultiColumnExpressionPanel extends FramedPanel {
 	private static final String WIDTH = "929px";
 	private static final String HEIGHT = "352px";
 	private static final String CONDITION_FIELD_WIDTH = "910px";
+	private static final String RULE_CONDITION_FIELD_WIDTH = "914px";
 	
 	private static final String ROWS_DELETE_HEIGHT = "388px";
 	private static final String RULE_HEIGHT= "312px";
@@ -228,7 +229,7 @@ public class MultiColumnExpressionPanel extends FramedPanel {
 			conditionsField = new FieldSet();
 			conditionsField.setHeadingText("Conditions");
 			conditionsField.setCollapsible(false);
-			conditionsField.setWidth(CONDITION_FIELD_WIDTH);
+			conditionsField.setWidth(RULE_CONDITION_FIELD_WIDTH);
 
 			conditionWidget = new ConditionOnMultiColumnWidget(columns,RULE_MULTI_CONDITION_WIDTH,RULE_MULTI_CONDITION_HEIGHT);
 			conditionsField.add(conditionWidget);
@@ -271,7 +272,7 @@ public class MultiColumnExpressionPanel extends FramedPanel {
 			VerticalLayoutContainer basicLayout = new VerticalLayoutContainer();
 			//basicLayout.setAdjustForScroll(true);
 			
-			basicLayout.add(propertiesField, new VerticalLayoutData(-1, -1,
+			basicLayout.add(propertiesField, new VerticalLayoutData(1, -1,
 					new Margins(1)));
 
 			basicLayout.add(conditionsField, new VerticalLayoutData(-1, -1,
diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByMultiColumnExpressionPanel.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByMultiColumnExpressionPanel.java
index b255541..4500ba7 100644
--- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByMultiColumnExpressionPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByMultiColumnExpressionPanel.java
@@ -71,10 +71,10 @@ public class ReplaceColumnByMultiColumnExpressionPanel extends FramedPanel {
 	private static final String PARENT_HEIGHT = "490px";
 	private static final String PARENT_HEIGHT_REDUCE = "404px";
 
-	private static final String CONDITIONWIDTH = "890px";
+	private static final String CONDITIONWIDTH = "900px";
 	private static final String CONDITIONHEIGHT = "120px";
-	private static final String CONDITION_LAYOUT_WIDTH = "890px";
-	private static final String REPLACEWIDTH = "894px";
+	private static final String CONDITION_LAYOUT_WIDTH = "900px";
+	private static final String REPLACEWIDTH = "904px";
 	private static final String REPLACEHEIGHT = "120px";
 	private static final String ALL_ROWS_FIELD_WIDTH = "884px";
 
@@ -298,11 +298,11 @@ public class ReplaceColumnByMultiColumnExpressionPanel extends FramedPanel {
 		// basicLayout.setScrollMode(ScrollMode.AUTO);
 
 		// Add to basic layout
-		basicLayout.add(properties, new VerticalLayoutData(-1, -1,
+		basicLayout.add(properties, new VerticalLayoutData(1, -1,
 				new Margins(1)));
-		basicLayout.add(conditionsFieldSet, new VerticalLayoutData(-1, -1,
+		basicLayout.add(conditionsFieldSet, new VerticalLayoutData(1, -1,
 				new Margins(1)));
-		basicLayout.add(replaceValueFieldSet, new VerticalLayoutData(-1, -1,
+		basicLayout.add(replaceValueFieldSet, new VerticalLayoutData(1, -1,
 				new Margins(1)));
 
 		basicLayout.add(flowButton, new VerticalLayoutData(1, 36, new Margins(