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 aa9e72c..daae519 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
@@ -25,10 +25,10 @@ public class ToolBox extends TabPanel {
 	protected ToolBoxPanel toolBoxPanel;
 	protected HelpPanel helpPanel;
 	protected ChangeColumnTypePanel changeColumnTypePanel;
-	//protected TdTaskController tdTaskController;
-	//protected DialogBox tdTaskMainWindow;
+	// protected TdTaskController tdTaskController;
+	// protected DialogBox tdTaskMainWindow;
 	protected FramedPanel taskPanel;
-	
+
 	public ToolBox(String name, EventBus eventBus, ToolBoxPanel toolBoxPanel) {
 		super();
 		Log.debug("Create ToolBox");
@@ -40,57 +40,53 @@ public class ToolBox extends TabPanel {
 		setAnimScroll(true);
 		setTabScroll(true);
 		setCloseContextMenu(true);
-		
-		
+
 		// setResizeTabs(true);
 
 	}
 
-	
-	public void startTabs(){
+	public void startTabs() {
 		Log.debug("Start ToolBox Tabs");
 		addHelpPanel();
 		setActiveWidget(getWidget(0));
 
 	}
-	
+
 	public void openPropertiesTab() {
 		Log.debug("Open Properties Tab");
 		if (trProperties == null) {
 			addTrProperties();
 		}
 		setActiveWidget(trProperties);
-	
+
 	}
-	
+
 	public void openColumnTypeChangeTab(TRId trId, String columnName) {
 		Log.debug("Open Column Type Change Tab");
-		if (changeColumnTypePanel  == null) {
+		if (changeColumnTypePanel == null) {
 			addChangeColumnTypePanel(trId, columnName);
 		}
 		setActiveWidget(changeColumnTypePanel);
-	
+
 	}
-	
-	
+
 	public void closePropertiesTabs() {
 		Log.debug("Close Properties Tab");
-		if(trProperties!=null){
+		if (trProperties != null) {
 			remove(trProperties);
-			trProperties=null;
+			trProperties = null;
 		}
-		
-		
+
 	}
-	
-	public void closeChangeColumnTypePanel(){
+
+	public void closeChangeColumnTypePanel() {
 		Log.debug("Close ChangeColumnTypePanel Tab");
 		if (changeColumnTypePanel != null) {
 			remove(changeColumnTypePanel);
-			changeColumnTypePanel=null;
+			changeColumnTypePanel = null;
 		}
 	}
-	
+
 	public void updateTabs() {
 		Log.debug("Update ToolBox Tabs");
 		if (trProperties != null) {
@@ -98,60 +94,54 @@ public class ToolBox extends TabPanel {
 		}
 		if (changeColumnTypePanel != null) {
 			remove(changeColumnTypePanel);
-			changeColumnTypePanel=null;
+			changeColumnTypePanel = null;
 		}
-		
-		
+
 	}
-	
+
 	protected void addHelpPanel() {
 		TabItemConfig propertiesItemConf = new TabItemConfig("Help", false);
-		
+
 		helpPanel = new HelpPanel("Help", eventBus);
 		helpPanel.setHeaderVisible(false);
 		add(helpPanel, propertiesItemConf);
 
-		
-		
 	};
-	
-	
-	
+
 	protected void addTrProperties() {
 		TabItemConfig propertiesItemConf = new TabItemConfig("Properties", true);
-		
+
 		trProperties = new TabularResourceProperties("TRProperties", eventBus);
 		trProperties.setHeaderVisible(false);
 		add(trProperties, propertiesItemConf);
 
 		addBeforeCloseHandler(new BeforeCloseHandler<Widget>() {
 
-	
 			public void onBeforeClose(BeforeCloseEvent<Widget> event) {
-				if (getWidgetCount() == 1) {
-					toolBoxPanel.closePanelOnly();
+				if (trProperties == event.getItem()) {
 					remove(trProperties);
+					trProperties = null;
 				}
-
 			}
 
 		});
 	};
-	
 
 	protected void addChangeColumnTypePanel(TRId trId, String columnName) {
-		TabItemConfig changeColumnTypeItemConf = new TabItemConfig("Column Type", true);
-		
-		changeColumnTypePanel = new ChangeColumnTypePanel(trId,columnName,eventBus);
+		TabItemConfig changeColumnTypeItemConf = new TabItemConfig(
+				"Column Type", true);
+
+		changeColumnTypePanel = new ChangeColumnTypePanel(trId, columnName,
+				eventBus);
 		add(changeColumnTypePanel, changeColumnTypeItemConf);
 
 		addBeforeCloseHandler(new BeforeCloseHandler<Widget>() {
 
-	
 			public void onBeforeClose(BeforeCloseEvent<Widget> event) {
-				if (getWidgetCount() == 1) {
-					toolBoxPanel.closePanelOnly();
+				if (changeColumnTypePanel == event.getItem()) {
 					remove(changeColumnTypePanel);
+					changeColumnTypePanel = null;
+
 				}
 
 			}
@@ -159,36 +149,32 @@ public class ToolBox extends TabPanel {
 		});
 	};
 
-	
-	
-	
 	protected void addTdTaskPanel() {
-		
-		//tdTaskController = TdTaskController.getInstance();
-		//tdTaskController.bindCommonBus(eventBus);
-		//tdTaskMainWindow = tdTaskController.getWindowTaskMonitor(); // This is main panel
-		
-		taskPanel=new FramedPanel();
+
+		// tdTaskController = TdTaskController.getInstance();
+		// tdTaskController.bindCommonBus(eventBus);
+		// tdTaskMainWindow = tdTaskController.getWindowTaskMonitor(); // This
+		// is main panel
+
+		taskPanel = new FramedPanel();
 		taskPanel.setHeaderVisible(false);
-		TextButton buttonTask=new TextButton("Tasks");
+		TextButton buttonTask = new TextButton("Tasks");
 		buttonTask.addSelectHandler(new SelectEvent.SelectHandler() {
-			
-		
+
 			public void onSelect(SelectEvent event) {
-				//tdTaskMainWindow.show();
-				
+				// tdTaskMainWindow.show();
+
 			}
-		
+
 		});
-		
+
 		taskPanel.add(buttonTask);
-		
+
 		TabItemConfig tdTasksItemConf = new TabItemConfig("Tasks", true);
 
 		add(taskPanel, tdTasksItemConf);
 		addBeforeCloseHandler(new BeforeCloseHandler<Widget>() {
 
-			
 			public void onBeforeClose(BeforeCloseEvent<Widget> event) {
 				if (getWidgetCount() == 1) {
 					toolBoxPanel.closePanelOnly();