diff --git a/guibuilder/src/TGuiBldDragManager.cxx b/guibuilder/src/TGuiBldDragManager.cxx
index f1b424ca28f55ef49be60203b5d0dc6fd3e0af3b..48f531131718c66626c7938590c2d04b389101bb 100644
--- a/guibuilder/src/TGuiBldDragManager.cxx
+++ b/guibuilder/src/TGuiBldDragManager.cxx
@@ -1,4 +1,4 @@
-// @(#)root/guibuilder:$Name:  $:$Id: TGuiBldDragManager.cxx,v 1.18 2004/10/07 09:56:53 rdm Exp $
+// @(#)root/guibuilder:$Name:  $:$Id: TGuiBldDragManager.cxx,v 1.19 2004/10/11 16:25:10 rdm Exp $
 // Author: Valeriy Onuchin   12/09/04
 
 /*************************************************************************
@@ -1218,7 +1218,7 @@ Bool_t TGuiBldDragManager::HandleEvent(Event_t *event)
             }
 
             if (dbl_clk) {
-               if (event->fState == (kKeyControlMask | kButton1Mask)) {
+               if (event->fState & kKeyControlMask) {
                   TGWindow *root = (TGWindow *)fClient->GetRoot();
                   root->SetEditable(kFALSE);
                   SetEditable(kFALSE);
diff --git a/guibuilder/src/TGuiBuilder.cxx b/guibuilder/src/TGuiBuilder.cxx
index 53f7688f7fab8bc425a371d17d08a7e02025a447..e91e1603159d30e2cd9be54ebc565178ef4524e1 100644
--- a/guibuilder/src/TGuiBuilder.cxx
+++ b/guibuilder/src/TGuiBuilder.cxx
@@ -1,4 +1,4 @@
-// @(#)root/guibuilder:$Name:  $:$Id: TGuiBuilder.cxx,v 1.19 2004/10/06 14:38:19 brun Exp $
+// @(#)root/guibuilder:$Name:  $:$Id: TGuiBuilder.cxx,v 1.20 2004/10/07 09:56:53 rdm Exp $
 // Author: Valeriy Onuchin   12/09/04
 
 /*************************************************************************
@@ -310,8 +310,11 @@ TGuiBuilder::TGuiBuilder(const TGWindow *p) : TVirtualGuiBld(),
    }
 
    AddSection("Projects");
-   AddSection("Standard");
+   AddSection("Buttons");
    AddSection("Containers");
+   AddSection("Input");
+   AddSection("Display");
+
 //   AddSection("Extended");
 
    TGuiBldAction *act = new TGuiBldAction("TGMainFrame", "Main Frame", kGuiBldProj);
@@ -323,57 +326,67 @@ TGuiBuilder::TGuiBuilder(const TGWindow *p) : TVirtualGuiBld(),
    act = new TGuiBldAction("TGTextButton", "Text Button", kGuiBldCtor);
    act->fAct = "new TGTextButton()";
    act->fPic = "bld_textbutton.xpm";
-   AddAction(act, "Standard");
+   AddAction(act, "Buttons");
 
    act = new TGuiBldAction("TGCheckButton", "Check Button", kGuiBldCtor);
    act->fAct = "new TGCheckButton()";
    act->fPic = "bld_checkbutton.xpm";
-   AddAction(act, "Standard");
+   AddAction(act, "Buttons");
 
    act = new TGuiBldAction("TGRadioButton", "Radio Button", kGuiBldCtor);
    act->fAct = "new TGRadioButton()";
    act->fPic = "bld_radiobutton.xpm";
-   AddAction(act, "Standard");
+   AddAction(act, "Buttons");
 
    act = new TGuiBldAction("TGTextEntry", "Text Entry", kGuiBldCtor);
    act->fAct = "new TGTextEntry()";
    act->fPic = "bld_entry.xpm";
-   AddAction(act, "Standard");
+   AddAction(act, "Input");
 
    act = new TGuiBldAction("TGNumberEntry", "Number Entry", kGuiBldCtor);
    act->fAct = "new TGNumberEntry()";
    act->fPic = "bld_numberentry.xpm";
-   AddAction(act, "Standard");
+   AddAction(act, "Input");
+
+   act = new TGuiBldAction("TGHSlider", "Horizontal Slider", kGuiBldCtor);
+   act->fAct = "new TGHSlider()";
+   act->fPic = "bld_hslider.xpm";
+   AddAction(act, "Input");
+
+   act = new TGuiBldAction("TGVSlider", "Vertical Slider", kGuiBldCtor);
+   act->fAct = "new TGVSlider()";
+   act->fPic = "bld_vslider.xpm";
+   AddAction(act, "Input");
 
    act = new TGuiBldAction("TGLabel", "Text Label", kGuiBldCtor);
    act->fAct = "new TGLabel()";
    act->fPic = "bld_label.xpm";
-   AddAction(act, "Standard");
+   AddAction(act, "Display");
 
    act = new TGuiBldAction("TGHorizontal3DLine", "Horizontal Line", kGuiBldCtor);
    act->fAct = "new TGHorizontal3DLine()";
    act->fPic = "bld_hseparator.xpm";
-   AddAction(act, "Standard");
+   AddAction(act, "Display");
 
    act = new TGuiBldAction("TGVertical3DLine", "Vertical Line", kGuiBldCtor);
    act->fAct = "new TGVertical3DLine()";
    act->fPic = "bld_vseparator.xpm";
-   AddAction(act, "Standard");
+   AddAction(act, "Display");
 
    act = new TGuiBldAction("TGStatusBar", "Status Bar", kGuiBldCtor);
    act->fAct = "new TGStatusBar()";
    act->fPic = "bld_statusbar.xpm";
-   AddAction(act, "Standard");
+   AddAction(act, "Display");
 
    act = new TGuiBldAction("TGHProgressBar", "Progress Bar", kGuiBldCtor);
    act->fAct = "new TGHProgressBar()";
    act->fPic = "bld_hprogressbar.xpm";
-   AddAction(act, "Standard");
+   AddAction(act, "Display");
 /*
    act = new TGuiBldAction("TRootEmbeddedCanvas", "Embedded Canvas", kGuiBldCtor);
    act->fAct = "new TRootEmbeddedCanvas()";
    act->fPic = "bld_embedcanvas.xpm";
-   AddAction(act, "Standard");
+   AddAction(act, "Display");
 */
    // Containers
    act = new TGuiBldAction("TGHorizontalFrame", "Horizontal Frame", kGuiBldCtor);
diff --git a/icons/bld_hslider.xpm b/icons/bld_hslider.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..bfdaee1579a0be320387072547e77e9f3630c340
--- /dev/null
+++ b/icons/bld_hslider.xpm
@@ -0,0 +1,34 @@
+/* XPM */
+static char *hscale_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"21 21 7 1",
+"  c Gray0",
+". c #7b7b7b",
+"X c #d6d6d6",
+"o c #b3cece",
+"O c Gray87",
+"+ c Gray100",
+"@ c None",
+/* pixels */
+"@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@",
+"@@@  @@@@@  @@@@@@@@@",
+"@@ @@ @@@ @@ @@@@@@@@",
+"@@ @@ @@@ @@ @@@@@@@@",
+"@@ @@ @@@ @@ @@@@@@@@",
+"@@ @@ @@@ @@ @@@@@@@@",
+"@@@  @@ @@  @@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@",
+".....................",
+".                   +",
+". ++++++++ XXXXXXXXO+",
+". +XXX.XX. XXXXXXXXO+",
+". +XXX.XX. XXXXXXXXO+",
+". +....... XXXXXXXXO+",
+".          XXXXXXXXO+",
+". OOOOOOOOOOOOOOOOOO+",
+".++++++++++++++++++++",
+"@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@"
+};
diff --git a/icons/bld_vslider.xpm b/icons/bld_vslider.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..339698fd0c99a316bd884cdc2fb6c4794488279a
--- /dev/null
+++ b/icons/bld_vslider.xpm
@@ -0,0 +1,34 @@
+/* XPM */
+static char *vscale_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"21 21 7 1",
+"  c Gray0",
+". c #7b7b7b",
+"X c #d6d6d6",
+"o c #b3cece",
+"O c Gray87",
+"+ c Gray100",
+"@ c None",
+/* pixels */
+".........@@@@@@@@@@@@",
+".       +@@@@@@@@@@@@",
+". ++++ O+@@@@@@@@@@@@",
+". +XX. O+@@@@@@@@@@@@",
+". +XX. O+@@  @@@@@  @",
+". +XX. O+@ @@ @@@ @@ ",
+". +... O+@ @@ @@@ @@ ",
+". +XX. O+@ @@ @@@ @@ ",
+". +XX. O+@ @@ @@@ @@ ",
+". +... O+@@  @@ @@  @",
+".      O+@@@@@@@@@@@@",
+". XXXXXO+@@@@@@@@@@@@",
+". XXXXXO+@@@@@@@@@@@@",
+". XXXXXO+@@@@@@@@@@@@",
+". XXXXXO+@@@@@@@@@@@@",
+". XXXXXO+@@@@@@@@@@@@",
+". XXXXXO+@@@@@@@@@@@@",
+". XXXXXO+@@@@@@@@@@@@",
+". XXXXXO+@@@@@@@@@@@@",
+". OOOOOO+@@@@@@@@@@@@",
+".++++++++@@@@@@@@@@@@"
+};