diff --git a/o2web/source/o2_core/o2/widget/$Toolbar/xform_side_blue_simple/css.wcss b/o2web/source/o2_core/o2/widget/$Toolbar/xform_side_blue_simple/css.wcss
index 93b818817aba1c9e421c1fa8920e9982b54b689a..b429a731c91b06e229eb2abb6d75c43cf63b2275 100644
--- a/o2web/source/o2_core/o2/widget/$Toolbar/xform_side_blue_simple/css.wcss
+++ b/o2web/source/o2_core/o2/widget/$Toolbar/xform_side_blue_simple/css.wcss
@@ -33,7 +33,7 @@
 		//"float": "left",
 		"border": "1px solid #fff",
 		"background-color": "#fff",
-		"height": "30px",
+		"min-height": "30px",
 		"margin-right": "8px",
 		"padding-left": "2px",
 		"padding-right": "2px",
@@ -57,12 +57,18 @@
 	},
 	"buttonTextDiv": {
 		"display":"block",
-		"float": "left",
-		"height": "30px",
+//		"float": "left",
+//		"height": "30px",
 		"padding-left": "2px",
 		"padding-right": "2px",
-		"line-height": "30px",
-		"cursor": "pointer"
+//		"line-height": "30px",
+		"cursor": "pointer",
+		"min-height": "20px",
+		"margin-left": "22px",
+		"line-height": "20px",
+		"padding-top": "5px",
+		"padding-bottom": "5px",
+		"word-break": "break-all"
 	},
 
 	"buttonDisable": {
diff --git a/o2web/source/x_component_process_Xform/Sidebar.js b/o2web/source/x_component_process_Xform/Sidebar.js
index f70e10af3394c5541e9f3384d6286fb4d03a0965..8aa371051f8ee16171e93df81b0812a1a20c6a24 100644
--- a/o2web/source/x_component_process_Xform/Sidebar.js
+++ b/o2web/source/x_component_process_Xform/Sidebar.js
@@ -42,6 +42,12 @@ MWF.xApplication.process.Xform.Sidebar = MWF.APPSidebar =  new Class(
         },
     _loadUserInterface: function(){
         this.node.setStyles(this.form.css.sidebar);
+        this.node.setStyles({
+           "min-width":"126px",
+           "max-width":"240px",
+           "width": "auto"
+        });
+        // this.node.setStyle("width", this.node.getSize().x+"px");
         this.toolbarNode = this.node.getFirst("div");
         this.toolbarNode.empty();
 
@@ -222,11 +228,17 @@ MWF.xApplication.process.Xform.Sidebar = MWF.APPSidebar =  new Class(
         }
 
 
-        var left = sideSize.x+sidePosition.x+5;
+        //var left = sideSize.x+sidePosition.x+5;
+        var x = sidePosition.x+sideSize.x+nodeSize.x;
+        var left;
+        if( x > size.x ){
+            left = size.x - nodeSize.x - 5;
+        }else{
+            left = sideSize.x+sidePosition.x+5;
+        }
+
         this.node.setStyle("left", ""+left+"px");
         this.node.setStyle("position", "absolute");
-
-
         this.node.setStyles({"right": "auto", "bottom": "auto"});
 
         // this.json.styles = this.node.getStyles(["top", "left", "bottom", "right", "position"]);