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 7c45df9..6f1de70 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
@@ -11,12 +11,13 @@ import com.google.gwt.resources.client.ResourceCallback;
 import com.google.gwt.resources.client.ResourceException;
 import com.google.gwt.resources.client.TextResource;
 import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.ui.HTML;
 import com.google.web.bindery.event.shared.EventBus;
 import com.sencha.gxt.cell.core.client.ButtonCell.IconAlign;
+import com.sencha.gxt.core.client.dom.ScrollSupport.ScrollMode;
 import com.sencha.gxt.core.client.util.Margins;
 import com.sencha.gxt.widget.core.client.FramedPanel;
 import com.sencha.gxt.widget.core.client.button.TextButton;
+import com.sencha.gxt.widget.core.client.container.HtmlLayoutContainer;
 import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer;
 import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.VerticalLayoutData;
 import com.sencha.gxt.widget.core.client.event.SelectEvent;
@@ -50,6 +51,7 @@ public class HelpPanel extends FramedPanel {
 		setBorders(false);
 
 		vl = new VerticalLayoutContainer();
+		vl.setScrollMode(ScrollMode.AUTO);
 		vl.setAdjustForScroll(true);
 		initInformation();
 		this.add(vl);
@@ -57,8 +59,8 @@ public class HelpPanel extends FramedPanel {
 	}
 
 	public void addContents() {
-		HTML title = new HTML("<H2>" + msgs.helpPanelTitle() + "<H2>");
-		vl.add(title, new VerticalLayoutData(-1, -1, new Margins(1, 1, 10, 1)));
+		HtmlLayoutContainer title = new HtmlLayoutContainer("<H2>" + msgs.helpPanelTitle() + "<H2>");
+		vl.add(title, new VerticalLayoutData(-1, -1, new Margins(0)));
 
 		contents = new FieldSet();
 		contents.setHeadingText(msgs.contents());
@@ -69,7 +71,7 @@ public class HelpPanel extends FramedPanel {
 		
 	
 		contents.add(layoutCaptions);
-		HTML info = new HTML(msgs.info());
+		HtmlLayoutContainer info = new HtmlLayoutContainer(msgs.info());
 
 		wikiButton = new TextButton(msgs.wikiButton());
 		wikiButton.setIcon(ResourceBundle.INSTANCE.wiki());
@@ -84,10 +86,10 @@ public class HelpPanel extends FramedPanel {
 		};
 		wikiButton.addSelectHandler(wikiHandler);
 
-		layoutCaptions.add(info, new VerticalLayoutData(1, -1, new Margins(1)));
+		layoutCaptions.add(info, new VerticalLayoutData(1, -1, new Margins(0)));
 		layoutCaptions.add(wikiButton, new VerticalLayoutData(-1, -1,
-				new Margins(1)));
-		vl.add(contents, new VerticalLayoutData(1, -1, new Margins(1)));
+				new Margins(0)));
+		vl.add(contents, new VerticalLayoutData(1, -1, new Margins(0)));
 
 	}