diff --git a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateDeletePanel.java b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateDeletePanel.java
index d29dc1b..d08b449 100644
--- a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateDeletePanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateDeletePanel.java
@@ -227,15 +227,16 @@ public class TemplateDeletePanel extends FramedPanel {
 		HBoxLayoutContainer flowButton = new HBoxLayoutContainer();
 		flowButton.setHBoxLayoutAlign(HBoxLayoutAlign.MIDDLE);
 		flowButton.setPack(BoxLayoutPack.CENTER);
-
-		flowButton.add(btnDelete, new BoxLayoutData(new Margins(2, 4, 2, 4)));
-		flowButton.add(btnClose, new BoxLayoutData(new Margins(2, 4, 2, 4)));
+		
+		BoxLayoutData boxLayoutData=new BoxLayoutData(new Margins(2, 4, 2, 4));
+		flowButton.add(btnDelete, boxLayoutData);
+		flowButton.add(btnClose, boxLayoutData);
 
 		VerticalLayoutContainer v = new VerticalLayoutContainer();
 		v.add(toolBarHead, new VerticalLayoutData(1, -1, new Margins(0)));
-		v.add(grid, new VerticalLayoutData(-1, -1, new Margins(0)));
+		v.add(grid, new VerticalLayoutData(1, -1, new Margins(0)));
 		v.add(toolBar, new VerticalLayoutData(1, 25, new Margins(0)));
-		v.add(flowButton, new VerticalLayoutData(-1, 36,
+		v.add(flowButton, new VerticalLayoutData(1, 36,
 				new Margins(5, 2, 5, 2)));
 		add(v);
 
diff --git a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateOpenPanel.java b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateOpenPanel.java
index 26808d5..3f2066d 100644
--- a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateOpenPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateOpenPanel.java
@@ -246,15 +246,16 @@ public class TemplateOpenPanel extends FramedPanel {
 		flowButton.setHBoxLayoutAlign(HBoxLayoutAlign.MIDDLE);
 		flowButton.setPack(BoxLayoutPack.CENTER);
 
-		flowButton.add(btnOpen, new BoxLayoutData(new Margins(2, 4, 2, 4)));
-		flowButton.add(btnClose, new BoxLayoutData(new Margins(2, 4, 2, 4)));	
-		flowButton.add(btnShare, new BoxLayoutData(new Margins(2, 4, 2, 4)));
+		BoxLayoutData boxLayoutData= new BoxLayoutData(new Margins(2, 4, 2, 4));
+		flowButton.add(btnOpen, boxLayoutData);
+		flowButton.add(btnClose, boxLayoutData);	
+		flowButton.add(btnShare, boxLayoutData);
 
 		VerticalLayoutContainer v = new VerticalLayoutContainer();
 		v.add(toolBarHead, new VerticalLayoutData(1, -1, new Margins(0)));
-		v.add(grid, new VerticalLayoutData(-1, -1, new Margins(0)));
+		v.add(grid, new VerticalLayoutData(1, -1, new Margins(0)));
 		v.add(toolBar, new VerticalLayoutData(1, 25, new Margins(0)));
-		v.add(flowButton, new VerticalLayoutData(-1, 36,
+		v.add(flowButton, new VerticalLayoutData(1, 36,
 				new Margins(5, 2, 5, 2)));
 		add(v);