diff --git a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/MainBox.java b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/MainBox.java
index c701495..a80cebe 100644
--- a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/MainBox.java
+++ b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/MainBox.java
@@ -221,6 +221,7 @@ public class MainBox extends TabPanel {
 						tdxPanel.update(tabularResourceDataView);
 						// TabItemConfig tabItemConfig=getConfig(tdxPanel);
 						found = true;
+						forceLayout();
 						break;
 					}
 				}
@@ -229,8 +230,7 @@ public class MainBox extends TabPanel {
 				}
 
 			}
-			//TODO
-			forceLayout();
+			
 		} catch (Throwable e) {
 			Log.error("Error in MainBox: " + e.getLocalizedMessage());
 			e.printStackTrace();
@@ -242,6 +242,7 @@ public class MainBox extends TabPanel {
 			if (tdxPanel.getTabularResourceDataView().getTrId().getId()
 					.compareTo(tabularResourceDataView.getTrId().getId()) == 0) {
 				tdxPanel.update(tabularResourceDataView);
+				Log.debug("Set Active Widget: "+tdxPanel.getId());
 				setActiveWidget(tdxPanel);
 				return;
 			}
@@ -254,15 +255,7 @@ public class MainBox extends TabPanel {
 	protected void addContentTDXPanel(
 			TabularResourceDataView tabularResourceDataView,
 			TabResource tabResource) {
-		/*
-		 * TabItemConfig tdxPanelItemConf = new TabItemConfig();
-		 * tdxPanelItemConf.setClosable(true); SafeHtmlBuilder safeHtmlBuilder =
-		 * new SafeHtmlBuilder();
-		 * safeHtmlBuilder.appendHtmlConstant("<span title='")
-		 * .appendEscaped(tabResource.getName()).appendHtmlConstant("'>")
-		 * .appendEscaped(tabResource.getName()).appendHtmlConstant("</span>");
-		 * tdxPanelItemConf.setHTML(safeHtmlBuilder.toSafeHtml());
-		 */
+		
 		TabItemConfig tdxPanelItemConf = new TabItemConfig(
 				tabResource.getName(), true);
 		tdxPanelItemConf.setIcon(MainboxResources.INSTANCE.tabularResource());
@@ -310,7 +303,7 @@ public class MainBox extends TabPanel {
 
 		});
 		setActiveWidget(tdxPanel);
-		//forceLayout();
+		forceLayout();
 	}
 
 	protected void addWelcomeTab() {