diff --git a/src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/ToolBox.java b/src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/ToolBox.java
index 4b6cc83..092b7f4 100644
--- a/src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/ToolBox.java
+++ b/src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/ToolBox.java
@@ -13,7 +13,9 @@ import com.sencha.gxt.widget.core.client.TabItemConfig;
 import com.sencha.gxt.widget.core.client.TabPanel;
 import com.sencha.gxt.widget.core.client.button.TextButton;
 import com.sencha.gxt.widget.core.client.event.BeforeCloseEvent;
+import com.sencha.gxt.widget.core.client.event.BeforeShowEvent;
 import com.sencha.gxt.widget.core.client.event.BeforeCloseEvent.BeforeCloseHandler;
+import com.sencha.gxt.widget.core.client.event.BeforeShowEvent.BeforeShowHandler;
 import com.sencha.gxt.widget.core.client.event.SelectEvent;
 //import org.gcube.portlets.user.td.taskswidget.client.TdTaskController;
 
@@ -33,7 +35,7 @@ public class ToolBox extends TabPanel {
 		this.eventBus = eventBus;
 		this.toolBoxPanel = toolBoxPanel;
 		setId(name);
-
+		setBodyBorder(false);
 		setAnimScroll(true);
 		setTabScroll(true);
 		setCloseContextMenu(true);
@@ -45,10 +47,11 @@ public class ToolBox extends TabPanel {
 
 	public void closeTabs() {
 		Log.debug("Close ToolBox Tabs");
-		remove(helpPanel);
-		helpPanel=null;
-		remove(trProperties);
-		trProperties=null;
+		if(trProperties!=null){
+			remove(trProperties);
+			trProperties=null;
+		}
+		
 		//remove(taskPanel);
 		// remove(tdTaskMainPanel);
 		//tdTaskMainWindow=null;
@@ -96,18 +99,8 @@ public class ToolBox extends TabPanel {
 		helpPanel.setHeaderVisible(false);
 		add(helpPanel, propertiesItemConf);
 
-		addBeforeCloseHandler(new BeforeCloseHandler<Widget>() {
-
-	
-			public void onBeforeClose(BeforeCloseEvent<Widget> event) {
-				if (getWidgetCount() == 1) {
-					toolBoxPanel.closePanelOnly();
-					remove(helpPanel);
-				}
-
-			}
-
-		});
+		
+		
 	};
 	
 	
diff --git a/src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/ToolBoxPanel.java b/src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/ToolBoxPanel.java
index 8fd9ec4..152af06 100644
--- a/src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/ToolBoxPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/ToolBoxPanel.java
@@ -26,6 +26,7 @@ public class ToolBoxPanel extends ContentPanel {
 	    setWidth(310);
 		setHeaderVisible(false);
 		setResize(true);
+		setBodyBorder(false);
 		toolBox = new ToolBox("ToolBox",eventBus,this);
 		add(toolBox);
 		startPanel();
@@ -74,6 +75,7 @@ public class ToolBoxPanel extends ContentPanel {
 		case START:
 			break;
 		case TR_CLOSE:
+			this.enable();
 			closePanel();
 			break;
 		case TR_OPEN:
@@ -93,10 +95,7 @@ public class ToolBoxPanel extends ContentPanel {
 	protected void doToolBoxPanelOpenSwitch(){
 		if (uiStateType == UIStateType.TR_OPEN) {
 			if (state == ToolBoxPanelState.OPENED) {
-				collapse();
-				disable();
 				
-				state = ToolBoxPanelState.CLOSED;
 				toolBox.closeTabs();
 				Log.debug("ToolBoxPanel Closed");
 			} else {
@@ -121,9 +120,6 @@ public class ToolBoxPanel extends ContentPanel {
 	}
 	
 	public void closePanel(){
-		collapse();
-		disable();
-		state=ToolBoxPanelState.CLOSED;
 		toolBox.closeTabs();
 		Log.debug("ToolBoxPanel Closed");
 	}
@@ -132,7 +128,7 @@ public class ToolBoxPanel extends ContentPanel {
 		enable();
 		expand();
 		state = ToolBoxPanelState.OPENED;
-		toolBox.openTabs();
+		toolBox.startTabs();
 
 	}
 	
diff --git a/src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/help/HelpPanel.java b/src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/help/HelpPanel.java
index d164043..0466691 100644
--- a/src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/help/HelpPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/help/HelpPanel.java
@@ -50,7 +50,7 @@ public class HelpPanel extends FramedPanel {
 
 	public void addContents() {
 		HTML title=new HTML("<H2>Tabular Data Manager Help<H2>");
-		add(title);
+		vl.add(title,new VerticalLayoutData(-1, -1, new Margins(1,1,6,1)));
 		
 		contents = new FieldSet();
 		contents.setHeadingText("Contents");
@@ -69,7 +69,7 @@ public class HelpPanel extends FramedPanel {
 		layoutCaptions.add(info,
 				new VerticalLayoutData(-1, -1, new Margins(1)));
 
-		vl.add(contents);
+		vl.add(contents,new VerticalLayoutData(-1, -1, new Margins(1)));
 
 	}