diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/grid/AbstractItemsCellTable.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/grid/AbstractItemsCellTable.java
index ddb1a34..9ef73db 100644
--- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/grid/AbstractItemsCellTable.java
+++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/grid/AbstractItemsCellTable.java
@@ -54,7 +54,7 @@ public abstract class AbstractItemsCellTable {
 		cellTable.setStriped(true);
 //		cellTable.setBordered(true);
 		cellTable.setCondensed(true);
-		cellTable.setWidth("99%", true);
+		cellTable.setWidth("100%", true);
 		dataProvider.addDataDisplay(cellTable);
 		initTable(cellTable, null, null);
 		cellTable.setKeyboardSelectionPolicy(KeyboardSelectionPolicy.ENABLED);
diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/load/WorkspaceExplorerLoadDialog.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/load/WorkspaceExplorerLoadDialog.java
index c3d2ccb..64641c4 100644
--- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/load/WorkspaceExplorerLoadDialog.java
+++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/load/WorkspaceExplorerLoadDialog.java
@@ -6,6 +6,8 @@ package org.gcube.portlets.widgets.wsexplorer.client.load;
 import org.gcube.portlets.widgets.wsexplorer.client.WorkspaceExplorerConstants;
 import org.gcube.portlets.widgets.wsexplorer.client.WorkspaceExplorerController;
 
+import com.github.gwtbootstrap.client.ui.Modal;
+import com.github.gwtbootstrap.client.ui.ModalFooter;
 import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
@@ -22,12 +24,13 @@ import com.google.gwt.user.client.ui.HorizontalPanel;
  * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
  * Jun 24, 2015
  */
-public class WorkspaceExplorerLoadDialog extends DialogBox implements ClickHandler {
+public class WorkspaceExplorerLoadDialog extends Modal{
 
 	private Button cancel;
 	private WorkspaceExplorerLoadDialog INSTANCE = this;
 	private boolean isValidHide;
 	private String captionTxt;
+	private ModalFooter footer = new ModalFooter();
 	private WorkspaceExplorerController controller = new WorkspaceExplorerController();
 	
 	/**
@@ -37,33 +40,38 @@ public class WorkspaceExplorerLoadDialog extends DialogBox implements ClickHandl
 	 */
 	public WorkspaceExplorerLoadDialog(String captionTxt) {
 		this.captionTxt = (captionTxt==null || captionTxt.isEmpty())?WorkspaceExplorerConstants.WORKSPACE_EXPLORER_CAPTION:captionTxt;
-		setText(this.captionTxt);
+//		setText(this.captionTxt);
+		setAnimation(false);
+		setCloseVisible(true);
+		setTitle(this.captionTxt);
 		isValidHide = false;
 		cancel = new Button("Close");
-
-		DockPanel dock = new DockPanel();
-		dock.setSpacing(5);
+		setWidth(710);
+//		setHeight("650px");
+		setMaxHeigth("500px");
+//		DockPanel dock = new DockPanel();
+//		dock.setSpacing(5);
 
 		// dock.add(okButton, DockPanel.SOUTH);
 		// dock.add(cancel, DockPanel.SOUTH);
 
-		HorizontalPanel hp = new HorizontalPanel();
-		hp.setStyleName("margin-auto");
-////		hp.add(okButton);
-//		hp.setWidth("50%");
-//		hp.setStyleAttribute("margin", "0 auto");
-		hp.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_CENTER);
-		cancel.getElement().getStyle().setMarginTop(5.0, Unit.PX);
-//		cancel.getElement().getStyle().setMarginBottom(5.0, Unit.PX);
-//		hp.getElement().getStyle().setMarginLeft("0 auto", Unit.PCT);
-		hp.add(cancel);
-		dock.add(hp, DockPanel.SOUTH);
-
-		dock.add(controller.getWorkspaceExplorerPanel(), DockPanel.CENTER);
-
-		dock.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_CENTER);
-		dock.setWidth("100%");
-		setWidget(dock);
+//		HorizontalPanel hp = new HorizontalPanel();
+//		hp.setStyleName("margin-auto");
+//////		hp.add(okButton);
+////		hp.setWidth("50%");
+////		hp.setStyleAttribute("margin", "0 auto");
+//		hp.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_CENTER);
+//		cancel.getElement().getStyle().setMarginTop(5.0, Unit.PX);
+////		cancel.getElement().getStyle().setMarginBottom(5.0, Unit.PX);
+////		hp.getElement().getStyle().setMarginLeft("0 auto", Unit.PCT);
+//		hp.add(cancel);
+//		dock.add(hp, DockPanel.SOUTH);
+//
+//		dock.add(controller.getWorkspaceExplorerPanel(), DockPanel.CENTER);
+//
+//		dock.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_CENTER);
+//		dock.setWidth("100%");
+		add(controller.getWorkspaceExplorerPanel());
 
 //		okButton.addClickHandler(new ClickHandler() {
 //
@@ -80,21 +88,12 @@ public class WorkspaceExplorerLoadDialog extends DialogBox implements ClickHandl
 				INSTANCE.hide();
 			}
 		});
+		
+		footer.add(cancel);
+		
+		add(footer);
 	}
 	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * com.google.gwt.event.dom.client.ClickHandler#onClick(com.google.gwt.event
-	 * .dom.client.ClickEvent)
-	 */
-	@Override
-	public void onClick(ClickEvent event) {
-		hide();
-	}
-
-	
 	/**
 	 * @return the captionTxt
 	 */