diff --git a/comp/src/gb.web.form/.hidden/control/webmenubar.png b/comp/src/gb.web.form/.hidden/control/webmenubar.png
new file mode 100644
index 000000000..9302fbda0
Binary files /dev/null and b/comp/src/gb.web.form/.hidden/control/webmenubar.png differ
diff --git a/comp/src/gb.web.form/.info b/comp/src/gb.web.form/.info
index 07a03b5b2..2d26d45aa 100644
--- a/comp/src/gb.web.form/.info
+++ b/comp/src/gb.web.form/.info
@@ -732,6 +732,10 @@ _GetUpdateJS
 m
 s
 (sEvent)s(sProp)s[(sGetValue)s(sMore)s]
+_GetUpdateWaitJS
+m
+s
+(sEvent)s(sProp)s[(sGetValue)s(sMore)s]
 _UpdateProperty
 m
 
@@ -1370,6 +1374,25 @@ _UpdateProperty
 m
 
 (sProp)s(vValue)v
+#WebMenuBar
+WebContainer
+C
+_Properties
+C
+s
+"*,-Arrangement"
+_DefaultArrangement
+C
+s
+"H"
+_Similar
+C
+s
+"WebContainer"
+_new
+m
+
+
 #WebMenuItem
 WebControl
 C
diff --git a/comp/src/gb.web.form/.list b/comp/src/gb.web.form/.list
index 32781b054..ac87a52d0 100644
--- a/comp/src/gb.web.form/.list
+++ b/comp/src/gb.web.form/.list
@@ -20,6 +20,7 @@ WebHtml!
 WebImage!
 WebLabel!
 WebMenu!
+WebMenuBar!
 WebMenuItem!
 WebProgressBar!
 WebRadioButton!
diff --git a/comp/src/gb.web.form/.project b/comp/src/gb.web.form/.project
index 860062f9d..4c0303c3c 100644
--- a/comp/src/gb.web.form/.project
+++ b/comp/src/gb.web.form/.project
@@ -1,6 +1,6 @@
 # Gambas Project File 3.0
 # Compiled with Gambas 3.9.90
-Startup=FTestWebUploader
+Startup=Webform2
 UseHttpServer=1
 Version=3.9.90
 VersionFile=1
diff --git a/comp/src/gb.web.form/.src/Test/Webform2.class b/comp/src/gb.web.form/.src/Test/Webform2.class
index 191be05de..b347bdae4 100644
--- a/comp/src/gb.web.form/.src/Test/Webform2.class
+++ b/comp/src/gb.web.form/.src/Test/Webform2.class
@@ -10,7 +10,7 @@ End
 
 Public Sub WebButton1_Click()
 
-  WebTabPanel1.Index = 1 - WebTabPanel1.Index
+  WebTabPanel1.Index = 1
 
 End
 
@@ -129,7 +129,7 @@ End
 
 Public Sub WebForm_Message(Source As WebControl, Action As String)
 
-  Debug "Action '"; Action; "' on '"; Source.Name; "'"
+  'Debug "Action '"; Action; "' on '"; Source.Name; "'"
 
 End
 
diff --git a/comp/src/gb.web.form/.src/Test/Webform2.webform b/comp/src/gb.web.form/.src/Test/Webform2.webform
index b250448ca..96afb2712 100644
--- a/comp/src/gb.web.form/.src/Test/Webform2.webform
+++ b/comp/src/gb.web.form/.src/Test/Webform2.webform
@@ -5,15 +5,11 @@
   Height = "100%"
   Arrangement = Arrange.Vertical
   Title = ("This is webform2")
-  { WebSeparator8 WebSeparator
-    #MoveScaled(1,1,136,3)
-    Height = "1px"
-  }
-  { WebHBox1 WebHBox
-    #MoveScaled(1,4,136,17)
+  { WebMenuBar1 WebMenuBar
+    #MoveScaled(1,1,136,48)
     Spacing = True
     { WebMenu3 WebMenu
-      #MoveScaled(1,1,32,15)
+      #MoveScaled(1,1,32,46)
       Text = ("File")
       { WebMenuItem7 WebMenuItem
         #MoveScaled(1,1,30,4)
@@ -66,7 +62,7 @@
       }
     }
     { WebMenu1 WebMenu
-      #MoveScaled(34,1,30,15)
+      #MoveScaled(34,1,30,46)
       Text = ("Project")
       { WebMenuItem2 WebMenuItem
         #MoveScaled(1,1,28,4)
@@ -97,10 +93,9 @@
     }
   }
   { WebContainer1 WebHBox
-    #MoveScaled(1,21,136,6)
+    #MoveScaled(1,49,136,6)
     { WebButton1 WebButton
       #MoveScaled(1,1,13,4)
-      Border = False
       Text = ("A button")
     }
     { WebButton2 WebButton
@@ -132,7 +127,7 @@
     }
   }
   { WebContainer9 WebContainer
-    #MoveScaled(1,27,136,88)
+    #MoveScaled(1,55,136,88)
     Expand = True
     Arrangement = Arrange.Vertical
     Margin = True
diff --git a/comp/src/gb.web.form/.src/WebComboBox.class b/comp/src/gb.web.form/.src/WebComboBox.class
index ea161a388..9bcdf556f 100644
--- a/comp/src/gb.web.form/.src/WebComboBox.class
+++ b/comp/src/gb.web.form/.src/WebComboBox.class
@@ -64,7 +64,7 @@ Public Sub _Render()
     Print "<div class=\"gw-combobox-arrow\">";
   Endif
   
-  Print "<select id=\""; Me.Name; "-select\" autocomplete=\"off\""; Me._GetUpdateJS("onchange", "index", "this.selectedIndex"); 
+  Print "<select id=\""; Me.Name; "-select\" autocomplete=\"off\""; Me._GetUpdateWaitJS("onchange", "index", "this.selectedIndex"); 
   If Not Me.Enabled Then Print " disabled";
   Print ">"
   
diff --git a/comp/src/gb.web.form/.src/WebContainer.class b/comp/src/gb.web.form/.src/WebContainer.class
index c6d83dc89..3f02d1f8e 100644
--- a/comp/src/gb.web.form/.src/WebContainer.class
+++ b/comp/src/gb.web.form/.src/WebContainer.class
@@ -161,7 +161,7 @@ Public Sub _RenderStyleSheet()
       Select Case $iArrangement
         Case Arrange.Horizontal
           Me._AddStyleSheet("flex-flow:row;")
-          Me._AddStyleSheet("overflow:hidden;")
+          Me._AddStyleSheet("overflow-x:hidden;")
         Case Arrange.Vertical
           Me._AddStyleSheet("flex-flow:column;")
         Case Arrange.Column
diff --git a/comp/src/gb.web.form/.src/WebControl.class b/comp/src/gb.web.form/.src/WebControl.class
index 7f732f775..60279e4cb 100644
--- a/comp/src/gb.web.form/.src/WebControl.class
+++ b/comp/src/gb.web.form/.src/WebControl.class
@@ -569,18 +569,18 @@ End
 Public Sub _GetUpdateJS(sEvent As String, sProp As String, Optional sGetValue As String = "null", Optional sMore As String) As String
   
   Dim sStr As String
-  
-  sStr = " " & sEvent & "=\"gw.update(" '& JS(Me.Form.Name) & "," 
-  'If Me Is WebForm Then
-  '  sStr &= "null"
-  'Else
-    sStr &= JS($sName)
-  'Endif
-  sStr &= "," & JS(sProp) & "," & sGetValue & ");"
+  sStr = " " & sEvent & "=\"gw.update(" & JS($sName) & "," & JS(sProp) & "," & sGetValue & ");"
   If sMore Then sStr &= sMore
-  sStr &= "\""
+  Return sStr & "\""
   
-  Return sStr
+End
+
+Public Sub _GetUpdateWaitJS(sEvent As String, sProp As String, Optional sGetValue As String = "null", Optional sMore As String) As String
+  
+  Dim sStr As String
+  sStr = " " & sEvent & "=\"gw.updateWait(" & JS($sName) & "," & JS(sProp) & "," & sGetValue & ");"
+  If sMore Then sStr &= sMore
+  Return sStr & "\""
   
 End
 
diff --git a/comp/src/gb.web.form/.src/WebForm.class b/comp/src/gb.web.form/.src/WebForm.class
index 9ee063f24..9b7f30e92 100644
--- a/comp/src/gb.web.form/.src/WebForm.class
+++ b/comp/src/gb.web.form/.src/WebForm.class
@@ -285,7 +285,7 @@ End
 
 Public Sub Render()
 
-  Dim sImage As Variant
+  Dim sImage As String
   
   Response.Buffered = True
   Response.Begin
diff --git a/comp/src/gb.web.form/.src/WebMenu.class b/comp/src/gb.web.form/.src/WebMenu.class
index 65a58468f..ec77f32f3 100644
--- a/comp/src/gb.web.form/.src/WebMenu.class
+++ b/comp/src/gb.web.form/.src/WebMenu.class
@@ -18,7 +18,7 @@ Private $sImage As String
 
 Public Sub _new()
   
-  Me.Arrangement = Arrange.Vertical
+  'Me.Arrangement = Arrange.Vertical
   
 End
 
diff --git a/comp/src/gb.web.form/.src/WebMenuBar.class b/comp/src/gb.web.form/.src/WebMenuBar.class
new file mode 100644
index 000000000..cf90d57a9
--- /dev/null
+++ b/comp/src/gb.web.form/.src/WebMenuBar.class
@@ -0,0 +1,14 @@
+' Gambas class file
+
+Export
+Inherits WebContainer
+
+Public Const _Properties As String = "*,-Arrangement"
+Public Const _DefaultArrangement As String = "H"
+Public Const _Similar As String = "WebContainer"
+
+Public Sub _new()
+  
+  Me.Arrangement = Arrange.Horizontal
+  
+End
diff --git a/comp/src/gb.web.form/.src/WebTabPanel.class b/comp/src/gb.web.form/.src/WebTabPanel.class
index a0296d9be..87e33deb9 100644
--- a/comp/src/gb.web.form/.src/WebTabPanel.class
+++ b/comp/src/gb.web.form/.src/WebTabPanel.class
@@ -124,7 +124,7 @@ Public Sub _Render()
     Print "\" style=\"display:flex;flex-flow:row;\">"
     For I = 0 To $aTab.Max
       Print "<div class=\""; If(I = $iIndex, "gw-tab-selected", "gw-tab"); "\"";
-      If I <> $iIndex Then Print Me._GetUpdateJS("onclick", "index", CStr(I));
+      If I <> $iIndex Then Print Me._GetUpdateWaitJS("onclick", "index", CStr(I));
       Print ">"; $aText[I]; "</div>"
     Next
     Print "</div>"
diff --git a/comp/src/gb.web.form/.src/WebWindow.class b/comp/src/gb.web.form/.src/WebWindow.class
index aeef715f0..47a394e45 100644
--- a/comp/src/gb.web.form/.src/WebWindow.class
+++ b/comp/src/gb.web.form/.src/WebWindow.class
@@ -59,7 +59,7 @@ Public Sub _RenderStyleSheet()
   
   If $sWidth Then 
     Me._AddStyleSheet("width:" & $sWidth & ";")
-    Me._AddStyleSheet("max-width:" & $sWidth & ";")
+    'Me._AddStyleSheet("max-width:" & $sWidth & ";")
   Endif
   If $sHeight Then Me._AddStyleSheet("height:" & $sHeight & ";")
   
diff --git a/comp/src/gb.web.form/.startup b/comp/src/gb.web.form/.startup
index 37070b187..3d7c0ea8e 100644
--- a/comp/src/gb.web.form/.startup
+++ b/comp/src/gb.web.form/.startup
@@ -1,4 +1,4 @@
-FTestWebUploader
+Webform2
 
 0
 0
diff --git a/comp/src/gb.web.form/lib.js b/comp/src/gb.web.form/lib.js
index 332c69312..e706abd1e 100644
--- a/comp/src/gb.web.form/lib.js
+++ b/comp/src/gb.web.form/lib.js
@@ -329,6 +329,11 @@ gw = {
     gw.send(['update', id, prop, value, true], after);
   },
   
+  updateWait: function(id, prop, value, after)
+  {
+    gw.send(['update', id, prop, value, false], after);
+  },
+  
   command: function(action)
   {
     gw.send(null, action);
@@ -697,7 +702,7 @@ gw = {
     {
       var i, win, last;
       
-      for (i = 0; i < gw.windows.length - 1; i++)
+      for (i = 0; i < gw.windows.length; i++)
       {
         win = gw.windows[i];
         if ($(win).gw_popup)
diff --git a/comp/src/gb.web.form/style.css b/comp/src/gb.web.form/style.css
index 0610db0b7..4f5266382 100644
--- a/comp/src/gb.web.form/style.css
+++ b/comp/src/gb.web.form/style.css
@@ -400,6 +400,9 @@ P:first-child,UL:first-child,OL:first-child {
   border: none;
 }
 
+.gw-menubar {
+  overflow: visible !important;
+}
 
 .gw-menu-title {
   display: inline-table;