diff --git a/ChangeLog b/ChangeLog
index 7ef18c8..df7f9a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,31 +2,59 @@
 Dillo project
 =============================================================================
 
-dillo-3.0 [not released yet]
+dillo-3.0 [September ??, 2011]
 
 +- Ported Dillo to FLTK-1.3.
    Patch: corvid, Johannes Hofmann, Jorge Arellano Cid
-+- Default binding for close-all changed from Alt-q to Ctrl-q.
++- Rewrote the User Interface: much simpler design and event handling.
+ - Avoid double render after going Back or Forward (takes half the time now!).
+ - Added on-the-fly panel resize (tiny/small/medium and normal/small icons).
+ - Implemented a custom tabs handler (to allow fine control of it).
+ - Rewrote dw's crossing-events dispatcher (avoids redundant events).
+ - Fixed a years old bug: stamped tooltips when scrolling with keyboard.
+ - Allow multiple search engines to be set in dillorc, with a menu in the web
+   search dialog to select between them.
+ - Added an optional label to dillorc's search_url. Format: "[<label> ]<url>"
+ - Fixed a border case in URL resolver: empty path + {query|fragment} (BUG#948)
+ - Avoid a certificate dialog storm on some HTTPS sites (BUG#868).
+ - Cancel the expected URL after offering a download (BUG#982)
+ - Default binding for close-all changed from Alt-q to Ctrl-q.
  - Default binding for close-tab changed from Ctrl-q to Ctrl-w.
  - Add right_click_closes_tab preference (default is middle click).
  - 'hide-panels' key action now hides the findbar if present, and toggles
    display of the control panels otherwise.
+ - Removed 'large' option of panel_size preference.
  - Remove 'fullscreen' key action.
+ - Eliminated a pack of 22 compiler warnings (gcc-4.6.1 amd64)
+ - Lots of minor bug-fixes.
    Patches: Jorge Arellano Cid
 +- Remove --enable-ansi configure option.
  - Limit saved cookie size.
  - Allow binding to non-ASCII keys and multimedia keys.
  - Enable line wrapping for <textarea>. (BUG#903)
+ - Wrap image alt text.
    Patches: corvid
++- Add support for CSS adjacent sibling selectors.
+ - Collapse parent's and first child's top margin.
+   Patch: Johannes Hofmann
++- Default binding for left-tab changed to Shift-Ctrl-Tab.
+   Patch: Jeremy Henty
+
+Note: these are user-visible changes. The full Changelog is kept
+      in our Mercurial repository at http://hg.dillo.org/dillo
+
 
 -----------------------------------------------------------------------------
 
-dillo-2.2.1 [not released yet]
-
-+- Implemented "View source" as a dpi.
+dillo-2.2.1 [July 18, 2011]
+
++- Fix fullwindow start.
+ - Implemented "View source" as a dpi.
+ - Fix: vsource html, fix entities display, indentation.
  - Accept application/xhtml+xml.
  - Small caps support.
  - Border-collapse, border-style properties.
+ - Removed gcc warnings for 64bit
    Patches: Jorge Arellano Cid
 +- Configurable User-Agent HTTP header.
    Patch: Alexander Voigt, corvid
diff --git a/NEWS b/NEWS
index a275571..231c193 100644
--- a/NEWS
+++ b/NEWS
@@ -27,6 +27,16 @@
 
   The new FLTK2-based dillo code is released! (under GPL3)
 
+Jul 2011
+
+  Dillo switches to fltk-1.3.0.
+  dillo-2.2.1, the last of the 2.x series is released.
+
+Sep 2011
+
+  dillo-3.0, the first of the 3.x series is released.
+
+
   Jorge.-
   jcid@dillo.org
   Project maintainer, core developer, patcher, you name it! :-)
diff --git a/README b/README
index ecff663..5d9c88b 100644
--- a/README
+++ b/README
@@ -2,28 +2,61 @@
  Dillo web browser
 ===================
 
-  Dillo 2.2 features a major overhaul of the cookies subsystem,
-a reimplementation of the Dillo Plugin (DPI) API, a configurable
-connection limit, and various CSS improvements.
+Dillo-3.0  is  the  first  release of the newest branch, which is
+based  on the already released fltk-1.3 toolkit. This is big news
+because   it  clears  the  way  for  Dillo  to  return  to  those
+distributions  which  had  excluded  Dillo2  due  to  FLTK2 never
+being  officially  released.
 
-  This release is part of the Dillo2 series. In Dillo2, significant
-parts of the codebase were ported to C++, and the rendering engine was
-modified to use the FLTK2 library rather than GTK1.
+The  development effort shifted to the dillo-3.x branch long ago,
+and  it  became  the active one; dillo-2.x received less and less
+attention, and dillo-2.2.1 became the last of its series.
 
-  Here's a list of some well-known problems:
+The  core  team  will  focus  on  implementing the CSS feature of
+floating  elements.  This  will  greatly improve dillo's web page
+rendering since many sites have adopted floats instead of tables.
+
+The  new  dillo3 has shown excellent stability.
+
+The core team welcomes developers willing to join our workforce. 
+
+
+  Here's a list of some old well-known problems of dillo:
 
          * no FRAMES rendering
          * no https (there's a barebones prototype).
 
------
-FLTK2
------
 
-  The FLTK2 library is statically linked into Dillo2.
-  You can get it from fltk.org.
-The recommended version is >= r6916. e.g. in:
+-------
+FLTK1.3
+-------
 
-  http://fltk.org/software.php?VERSION=2.0.x-r6916
+  You can get FLTK-1.3 here:
+
+     http://fltk.org/software.php?VERSION=1.3.0
+
+
+---------------------------
+Building dillo from sources
+---------------------------
+
+  1.- Install fltk:
+
+     tar jxvf fltk-1.3.0-source.tar.gz
+     cd fltk-1.3.0
+     less README.unix
+     make
+     sudo make install
+     cd ..
+    
+  (don't configure fltk with --enable-cairo)
+
+  2.- Then dillo3:
+
+     tar jxvf dillo-3.0.tar.bz2
+     cd dillo-3.0
+     ./autogen.sh; ./configure; make
+     sudo make install-strip
 
 
 ------------
@@ -67,4 +100,4 @@
 
 Jorge.-
 (jcid@dillo.org)
-June, 2009
+August, 2011
diff --git a/config.h.in b/config.h.in
index fcffdf8..371d658 100644
--- a/config.h.in
+++ b/config.h.in
@@ -78,6 +78,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
@@ -103,7 +106,7 @@
 #undef VERSION
 
 /* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used. If the typedef was allowed, the
+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
    #define below would cause a syntax error. */
 #undef _UINT32_T
 
diff --git a/dillorc b/dillorc
index 2987a77..42bb741 100644
--- a/dillorc
+++ b/dillorc
@@ -112,12 +112,13 @@
 # Set the URLs used by the web search dialog.
 # "%s" is replaced with the search keywords separated by '+'.
 # Format: search_url="[<label> ]<url>"
-# You can have several search engines, with the first being the default.
-# e.g.
-# search_url="DuckDuckGo http://duckduckgo.com/html?q=%s"
-# search_url="Wikipedia http://www.wikipedia.org/wiki/Special:Search?search=%s"
-# search_url="Lycos http://search.lycos.com/?query=%s"
-#search_url="http://www.google.com/search?ie=UTF-8&oe=UTF-8&q=%s"
+# You can enable multiple search_url strings at once and select from among
+# them at runtime, with the first being the default.
+search_url="http://duckduckgo.com/lite/?kp=-1&q=%s"
+search_url="Scroogle https://ssl.scroogle.org/cgi-bin/nbbwssl.cgi?Gw=%s"
+search_url="Wikipedia http://www.wikipedia.org/w/index.php?search=%s&go=Go"
+search_url="Free Dictionary http://www.thefreedictionary.com/%s"
+search_url="Google http://www.google.com/search?ie=UTF-8&oe=UTF-8&q=%s"
 
 # If set, dillo will ask web servers to send pages in this language.
 # This setting does NOT change dillo's user interface.
@@ -191,15 +192,13 @@
 #                        USER INTERFACE SECTION
 #-------------------------------------------------------------------------
 
-# Size of dillo panel (used to enlarge the browsing area)
-# tiny   :  recommended for iPAQ (with small_icons)
-# small  :  very nice! (it's "medium" without icon titles)
-# medium :  nice!
-# large  :  Traditional
+# Size of dillo panel
+# tiny   : buttons, location, and progress boxes in one row
+# small  : location in one row, buttons + progress boxes in another
+# medium : adds text labels to buttons and boxes
 # panel_size=tiny
 # panel_size=small
 #panel_size=medium
-# panel_size=large
 
 #small_icons=NO
 
diff --git a/dlib/dlib.c b/dlib/dlib.c
index b87d0ce..f2ef2dd 100644
--- a/dlib/dlib.c
+++ b/dlib/dlib.c
@@ -877,11 +877,6 @@
 
    dstr = dStr_sized_new(64);
    while ((ch = fgetc(stream)) != EOF) {
-      if (ch == '\\') {
-         /* continue with the next line */
-         while ((ch = fgetc(stream)) != EOF && ch != '\n') ;
-         continue;
-      }
       dStr_append_c(dstr, ch);
       if (ch == '\n')
          break;
diff --git a/doc/user_help.html b/doc/user_help.html
index ec1c73e..4b35e6e 100644
--- a/doc/user_help.html
+++ b/doc/user_help.html
@@ -309,7 +309,7 @@
 <tr><td>Shift-Back or "<b>.</b>"   <td>>               <td>next page
 <tr><td>Alt-F                      <td>File            <td>file menu
 <tr><td>Ctrl-TabKey                <td>TabKey          <td>Next tab
-<tr><td>Shift-TabKey               <td>TabKey          <td>Previous tab
+<tr><td>Ctrl-Shift-TabKey          <td>TabKey          <td>Previous tab
 <tr><td>Esc                        <td>escape          <td>close dialog,
                                                            close findbar,<br>
                                                      Hide/show control panels
diff --git a/dpi/downloads.cc b/dpi/downloads.cc
index 32c7242..b984bec 100644
--- a/dpi/downloads.cc
+++ b/dpi/downloads.cc
@@ -108,7 +108,8 @@
    int LogPipe[2];
    char *shortname, *fullname;
    char *target_dir;
-   int log_len, log_max, log_state;
+   size_t log_len, log_max;
+   int log_state;
    char *log_text;
    time_t init_time;
    char **dl_argv;
@@ -190,6 +191,28 @@
    DLAction check_filename(char **p_dl_dest);
 };
 
+/*
+ * FLTK cannot be dissuaded from interpreting '@' in a tooltip
+ * as indicating a symbol unless we escape it.
+ */
+static char *escape_tooltip(const char *buf, ssize_t len)
+{
+   if (len < 0)
+      len = 0;
+
+   char *ret = (char *) malloc(2 * len + 1);
+   char *dest = ret;
+
+   while (len-- > 0) { 
+      if (*buf == '@')
+         *dest++ = *buf;
+      *dest++ = *buf++;
+   }
+   *dest = '\0';
+
+   return ret;
+}
+
 
 /*
  * Global variables
@@ -476,11 +499,16 @@
 void DLItem::log_text_add(const char *buf, ssize_t st)
 {
    const char *p;
-   char *q, *d, num[64];
+   char *esc_str, *q, *d, num[64];
+   size_t esc_len;
+
+   // WORKAROUND: We have to escape '@' in FLTK tooltips.
+   esc_str = escape_tooltip(buf, st);
+   esc_len = strlen(esc_str);
 
    // Make room...
-   if (log_len + st >= log_max) {
-      log_max = log_len + st + 1024;
+   if (log_len + esc_len >= log_max) {
+      log_max = log_len + esc_len + 1024;
       log_text = (char *) realloc (log_text, log_max);
       log_text[log_len] = 0;
       prTitle->tooltip(log_text);
@@ -488,7 +516,7 @@
 
    // FSM to remove wget's "dot-progress" (i.e. "^ " || "^[0-9]+K")
    q = log_text + log_len;
-   for (p = buf; (p - buf) < st; ++p) {
+   for (p = esc_str; (size_t)(p - esc_str) < esc_len; ++p) {
       switch (log_state) {
       case ST_newline:
          if (*p == ' ') {
@@ -523,6 +551,8 @@
    *q = 0;
    log_len = strlen(log_text);
 
+   free(esc_str);
+
    // Now scan for the length of the file
    if (total_bytesize == -1) {
       p = strstr(log_text, "\nLength: ");
@@ -1092,6 +1122,29 @@
 
 // ---------------------------------------------------------------------------
 
+/*
+ * Set FL_NORMAL_LABEL to interpret neither symbols (@) nor shortcuts (&)
+ */
+static void custLabelDraw(const Fl_Label* o, int X, int Y, int W, int H,
+                          Fl_Align align)
+{
+   const int interpret_symbols = 0;
+
+   fl_draw_shortcut = 0;
+   fl_font(o->font, o->size);
+   fl_color((Fl_Color)o->color);
+   fl_draw(o->value, X, Y, W, H, align, o->image, interpret_symbols);
+}
+
+static void custLabelMeasure(const Fl_Label* o, int& W, int& H)
+{
+   const int interpret_symbols = 0;
+
+   fl_draw_shortcut = 0;
+   fl_font(o->font, o->size);
+   fl_measure(o->value, W, H, interpret_symbols);
+}
+ 
 
 
 //int main(int argc, char **argv)
@@ -1101,6 +1154,9 @@
 
    Fl::lock();
 
+   // Disable '@' and '&' interpretation in normal labels.
+   Fl::set_labeltype(FL_NORMAL_LABEL, custLabelDraw, custLabelMeasure);
+
    // Create the download window
    dl_win = new DLWin(ww, wh);
 
diff --git a/dpi/https.c b/dpi/https.c
index 71b0c0f..bea9de1 100644
--- a/dpi/https.c
+++ b/dpi/https.c
@@ -130,7 +130,7 @@
    SSL * ssl_connection = NULL;
 
    char *dpip_tag = NULL, *cmd = NULL, *url = NULL, *http_query = NULL,
-        *proxy_url = NULL, *proxy_connect = NULL;
+        *proxy_url = NULL, *proxy_connect = NULL, *check_cert = NULL;
    char buf[4096];
    int ret = 0;
    int network_socket = -1;
@@ -200,8 +200,12 @@
                   a_Dpip_get_attr(dpip_tag, "proxy_connect");
       url = a_Dpip_get_attr(dpip_tag, "url");
       http_query = a_Dpip_get_attr(dpip_tag, "query");
-
-      if (cmd == NULL || url == NULL || http_query == NULL){
+      if (!(check_cert = a_Dpip_get_attr(dpip_tag, "check_cert"))) {
+         /* allow older dillo versions use this dpi */
+         check_cert = dStrdup("true");
+      }
+
+      if (!cmd || !url || !http_query) {
          MSG("***Value of cmd, url or http_query is NULL"
                     " - cannot continue\n");
          exit_error = 1;
@@ -288,7 +292,8 @@
 
    /*Use handle error function to decide what to do*/
    if (exit_error == 0){
-      if (handle_certificate_problem(ssl_connection) < 0){
+      if (strcmp(check_cert, "true") == 0 &&
+          handle_certificate_problem(ssl_connection) < 0){
          MSG("Certificate verification error\n");
          exit_error = 1;
       }
@@ -322,6 +327,7 @@
    dFree(http_query);
    dFree(proxy_url);
    dFree(proxy_connect);
+   dFree(check_cert);
 
    if (network_socket != -1){
       close(network_socket);
diff --git a/dw/fltkpreview.cc b/dw/fltkpreview.cc
index fbf139c..ecb96f2 100644
--- a/dw/fltkpreview.cc
+++ b/dw/fltkpreview.cc
@@ -146,6 +146,14 @@
    fl_draw(text, len, translateCanvasXToViewX (x), translateCanvasYToViewY(y));
 }
 
+void FltkPreview::drawSimpleWrappedText (core::style::Font *font,
+                                         core::style::Color *color,
+                                         core::style::Color::Shading shading,
+                                         int x, int y, int w, int h,
+                                         const char *text)
+{
+}
+
 void FltkPreview::drawImage (core::Imgbuf *imgbuf, int xRoot, int yRoot,
                 int x, int y, int width, int height)
 {
diff --git a/dw/fltkpreview.hh b/dw/fltkpreview.hh
index 06d5a53..2382b86 100644
--- a/dw/fltkpreview.hh
+++ b/dw/fltkpreview.hh
@@ -42,6 +42,11 @@
                   core::style::Color *color,
                   core::style::Color::Shading shading,
                   int x, int y, const char *text, int len);
+   void drawSimpleWrappedText (core::style::Font *font,
+                               core::style::Color *color,
+                               core::style::Color::Shading shading,
+                               int x, int y, int w, int h,
+                               const char *text);
    void drawImage (core::Imgbuf *imgbuf, int xRoot, int yRoot,
                    int x, int y, int width, int height);
 
diff --git a/dw/fltkui.cc b/dw/fltkui.cc
index 788df08..f02110c 100644
--- a/dw/fltkui.cc
+++ b/dw/fltkui.cc
@@ -355,7 +355,7 @@
 
 void FltkLabelButtonResource::setLabel (const char *label)
 {
-   delete this->label;
+   free((char *)this->label);
    this->label = strdup (label);
 
    widget->label (this->label);
@@ -605,6 +605,7 @@
    FltkSpecificResource <dw::core::ui::MultiLineTextResource> (platform)
 {
    buffer = new Fl_Text_Buffer;
+   text_copy = NULL;
    editable = false;
 
    numCols = cols;
@@ -628,6 +629,8 @@
    /* Free memory avoiding a double-free of text buffers */
    ((Fl_Text_Editor *) widget)->buffer (0);
    delete buffer;
+   if (text_copy)
+      free(text_copy);
 }
 
 Fl_Widget *FltkMultiLineTextResource::createNewWidget (core::Allocation
@@ -678,7 +681,13 @@
 
 const char *FltkMultiLineTextResource::getText ()
 {
-   return buffer->text ();
+   /* FLTK-1.3 insists upon returning a new copy of the buffer text, so
+    * we have to keep track of it.
+    */ 
+   if (text_copy)
+      free(text_copy);
+   text_copy = buffer->text();
+   return text_copy;
 }
 
 void FltkMultiLineTextResource::setText (const char *text)
diff --git a/dw/fltkui.hh b/dw/fltkui.hh
index a5bddc5..ff927c8 100644
--- a/dw/fltkui.hh
+++ b/dw/fltkui.hh
@@ -316,6 +316,7 @@
 {
 private:
    Fl_Text_Buffer *buffer;
+   char *text_copy;
    bool editable;
    int numCols, numRows;
 
diff --git a/dw/fltkviewbase.cc b/dw/fltkviewbase.cc
index a01adf1..bf3aba2 100644
--- a/dw/fltkviewbase.cc
+++ b/dw/fltkviewbase.cc
@@ -471,14 +471,14 @@
    int x = translateCanvasXToViewX (centerX) - width / 2;
    int y = translateCanvasYToViewY (centerY) - height / 2;
 
-   fl_arc(x, y, width, height, 0.0, 360.0);
+   fl_arc(x, y, width, height, angle1, angle2);
    if (filled)
-      fl_pie(x, y, width, height, 0.0, 360.0);
+      fl_pie(x, y, width, height, angle1, angle2);
 }
 
 void FltkViewBase::drawPolygon (core::style::Color *color,
                                 core::style::Color::Shading shading,
-                                bool filled, bool convex, int points[][2],
+                                bool filled, bool convex, core::Point *points,
                                 int npoints)
 {
    if (npoints > 0) {
@@ -493,8 +493,8 @@
          fl_begin_loop();
 
       for (int i = 0; i < npoints; i++) {
-         fl_vertex(translateCanvasXToViewX(points[i][0]),
-                   translateCanvasYToViewY(points[i][1]));
+         fl_vertex(translateCanvasXToViewX(points[i].x),
+                   translateCanvasYToViewY(points[i].y));
       }
       if (filled) {
          if (convex)
@@ -582,6 +582,24 @@
    }
 }
 
+/*
+ * "simple" in that it ignores letter-spacing, etc. This was added for image
+ * alt text where none of that matters.
+ */
+void FltkWidgetView::drawSimpleWrappedText (core::style::Font *font,
+                                            core::style::Color *color,
+                                           core::style::Color::Shading shading,
+                                            int X, int Y, int W, int H,
+                                            const char *text)
+{
+   FltkFont *ff = (FltkFont*)font;
+   fl_font(ff->font, ff->size);
+   fl_color(((FltkColor*)color)->colors[shading]);
+   fl_draw(text,
+           translateCanvasXToViewX (X), translateCanvasYToViewY (Y),
+           W, H, FL_ALIGN_TOP|FL_ALIGN_LEFT|FL_ALIGN_WRAP, NULL, 0);
+}
+
 void FltkWidgetView::drawImage (core::Imgbuf *imgbuf, int xRoot, int yRoot,
                               int X, int Y, int width, int height)
 {
diff --git a/dw/fltkviewbase.hh b/dw/fltkviewbase.hh
index 03cf26d..2b24880 100644
--- a/dw/fltkviewbase.hh
+++ b/dw/fltkviewbase.hh
@@ -98,7 +98,8 @@
                  int angle1, int angle2);
     void drawPolygon (core::style::Color *color,
                       core::style::Color::Shading shading,
-                      bool filled, bool convex, int points[][2], int npoints);
+                      bool filled, bool convex,
+                      core::Point *points, int npoints);
 
    core::View *getClippingView (int x, int y, int width, int height);
    void mergeClippingView (core::View *clippingView);
@@ -116,6 +117,11 @@
                   core::style::Color *color,
                   core::style::Color::Shading shading,
                   int x, int y, const char *text, int len);
+   void drawSimpleWrappedText (core::style::Font *font,
+                               core::style::Color *color,
+                               core::style::Color::Shading shading,
+                               int x, int y, int w, int h,
+                               const char *text);
    void drawImage (core::Imgbuf *imgbuf, int xRoot, int yRoot,
                    int x, int y, int width, int height);
 
diff --git a/dw/fltkviewport.cc b/dw/fltkviewport.cc
index 11994d0..c79eb8e 100644
--- a/dw/fltkviewport.cc
+++ b/dw/fltkviewport.cc
@@ -343,7 +343,7 @@
 
 /*
  * For scrollbars, this currently sets the same step to both vertical and
- * horizontal. It may me differentiated if necessary.
+ * horizontal. It may be differentiated if necessary.
  */
 void FltkViewport::setScrollStep(int step)
 {
diff --git a/dw/image.cc b/dw/image.cc
index 827cd75..1cb9ce3 100644
--- a/dw/image.cc
+++ b/dw/image.cc
@@ -384,12 +384,11 @@
                                       getContentHeight());
          }
 
-         usedView->drawText (getStyle()->font, getStyle()->color,
+         usedView->drawSimpleWrappedText (getStyle()->font, getStyle()->color,
                              core::style::Color::SHADING_NORMAL,
                              allocation.x + getStyle()->boxOffsetX (),
-                             allocation.y + getStyle()->boxOffsetY ()
-                             + getStyle()->font->ascent,
-                             altText, strlen(altText));
+                             allocation.y + getStyle()->boxOffsetY (),
+                             getContentWidth(), getContentHeight(), altText);
 
          if (clippingView)
             view->mergeClippingView (clippingView);
diff --git a/dw/layout.cc b/dw/layout.cc
index e6aebc6..9dfd5e9 100644
--- a/dw/layout.cc
+++ b/dw/layout.cc
@@ -194,6 +194,7 @@
    canvasWidth = canvasAscent = canvasDescent = 0;
 
    usesViewport = false;
+   drawAfterScrollReq = false;
    scrollX = scrollY = 0;
    viewportWidth = viewportHeight = 0;
    hScrollbarThickness = vScrollbarThickness = 0;
@@ -456,6 +457,10 @@
    if (xChanged || yChanged) {
       adjustScrollPos ();
       view->scrollTo (scrollX, scrollY);
+      if (drawAfterScrollReq) {
+         drawAfterScrollReq = false;
+         view->queueDrawTotal ();
+      }
    }
 
    scrollIdleId = -1;
@@ -503,7 +508,11 @@
 {
    Rectangle widgetArea, intersection, widgetDrawArea;
 
-   if (topLevel) {
+   if (scrollIdleId != -1) {
+      /* scroll is pending, defer draw until after scrollIdle() */
+      drawAfterScrollReq = true;
+
+   } else if (topLevel) {
       /* Draw the top level widget. */
       widgetArea.x = topLevel->allocation.x;
       widgetArea.y = topLevel->allocation.y;
@@ -814,6 +823,7 @@
  */
 void Layout::leaveNotify (View *view, ButtonState state)
 {
+#if 0
    Widget *lastWidget;
    EventCrossing event;
 
@@ -826,6 +836,9 @@
       event.currentWidget = widgetAtPoint;
       lastWidget->leaveNotify (&event);
    }
+#else
+   moveOutOfView (state);
+#endif
 }
 
 /*
@@ -844,7 +857,7 @@
 
 /*
  * Emit the necessary crossing events, when the mouse pointer has moved to
- * the given widget.
+ * the given widget (by mouse or scrolling).
  */
 void Layout::moveToWidget (Widget *newWidgetAtPoint, ButtonState state)
 {
@@ -890,6 +903,12 @@
          for (w = newWidgetAtPoint; w != ancestor; w = w->getParent ())
             track[i--] = w;
       }
+#if 0
+      MSG("Track: %s[ ", widgetAtPoint ? "" : "nil ");
+      for (i = 0; i < trackLen; i++)
+         MSG("%s%p ", i == i_a ? ">" : "", track[i]);
+      MSG("] %s\n", newWidgetAtPoint ? "" : "nil");
+#endif
 
       /* Send events to the widgets on the track */
       for (i = 0; i < trackLen; i++) {
@@ -899,10 +918,14 @@
          if (i < i_a) {
             track[i]->leaveNotify (&crossingEvent);
          } else if (i == i_a) { /* ancestor */
-            if (!widgetAtPoint)
+            /* Don't touch ancestor unless:
+             *   - moving into/from NULL,
+             *   - ancestor becomes the newWidgetAtPoint */
+            if (i_a == trackLen-1 && !newWidgetAtPoint)
+               track[i]->leaveNotify (&crossingEvent);
+            else if ((i_a == 0 && !widgetAtPoint) ||
+                     (i_a == trackLen-1 && newWidgetAtPoint))
                track[i]->enterNotify (&crossingEvent);
-            else if (!newWidgetAtPoint)
-               track[i]->leaveNotify (&crossingEvent);
          } else {
             track[i]->enterNotify (&crossingEvent);
          }
diff --git a/dw/layout.hh b/dw/layout.hh
index 98aa4fc..d08eb36 100644
--- a/dw/layout.hh
+++ b/dw/layout.hh
@@ -138,7 +138,7 @@
    style::Cursor cursor;
    int canvasWidth, canvasAscent, canvasDescent;
 
-   bool usesViewport;
+   bool usesViewport, drawAfterScrollReq;
    int scrollX, scrollY, viewportWidth, viewportHeight;
    bool canvasHeightGreater;
    int hScrollbarThickness, vScrollbarThickness;
diff --git a/dw/style.cc b/dw/style.cc
index c8cab24..d11abf8 100644
--- a/dw/style.cc
+++ b/dw/style.cc
@@ -423,7 +423,8 @@
                           int x1, int y1, int x2, int y2)
 
 {
-   int points[4][2], d, w;
+   int d, w;
+   Point points[4];
    const bool filled = true, convex = true;
    bool ridge = false, inset = false, dotted = false;
    Color::Shading shading = Color::SHADING_NORMAL;
@@ -453,12 +454,12 @@
       if (style->borderWidth.top == 1) {
          view->drawLine(style->borderColor.top, shading, x1, y1, x2, y2);
       } else {
-         points[0][0] = x1;
-         points[1][0] = x2 + 1;
-         points[0][1] = points[1][1] = y1;
-         points[2][0] = points[1][0] - style->borderWidth.right;
-         points[3][0] = x1 + style->borderWidth.left;
-         points[2][1] = points[3][1] = points[0][1] + style->borderWidth.top;
+         points[0].x = x1;
+         points[1].x = x2 + 1;
+         points[0].y = points[1].y = y1;
+         points[2].x = points[1].x - style->borderWidth.right;
+         points[3].x = x1 + style->borderWidth.left;
+         points[2].y = points[3].y = points[0].y + style->borderWidth.top;
          view->drawPolygon (style->borderColor.top, shading, filled, convex,
                             points, 4);
       }
@@ -467,21 +468,21 @@
       ridge = true;
    case BORDER_GROOVE:
       d = style->borderWidth.top & 1;
-      points[0][0] = x1;
-      points[1][0] = x2 + 1;
-      points[0][1] = points[1][1] = y1;
-      points[2][0] = x2 - style->borderWidth.right / 2;
-      points[3][0] = x1 + style->borderWidth.left / 2;
-      points[2][1] = points[3][1] = y1 + style->borderWidth.top / 2 + d;
+      points[0].x = x1;
+      points[1].x = x2 + 1;
+      points[0].y = points[1].y = y1;
+      points[2].x = x2 - style->borderWidth.right / 2;
+      points[3].x = x1 + style->borderWidth.left / 2;
+      points[2].y = points[3].y = y1 + style->borderWidth.top / 2 + d;
       shading = (ridge) ? Color::SHADING_LIGHT : Color::SHADING_DARK;
       view->drawPolygon (style->borderColor.top, shading, filled, convex,
                          points, 4);
-      points[0][0] = x1 + style->borderWidth.left / 2 + d;
-      points[1][0] = x2 - style->borderWidth.right / 2 + 1 - d;
-      points[0][1] = points[1][1] = y1 + style->borderWidth.top / 2 + d;
-      points[2][0] = x2 - style->borderWidth.right + 1 - d;
-      points[3][0] = x1 + style->borderWidth.left;
-      points[2][1] = points[3][1] = y1 + style->borderWidth.top;
+      points[0].x = x1 + style->borderWidth.left / 2 + d;
+      points[1].x = x2 - style->borderWidth.right / 2 + 1 - d;
+      points[0].y = points[1].y = y1 + style->borderWidth.top / 2 + d;
+      points[2].x = x2 - style->borderWidth.right + 1 - d;
+      points[3].x = x1 + style->borderWidth.left;
+      points[2].y = points[3].y = y1 + style->borderWidth.top;
       shading = (ridge) ? Color::SHADING_DARK : Color::SHADING_LIGHT;
       view->drawPolygon (style->borderColor.top, shading, filled, convex,
                          points, 4);
@@ -495,20 +496,20 @@
          view->drawLine(style->borderColor.top, shading, x1, y1, x2, y2);
          break;
       }
-      points[0][0] = x1;
-      points[1][0] = x2 + 1;
-      points[0][1] = points[1][1] = y1;
-      points[2][0] = points[1][0] - w_r;
-      points[3][0] = points[0][0] + w_l;
-      points[2][1] = points[3][1] = points[0][1] + w;
+      points[0].x = x1;
+      points[1].x = x2 + 1;
+      points[0].y = points[1].y = y1;
+      points[2].x = points[1].x - w_r;
+      points[3].x = points[0].x + w_l;
+      points[2].y = points[3].y = points[0].y + w;
       view->drawPolygon (style->borderColor.top, shading, filled, convex,
                          points, 4);
-      points[0][0] = x1 + style->borderWidth.left - w_l;
-      points[1][0] = x2 + 1 - style->borderWidth.right + w_r;
-      points[0][1] = points[1][1] = y1 + w + d;
-      points[2][0] = x2 + 1 - style->borderWidth.right;
-      points[3][0] = x1 + style->borderWidth.left;
-      points[2][1] = points[3][1] = y1 + style->borderWidth.top;
+      points[0].x = x1 + style->borderWidth.left - w_l;
+      points[1].x = x2 + 1 - style->borderWidth.right + w_r;
+      points[0].y = points[1].y = y1 + w + d;
+      points[2].x = x2 + 1 - style->borderWidth.right;
+      points[3].x = x1 + style->borderWidth.left;
+      points[2].y = points[3].y = y1 + style->borderWidth.top;
       view->drawPolygon (style->borderColor.top, shading, filled, convex,
                          points, 4);
       break;
@@ -519,7 +520,8 @@
                              int x1, int y1, int x2, int y2)
 
 {
-   int points[4][2], d, w;
+   int d, w;
+   Point points[4];
    const bool filled = true, convex = true;
    bool ridge = false, inset = false, dotted = false;
    Color::Shading shading = Color::SHADING_NORMAL;
@@ -549,12 +551,12 @@
       if (style->borderWidth.bottom == 1) { /* 1 pixel line */
          view->drawLine(style->borderColor.bottom, shading, x1, y1, x2, y2);
       } else {
-         points[0][0] = x1 - 1;
-         points[1][0] = x2 + 2;
-         points[0][1] = points[1][1] = y1 + 1;
-         points[2][0] = points[1][0] - style->borderWidth.right;
-         points[3][0] = points[0][0] + style->borderWidth.left;
-         points[2][1] = points[3][1] = points[0][1]-style->borderWidth.bottom;
+         points[0].x = x1 - 1;
+         points[1].x = x2 + 2;
+         points[0].y = points[1].y = y1 + 1;
+         points[2].x = points[1].x - style->borderWidth.right;
+         points[3].x = points[0].x + style->borderWidth.left;
+         points[2].y = points[3].y = points[0].y-style->borderWidth.bottom;
          view->drawPolygon (style->borderColor.bottom, shading, filled, convex,
                             points, 4);
       }
@@ -564,22 +566,22 @@
    case BORDER_GROOVE:
       w = style->borderWidth.bottom;
       d = w & 1;
-      points[0][0] = x1 - 1;
-      points[1][0] = x2 + 2 - d;
-      points[0][1] = points[1][1] = y1 + 1;
-      points[2][0] = points[1][0] - style->borderWidth.right / 2;
-      points[3][0] = points[0][0] + style->borderWidth.left / 2 + d;
-      points[2][1] = points[3][1] = points[0][1] - w/2 - d;
+      points[0].x = x1 - 1;
+      points[1].x = x2 + 2 - d;
+      points[0].y = points[1].y = y1 + 1;
+      points[2].x = points[1].x - style->borderWidth.right / 2;
+      points[3].x = points[0].x + style->borderWidth.left / 2 + d;
+      points[2].y = points[3].y = points[0].y - w/2 - d;
       shading = (ridge) ? Color::SHADING_DARK : Color::SHADING_LIGHT;
       view->drawPolygon (style->borderColor.bottom, shading, filled, convex,
                          points, 4);
       // clockwise
-      points[0][0] = x1 + style->borderWidth.left - 1;
-      points[1][0] = x2 + 1 - style->borderWidth.right + 1;
-      points[0][1] = points[1][1] = y1 - w + 1;
-      points[2][0] = points[1][0] + style->borderWidth.right / 2;
-      points[3][0] = points[0][0] - style->borderWidth.left / 2;
-      points[2][1] = points[3][1] = points[0][1] + w/2;
+      points[0].x = x1 + style->borderWidth.left - 1;
+      points[1].x = x2 + 1 - style->borderWidth.right + 1;
+      points[0].y = points[1].y = y1 - w + 1;
+      points[2].x = points[1].x + style->borderWidth.right / 2;
+      points[3].x = points[0].x - style->borderWidth.left / 2;
+      points[2].y = points[3].y = points[0].y + w/2;
       shading = (ridge) ? Color::SHADING_LIGHT : Color::SHADING_DARK;
       view->drawPolygon (style->borderColor.bottom, shading, filled, convex,
                          points, 4);
@@ -593,20 +595,20 @@
          view->drawLine(style->borderColor.bottom, shading, x1, y1, x2, y2);
          break;
       }
-      points[0][0] = x2 + 2;
-      points[1][0] = x1 - 1;
-      points[0][1] = points[1][1] = y1 + 1;
-      points[2][0] = points[1][0] + w_l;
-      points[3][0] = points[0][0] - w_r;
-      points[2][1] = points[3][1] = points[0][1] - w;
+      points[0].x = x2 + 2;
+      points[1].x = x1 - 1;
+      points[0].y = points[1].y = y1 + 1;
+      points[2].x = points[1].x + w_l;
+      points[3].x = points[0].x - w_r;
+      points[2].y = points[3].y = points[0].y - w;
       view->drawPolygon (style->borderColor.bottom, shading, filled, convex,
                          points, 4);
-      points[0][0] = x2 + 2 - style->borderWidth.right + w_r;
-      points[1][0] = x1 - 1 + style->borderWidth.left - w_l;
-      points[0][1] = points[1][1] = y1 + 1 - w - d;
-      points[2][0] = x1 - 1 + style->borderWidth.left;
-      points[3][0] = x2 + 2 - style->borderWidth.right;
-      points[2][1] = points[3][1] = y1 + 1 - style->borderWidth.bottom;
+      points[0].x = x2 + 2 - style->borderWidth.right + w_r;
+      points[1].x = x1 - 1 + style->borderWidth.left - w_l;
+      points[0].y = points[1].y = y1 + 1 - w - d;
+      points[2].x = x1 - 1 + style->borderWidth.left;
+      points[3].x = x2 + 2 - style->borderWidth.right;
+      points[2].y = points[3].y = y1 + 1 - style->borderWidth.bottom;
       view->drawPolygon (style->borderColor.bottom, shading, filled, convex,
                          points, 4);
       break;
@@ -617,7 +619,8 @@
                            int x1, int y1, int x2, int y2)
 
 {
-   int points[4][2], d, w;
+   int d, w;
+   Point points[4];
    bool filled = true, convex = true;
    bool ridge = false, inset = false, dotted = false;
    Color::Shading shading = Color::SHADING_NORMAL;
@@ -646,12 +649,12 @@
       if (style->borderWidth.left == 1) { /* 1 pixel line */
          view->drawLine(style->borderColor.left, shading, x1, y1, x2, y2);
       } else {
-         points[0][0] = points[1][0] = x1;
-         points[0][1] = y1 - 1;
-         points[1][1] = y2 + 1;
-         points[2][0] = points[3][0] = points[0][0] + style->borderWidth.left;
-         points[2][1] = points[1][1] - style->borderWidth.bottom;
-         points[3][1] = points[0][1] + style->borderWidth.top;
+         points[0].x = points[1].x = x1;
+         points[0].y = y1 - 1;
+         points[1].y = y2 + 1;
+         points[2].x = points[3].x = points[0].x + style->borderWidth.left;
+         points[2].y = points[1].y - style->borderWidth.bottom;
+         points[3].y = points[0].y + style->borderWidth.top;
          view->drawPolygon (style->borderColor.left, shading, filled, convex,
                             points, 4);
       }
@@ -661,21 +664,21 @@
    case BORDER_GROOVE:
       w = style->borderWidth.left;
       d = w & 1;
-      points[0][0] = points[1][0] = x1;
-      points[0][1] = y1;
-      points[1][1] = y2;
-      points[2][0] = points[3][0] = x1 + w / 2 + d;
-      points[2][1] = y2 - style->borderWidth.bottom / 2;
-      points[3][1] = y1 + style->borderWidth.top / 2;
+      points[0].x = points[1].x = x1;
+      points[0].y = y1;
+      points[1].y = y2;
+      points[2].x = points[3].x = x1 + w / 2 + d;
+      points[2].y = y2 - style->borderWidth.bottom / 2;
+      points[3].y = y1 + style->borderWidth.top / 2;
       shading = (ridge) ? Color::SHADING_LIGHT : Color::SHADING_DARK;
       view->drawPolygon (style->borderColor.left, shading, filled, convex,
                          points, 4);
-      points[0][0] = points[1][0] = x1 + w / 2 + d;
-      points[0][1] = y1 + style->borderWidth.top / 2;
-      points[1][1] = y2 - style->borderWidth.bottom / 2;
-      points[2][0] = points[3][0] = x1 + w;
-      points[2][1] = y2 - style->borderWidth.bottom;
-      points[3][1] = y1 + style->borderWidth.top;
+      points[0].x = points[1].x = x1 + w / 2 + d;
+      points[0].y = y1 + style->borderWidth.top / 2;
+      points[1].y = y2 - style->borderWidth.bottom / 2;
+      points[2].x = points[3].x = x1 + w;
+      points[2].y = y2 - style->borderWidth.bottom;
+      points[3].y = y1 + style->borderWidth.top;
       shading = (ridge) ? Color::SHADING_DARK : Color::SHADING_LIGHT;
       view->drawPolygon (style->borderColor.left, shading, filled, convex,
                          points, 4);
@@ -689,20 +692,20 @@
          view->drawLine(style->borderColor.left, shading, x1, y1, x2, y2-1);
          break;
       }
-      points[0][0] = points[1][0] = x1;
-      points[0][1] = y1 - 1;
-      points[1][1] = y2 + 1;
-      points[2][0] = points[3][0] = points[0][0] + w;
-      points[2][1] = points[1][1] - w_b;
-      points[3][1] = points[0][1] + w_t;
+      points[0].x = points[1].x = x1;
+      points[0].y = y1 - 1;
+      points[1].y = y2 + 1;
+      points[2].x = points[3].x = points[0].x + w;
+      points[2].y = points[1].y - w_b;
+      points[3].y = points[0].y + w_t;
       view->drawPolygon (style->borderColor.left, shading, filled, convex,
                          points, 4);
-      points[0][0] = points[1][0] = x1 + w + d;
-      points[0][1] = y1 - 1 + style->borderWidth.top - w_t;
-      points[1][1] = y2 + 1 - style->borderWidth.bottom + w_b;
-      points[2][0] = points[3][0] = points[0][0] + w;
-      points[2][1] = y2 + 1 - style->borderWidth.bottom;
-      points[3][1] = y1 - 1 + style->borderWidth.top;
+      points[0].x = points[1].x = x1 + w + d;
+      points[0].y = y1 - 1 + style->borderWidth.top - w_t;
+      points[1].y = y2 + 1 - style->borderWidth.bottom + w_b;
+      points[2].x = points[3].x = points[0].x + w;
+      points[2].y = y2 + 1 - style->borderWidth.bottom;
+      points[3].y = y1 - 1 + style->borderWidth.top;
       view->drawPolygon (style->borderColor.left, shading, filled, convex,
                          points, 4);
       break;
@@ -713,7 +716,8 @@
                             int x1, int y1, int x2, int y2)
 
 {
-   int points[4][2], d, w;
+   int d, w;
+   Point points[4];
    const bool filled = true, convex = true;
    bool ridge = false, inset = false, dotted = false;
    Color::Shading shading = Color::SHADING_NORMAL;
@@ -742,12 +746,12 @@
       if (style->borderWidth.right == 1) { /* 1 pixel line */
          view->drawLine(style->borderColor.right, shading, x1, y1, x2, y2);
       } else {
-         points[0][0] = points[1][0] = x1 + 1;
-         points[0][1] = y1 - 1;
-         points[1][1] = y2 + 1;
-         points[2][0] = points[3][0] = points[0][0]-style->borderWidth.right;
-         points[2][1] = points[1][1] - style->borderWidth.bottom;
-         points[3][1] = points[0][1] + style->borderWidth.top;
+         points[0].x = points[1].x = x1 + 1;
+         points[0].y = y1 - 1;
+         points[1].y = y2 + 1;
+         points[2].x = points[3].x = points[0].x-style->borderWidth.right;
+         points[2].y = points[1].y - style->borderWidth.bottom;
+         points[3].y = points[0].y + style->borderWidth.top;
          view->drawPolygon (style->borderColor.right, shading, filled, convex,
                             points,4);
       }
@@ -757,21 +761,21 @@
    case BORDER_GROOVE:
       w = style->borderWidth.right;
       d = w & 1;
-      points[0][0] = points[1][0] = x1 + 1;
-      points[0][1] = y1;
-      points[1][1] = y2;
-      points[2][0] = points[3][0] = points[0][0] - w / 2 - d;
-      points[2][1] = y2 - style->borderWidth.bottom / 2;
-      points[3][1] = points[0][1] + style->borderWidth.top / 2;
+      points[0].x = points[1].x = x1 + 1;
+      points[0].y = y1;
+      points[1].y = y2;
+      points[2].x = points[3].x = points[0].x - w / 2 - d;
+      points[2].y = y2 - style->borderWidth.bottom / 2;
+      points[3].y = points[0].y + style->borderWidth.top / 2;
       shading = (ridge) ? Color::SHADING_DARK : Color::SHADING_LIGHT;
       view->drawPolygon (style->borderColor.right, shading, filled, convex,
                          points, 4);
-      points[0][0] = points[1][0] = x1 + 1 - w / 2 - d;
-      points[0][1] = y1 + style->borderWidth.top / 2;
-      points[1][1] = y2 - style->borderWidth.bottom / 2;
-      points[2][0] = points[3][0] = x1 + 1 - w;
-      points[2][1] = y2 - style->borderWidth.bottom;
-      points[3][1] = y1 + style->borderWidth.top;
+      points[0].x = points[1].x = x1 + 1 - w / 2 - d;
+      points[0].y = y1 + style->borderWidth.top / 2;
+      points[1].y = y2 - style->borderWidth.bottom / 2;
+      points[2].x = points[3].x = x1 + 1 - w;
+      points[2].y = y2 - style->borderWidth.bottom;
+      points[3].y = y1 + style->borderWidth.top;
       shading = (ridge) ? Color::SHADING_LIGHT: Color::SHADING_DARK;
       view->drawPolygon (style->borderColor.right, shading, filled, convex,
                          points, 4);
@@ -785,20 +789,20 @@
          view->drawLine(style->borderColor.right, shading, x1, y1, x2, y2);
          break;
       }
-      points[0][0] = points[1][0] = x1 + 1;
-      points[0][1] = y1 - 1;
-      points[1][1] = y2 + 1;
-      points[2][0] = points[3][0] = points[0][0] - w;
-      points[2][1] = points[1][1] - w_b;
-      points[3][1] = points[0][1] + w_t;
+      points[0].x = points[1].x = x1 + 1;
+      points[0].y = y1 - 1;
+      points[1].y = y2 + 1;
+      points[2].x = points[3].x = points[0].x - w;
+      points[2].y = points[1].y - w_b;
+      points[3].y = points[0].y + w_t;
       view->drawPolygon (style->borderColor.right, shading, filled, convex,
                          points, 4);
-      points[0][0] = points[1][0] = x1 + 1 - w - d;
-      points[0][1] = y1 - 1 + style->borderWidth.top - w_t;
-      points[1][1] = y2 + 1 - style->borderWidth.bottom + w_b;
-      points[2][0] = points[3][0] = points[0][0] - w;
-      points[2][1] = y2 + 1 - style->borderWidth.bottom;
-      points[3][1] = y1 - 1 + style->borderWidth.top;
+      points[0].x = points[1].x = x1 + 1 - w - d;
+      points[0].y = y1 - 1 + style->borderWidth.top - w_t;
+      points[1].y = y2 + 1 - style->borderWidth.bottom + w_b;
+      points[2].x = points[3].x = points[0].x - w;
+      points[2].y = y2 + 1 - style->borderWidth.bottom;
+      points[3].y = y1 - 1 + style->borderWidth.top;
       view->drawPolygon (style->borderColor.right, shading, filled, convex,
                          points, 4);
       break;
diff --git a/dw/textblock.cc b/dw/textblock.cc
index 045ab72..23465d2 100644
--- a/dw/textblock.cc
+++ b/dw/textblock.cc
@@ -26,6 +26,15 @@
 #include <stdio.h>
 #include <limits.h>
 
+/*
+ * Local variables
+ */
+ /* The tooltip under mouse pointer in current textblock. No ref. hold.
+  * (having one per view looks not worth the extra clutter). */
+static dw::core::style::Tooltip *hoverTooltip = NULL;
+
+
+
 using namespace lout;
 
 namespace dw {
@@ -80,8 +89,6 @@
    availAscent = 100;
    availDescent = 0;
 
-   hoverTooltip = NULL;
-
    this->limitTextWidth = limitTextWidth;
 
    for (int layer = 0; layer < core::HIGHLIGHT_NUM_LAYERS; layer++) {
@@ -95,7 +102,10 @@
 
 Textblock::~Textblock ()
 {
-   //_MSG ("Textblock::~Textblock\n");
+   _MSG("Textblock::~Textblock\n");
+
+   /* make sure not to call a free'd tooltip (very fast overkill) */
+   hoverTooltip = NULL;
 
    for (int i = 0; i < words->size(); i++) {
       Word *word = words->getRef (i);
@@ -366,13 +376,13 @@
              * http://www.dillo.org/test/img/ */
             childAllocation.y =
                lineYOffsetCanvasAllocation (line, allocation)
-               + (line->boxAscent - word->size.ascent);
-               // - word->content.widget->getStyle()->margin.top;
+               + (line->boxAscent - word->size.ascent)
+               - word->content.widget->getStyle()->margin.top;
             childAllocation.width = word->size.width;
-            childAllocation.ascent = word->size.ascent;
-               // + word->content.widget->getStyle()->margin.top;
-            childAllocation.descent = word->size.descent;
-               // + word->content.widget->getStyle()->margin.bottom;
+            childAllocation.ascent = word->size.ascent
+               + word->content.widget->getStyle()->margin.top;
+            childAllocation.descent = word->size.descent
+               + word->content.widget->getStyle()->margin.bottom;
 
             oldChildAllocation = word->content.widget->getAllocation();
 
@@ -536,6 +546,11 @@
    return sendSelectionEvent (core::SelectionState::BUTTON_RELEASE, event);
 }
 
+/*
+ * Handle motion inside the widget
+ * (special care is necessary when switching from another widget,
+ *  because hoverLink and hoverTooltip are meaningless then).
+ */
 bool Textblock::motionNotifyImpl (core::EventMotion *event)
 {
    if (event->state & core::BUTTON1_MASK)
@@ -557,6 +572,7 @@
          hoverLink = style->x_link;
          hoverTooltip = style->x_tooltip;
       }
+
       // Show/hide tooltip
       if (tooltipOld != hoverTooltip) {
          if (tooltipOld)
@@ -566,21 +582,32 @@
       } else if (hoverTooltip)
          hoverTooltip->onMotion ();
 
-      if (hoverLink != linkOld)
+      _MSG("MN tb=%p tooltipOld=%p hoverTooltip=%p\n",
+          this, tooltipOld, hoverTooltip);
+      if (hoverLink != linkOld) {
+         /* LinkEnter with hoverLink == -1 is the same as LinkLeave */
          return layout->emitLinkEnter (this, hoverLink, -1, -1, -1);
-      else
+      } else {
          return hoverLink != -1;
+      }
    }
 }
 
 void Textblock::enterNotifyImpl (core::EventCrossing *event)
 {
+   _MSG(" tb=%p, ENTER NotifyImpl hoverTooltip=%p\n", this, hoverTooltip);
+   /* reset hoverLink so linkEnter is detected */
+   hoverLink = -2;
 }
 
 void Textblock::leaveNotifyImpl (core::EventCrossing *event)
 {
-   hoverLink = -1;
-   (void) layout->emitLinkEnter (this, hoverLink, -1, -1, -1);
+   _MSG(" tb=%p, LEAVE NotifyImpl: hoverTooltip=%p\n", this, hoverTooltip);
+
+   /* leaving the viewport can't be handled by motionNotifyImpl() */
+   if (hoverLink >= 0)
+      layout->emitLinkEnter (this, -1, -1, -1, -1);
+
    if (hoverTooltip) {
       hoverTooltip->onLeave();
       hoverTooltip = NULL;
@@ -963,29 +990,29 @@
    //                    lastLine->boxDescent);
 
    if (word->content.type == core::Content::WIDGET) {
+      int collapseMarginTop = 0;
+
       lastLine->marginDescent =
          misc::max (lastLine->marginDescent,
                     word->size.descent +
                     word->content.widget->getStyle()->margin.bottom);
 
-      //DBG_OBJ_ARRSET_NUM (page, "lines.%d.descent", page->num_lines - 1,
-      //                    lastLine->descent);
-
-      /* If the widget is not in the first line of the paragraph, its top
-       * margin may make the line higher.
-       */
-      if (lines->size () > 1) {
-         /* Here, we know already what the break and the bottom margin
-          * contributed to the space before this line.
-          */
-         lastLine->boxAscent =
+      if (lines->size () == 1 &&
+          word->content.widget->blockLevel () &&
+          getStyle ()->borderWidth.top == 0 &&
+          getStyle ()->padding.top == 0) {
+         // collapse top margin of parent element with top margin of first child
+         // see: http://www.w3.org/TR/CSS21/box.html#collapsing-margins
+         collapseMarginTop = getStyle ()->margin.top;
+      }
+
+      lastLine->boxAscent =
             misc::max (lastLine->boxAscent,
+                       word->size.ascent,
                        word->size.ascent
-                       + word->content.widget->getStyle()->margin.top);
-
-         //DBG_OBJ_ARRSET_NUM (page, "lines.%d.ascent", page->num_lines - 1,
-         //                    lastLine->boxAscent);
-      }
+                       + word->content.widget->getStyle()->margin.top
+                       - collapseMarginTop);
+
    } else {
       lastLine->marginDescent =
          misc::max (lastLine->marginDescent, lastLine->boxDescent);
@@ -1096,11 +1123,7 @@
       widget->setAscent (availAscent);
       widget->setDescent (availDescent);
       widget->sizeRequest (size);
-//      size->ascent -= wstyle->margin.top;
-//      size->descent -= wstyle->margin.bottom;
    } else {
-      /* TODO: Use margin.{top|bottom} here, like above.
-       * (No harm for the next future.) */
       if (wstyle->width == core::style::LENGTH_AUTO ||
           wstyle->height == core::style::LENGTH_AUTO)
          widget->sizeRequest (&requisition);
@@ -1131,6 +1154,10 @@
          size->descent = (int) (len * availDescent);
       }
    }
+
+   /* ascent and descent in words do not contain margins. */
+   size->ascent -= wstyle->margin.top;
+   size->descent -= wstyle->margin.bottom;
 }
 
 /**
diff --git a/dw/textblock.hh b/dw/textblock.hh
index d05c87e..96cb40e 100644
--- a/dw/textblock.hh
+++ b/dw/textblock.hh
@@ -251,9 +251,7 @@
    struct {int index, nChar;}
       hlStart[core::HIGHLIGHT_NUM_LAYERS], hlEnd[core::HIGHLIGHT_NUM_LAYERS];
 
-   int hoverLink;                      /* The link under the button. */
-   core::style::Tooltip *hoverTooltip; /* The tooltip under the button. No ref
-                                        * hold. */
+   int hoverLink;  /* The link under the mouse pointer */
 
 
    void queueDrawRange (int index1, int index2);
diff --git a/dw/types.cc b/dw/types.cc
index 9dcedee..074cb35 100644
--- a/dw/types.cc
+++ b/dw/types.cc
@@ -141,12 +141,11 @@
    if (points->size()) {
       int i;
       const bool filled = false, convex = false;
-      int (*pointArray)[2] =
-                     (int (*)[2]) malloc(points->size() * sizeof(*pointArray));
+      Point *pointArray = (Point *)malloc(points->size()*sizeof(struct Point));
 
       for (i = 0; i < points->size(); i++) {
-         pointArray[i][0] = x + points->getRef(i)->x;
-         pointArray[i][1] = y + points->getRef(i)->y;
+         pointArray[i].x = x + points->getRef(i)->x;
+         pointArray[i].y = y + points->getRef(i)->y;
       }
       view->drawPolygon(style->color, core::style::Color::SHADING_NORMAL,
                         filled, convex, pointArray, i);
diff --git a/dw/view.hh b/dw/view.hh
index f250409..da9bdce 100644
--- a/dw/view.hh
+++ b/dw/view.hh
@@ -173,13 +173,16 @@
                                int angle1, int angle2) = 0;
    virtual void drawPolygon    (style::Color *color,
                                 style::Color::Shading shading,
-                                bool filled, bool convex, int points[][2],
+                                bool filled, bool convex, Point *points,
                                 int npoints) = 0;
    virtual void drawText       (style::Font *font,
                                 style::Color *color,
                                 style::Color::Shading shading,
                                 int x, int y, const char *text, int len) = 0;
-
+   virtual void drawSimpleWrappedText (style::Font *font, style::Color *color,
+                                       style::Color::Shading shading,
+                                       int x, int y, int w, int h,
+                                       const char *text) = 0;
    virtual void drawImage (Imgbuf *imgbuf, int xRoot, int yRoot,
                            int x, int y, int width, int height) = 0;
 
diff --git a/src/IO/about.c b/src/IO/about.c
index 508bfd1..ad033d9 100644
--- a/src/IO/about.c
+++ b/src/IO/about.c
@@ -61,7 +61,7 @@
 "    <table border='0' cellspacing='0' cellpadding='2'><tr>\n"
 "    <td>\n"
 "    <td>\n"
-"     <a href='http://www.dillo.org/dillo2-help.html'>\n"
+"     <a href='http://www.dillo.org/dillo3-help.html'>\n"
 "     Help</a>\n"
 "    <tr>\n"
 "    <td>&nbsp;&nbsp;\n"
@@ -117,11 +117,12 @@
 "    <tr>\n"
 "    <td>&nbsp;&nbsp;\n"
 "    <td>\n"
-"     <a href='http://slashdot.org/'>Slashdot</a>\n"
-"    <tr>\n"
-"    <td>&nbsp;&nbsp;\n"
-"    <td>\n"
 "     <a href='http://www.linux.org.uk/Portaloo.cs'>Linux.org.uk</a>\n"
+"    <tr>\n"
+"    <td>&nbsp;&nbsp;\n"
+"    <td>\n"
+"     <a href='http://www.mathaba.net/'>Mathaba</a>\n"
+"    <tr>\n"
 "    <tr>\n"
 "    <td>&nbsp;&nbsp;\n"
 "    <td>\n"
@@ -152,12 +153,6 @@
 "   <td bgcolor='#FFFFFF'>\n"
 "    <table border='0' cellspacing='0' cellpadding='5'><tr><td>\n"
 "    <table border='0' cellpadding='2'><tr>\n"
-"    <td>&nbsp;&nbsp;\n"
-"    <td><a href='http://www.google.com/'>Google</a>\n"
-"    <tr>\n"
-"    <td>&nbsp;&nbsp;\n"
-"    <td><a href='http://www.wikipedia.org/'>Wikipedia</a>\n"
-"    <tr>\n"
 "    <td>&nbsp;&nbsp;\n"
 "    <td><a href='http://www.gutenberg.org/'>P.&nbsp;Gutenberg</a>\n"
 "    <tr>\n"
@@ -240,20 +235,27 @@
 "<tr>\n"
 " <td bgcolor='#CCCCCC'>\n"
 "  <h4>Release overview</h4>\n"
-"  February 11, 2010\n"
+"  August ??, 2011\n"
 "<tr>\n"
 " <td bgcolor='#FFFFFF'>\n"
 "  <table border='0' cellspacing='0' cellpadding='5'>\n"
 "  <tr>\n"
 "   <td>\n"
 "<p>\n"
-"This release features a major overhaul of the cookies subsystem,\n"
-"a reimplementation of the DPI API, a configurable connection limit,\n"
-"and various CSS improvements.\n"
-"<p>\n"
-"Remember that the dillo project uses a release model where every new\n"
-"version shall be better than the last.\n"
-"<EM>Keep up with the latest one!</EM>\n"
+"Dillo-3.0 is a port to FLTK-1.3, which is big news because FLTK-1.3.0 was\n"
+"<a href='http://fltk.org/articles.php?L1086'>released</a>\n"
+"in June, clearing the way for Dillo to return to those distributions\n"
+"which had excluded Dillo2 due to FLTK2 never being officially released.\n"
+"<p>\n"
+"Dillo-3.0 also has plenty of improvements and bugfixes.\n"
+"<p>\n"
+"After this release, the core team will focus on implementing the CSS\n"
+"feature of floating elements. This will <em>greatly</em> improve dillo's\n"
+"web page rendering since many sites have adopted floats instead of tables.\n"
+"<p>\n"
+"The new dillo3 has shown excellent stability in our experience.\n"
+"The core team welcomes developers willing to join our workforce.\n"
+"<p>\n"
 "  </table>\n"
 "</table>\n"
 "</table>\n"
@@ -274,27 +276,38 @@
 "  <tr>\n"
 "   <td>\n"
 "<ul>\n"
-"<li>Added keybindings for scrolling.\n"
-"<li>Help button and local help file.\n"
-"<li>Add support for multiple class names in CSS.\n"
-"<li>Fix X11 coordinate overflows.\n"
-"<li>Improve CSS font parsing.\n"
-"<li>Enable font face setting via &lt;font&gt; element.\n"
-"<li>Ignore XML comment markers in CSS.\n"
-"<li>Fix user agent style for nested &lt;ul&gt;.\n"
-"<li>Handle signed chars. Added dIsspace() and dIsalnum() to dlib.\n"
-"<li>Changed the CCCs to build in one step (for both HTTP and DPI).\n"
-"<li>Remove the empty cache entry lingering after connection abort.\n"
-"<li>Fixed URL unescaping in the datauri DPI.\n"
-"<li>Changed and reimplemented the DPI API.\n"
-"<li>Allow linebreaks around Chinese/Japanese characters.\n"
-"<li>Fix scrolling for text search.\n"
-"<li>Tooltips.\n"
-"<li>Enable popup menu below bottom of page content.\n"
-"<li>Handle JPEGs with CMYK color space.\n"
-"<li>General cookies overhaul.\n"
-"<li>Fixed a bug in w3c_mode.\n"
-"<li>Limit number of simultaneous connections.\n"
+"<li>Ported Dillo to FLTK-1.3.\n"
+"<li>Native build on OSX.\n"
+"<li>Default binding for close-all changed from Alt-q to Ctrl-q.\n"
+"<li>Default binding for close-tab changed from Ctrl-q to Ctrl-w.\n"
+"<li>Default binding for left-tab changed to Shift-Ctrl-Tab.\n"
+"<li>'hide-panels' key action now hides the findbar if present,\n"
+"     and toggles display of the control panels otherwise.\n"
+"<li>Allow multiple search engines to be set in dillorc, with a menu\n"
+"    in the web search dialog to select between them.\n"
+"<li>Added an optional label to dillorc's search_url.\n"
+"    Format: \"[&lt;label&gt; ]&lt;url&gt;\"\n"
+"<li>Removed 'large' option of panel_size preference.\n"
+"<li>Add right_click_closes_tab preference (default is middle click).\n"
+"<li>Allow binding to non-ASCII keys and multimedia keys.\n"
+"<li>Removed --enable-ansi configure option.\n"
+"<li>Avoid a certificate dialog storm on some HTTPS sites (BUG#868).\n"
+"<li>Enable line wrapping for &lt;textarea&gt;. (BUG#903)\n"
+"<li>Rewrote the User Interface: much simpler design and event handling.\n"
+"<li>Avoid double render after going Back or Forward\n"
+"    (it takes half the time now!)\n"
+"<li>Added on-the-fly panel resize (tiny/small/medium and normal/small icons).\n"
+"<li>Implemented a custom tabs handler (to allow fine control of it).\n"
+"<li>Rewrote dw's crossing-events dispatcher (avoids redundant events).\n"
+"<li>Fixed a years old bug: stamped tooltips when scrolling with keyboard.\n"
+"<li>Fixed a border case in URL resolver: empty path + {query|fragment}\n"
+"     (BUG#948)\n"
+"<li>Cancel the expected URL after offering a download (BUG#982)\n"
+"<li>Eliminated a pack of 22 compiler warnings (gcc-4.6.1 amd64)\n"
+"<li>Limit saved cookie size.\n"
+"<li>Wrap image alt text.\n"
+"<li>Added support for CSS adjacent sibling selectors.\n"
+"<li>Collapse parent's and first child's top margin.\n"
 "</ul>\n"
 "  </table>\n"
 "</table>\n"
diff --git a/src/IO/http.c b/src/IO/http.c
index 137ff95..526b846 100644
--- a/src/IO/http.c
+++ b/src/IO/http.c
@@ -365,7 +365,7 @@
    DataBuf *dbuf;
 
    /* Create the query */
-   query = a_Http_make_query_str(S->web->url, S->flags & HTTP_SOCKET_USE_PROXY);
+   query = a_Http_make_query_str(S->web->url,S->flags & HTTP_SOCKET_USE_PROXY);
    dbuf = a_Chain_dbuf_new(query->str, query->len, 0);
 
    /* actually this message is sent too early.
diff --git a/src/bw.c b/src/bw.c
index 7f4785b..1dfc5a0 100644
--- a/src/bw.c
+++ b/src/bw.c
@@ -55,7 +55,6 @@
    bw->nav_stack_ptr = -1;
 
    /* Init expect */
-   bw->nav_expecting = FALSE;
    bw->nav_expect_url = NULL;
 
    bw->redirect_level = 0;
@@ -313,3 +312,27 @@
    return NULL;
 }
 
+/* expect API ------------------------------------------------------------- */
+
+void a_Bw_expect(BrowserWindow *bw, const DilloUrl *url)
+{
+   a_Url_free(bw->nav_expect_url);
+   bw->nav_expect_url = a_Url_dup(url);
+}
+
+void a_Bw_cancel_expect(BrowserWindow *bw)
+{
+   a_Url_free(bw->nav_expect_url);
+   bw->nav_expect_url = NULL;
+}
+
+bool_t a_Bw_expecting(BrowserWindow *bw)
+{
+   return (bw->nav_expect_url != NULL);
+}
+
+const DilloUrl *a_Bw_expected_url(BrowserWindow *bw)
+{
+   return bw->nav_expect_url;
+}
+
diff --git a/src/bw.h b/src/bw.h
index 4b915b5..590af4f 100644
--- a/src/bw.h
+++ b/src/bw.h
@@ -46,12 +46,9 @@
    /* 'nav_stack_ptr' refers to what's being displayed */
    int nav_stack_ptr;        /* [0 based; -1 = empty] */
    /* When the user clicks a link, the URL isn't pushed directly to history;
-    * nav_expect_url holds it until the first answer-bytes are got. Only then
-    * it is sent to history and referenced at the top of nav_stack */
+    * nav_expect_url holds it until a dw is assigned to it. Only then an entry
+    * is made in history and referenced at the top of nav_stack */
    DilloUrl *nav_expect_url;
-   /* 'nav_expecting' is true while dillo waits for non-cached URL data,
-    * until a dw is assigned to it. */
-   bool_t nav_expecting;
 
    /* Counter for the number of hops on a redirection. Used to stop
     * redirection loops (accounts for WEB_RootUrl only) */
@@ -88,6 +85,11 @@
 void a_Bw_remove_doc(BrowserWindow *bw, void *vdoc);
 void a_Bw_add_url(BrowserWindow *bw, const DilloUrl *Url);
 void a_Bw_cleanup(BrowserWindow *bw);
+/* expect API */
+void a_Bw_expect(BrowserWindow *bw, const DilloUrl *Url);
+void a_Bw_cancel_expect(BrowserWindow *bw);
+bool_t a_Bw_expecting(BrowserWindow *bw);
+const DilloUrl *a_Bw_expected_url(BrowserWindow *bw);
 
 typedef void (*BwCallback_t)(BrowserWindow *bw, const void *data);
 
diff --git a/src/cache.c b/src/cache.c
index d26ae61..5ea4551 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -892,6 +892,16 @@
                   " at: %s\n", URL_STR_(entry->Url));
          MSG("entry->ExpectedSize = %d, entry->TransferSize = %d\n",
              entry->ExpectedSize, entry->TransferSize);
+      }
+      if (!entry->TransferSize && !(entry->Flags & CA_Redirect) &&
+          (entry->Flags & WEB_RootUrl)) {
+         char *eol = strchr(entry->Header->str, '\n');
+         if (eol) {
+            char *status_line = dStrndup(entry->Header->str,
+                                         eol - entry->Header->str);
+            MSG_HTTP("Body was empty. Server sent status: %s\n", status_line);
+            dFree(status_line);
+         }
       }
       entry->Flags |= CA_GotData;
       entry->Flags &= ~CA_Stopped;          /* it may catch up! */
diff --git a/src/capi.c b/src/capi.c
index 867083b..885b4eb 100644
--- a/src/capi.c
+++ b/src/capi.c
@@ -302,15 +302,24 @@
       char *proxy_connect = a_Http_make_connect_str(web->url);
       Dstr *http_query = a_Http_make_query_str(web->url, FALSE);
       /* BUG: embedded NULLs in query data will truncate message */
+
+      /* BUG: WORKAROUND: request to only check the root URL's certificate.
+       *  This avoids the dialog bombing that stems from loading multiple
+       * https images/resources in a single page. A proper fix would take
+       * either to implement the https-dpi as a server (with state),
+       * or to move back https handling into dillo. */
       if (proxy_connect) {
          const char *proxy_urlstr = a_Http_get_proxy_urlstr();
          cmd = a_Dpip_build_cmd("cmd=%s proxy_url=%s proxy_connect=%s "
-                                "url=%s query=%s", "open_url", proxy_urlstr,
+                                "url=%s query=%s check_cert=%s",
+                                "open_url", proxy_urlstr,
                                 proxy_connect, URL_STR(web->url),
-                                http_query->str);
+                                http_query->str,
+                                (web->flags & WEB_RootUrl) ? "true" : "false");
       } else {
-         cmd = a_Dpip_build_cmd("cmd=%s url=%s query=%s",
-                                "open_url", URL_STR(web->url),http_query->str);
+         cmd = a_Dpip_build_cmd("cmd=%s url=%s query=%s check_cert=%s",
+                                "open_url", URL_STR(web->url),http_query->str,
+                                (web->flags & WEB_RootUrl) ? "true" : "false");
       }
       dFree(proxy_connect);
       dStr_free(http_query, 1);
diff --git a/src/css.cc b/src/css.cc
index d8f086d..e9a8eb5 100644
--- a/src/css.cc
+++ b/src/css.cc
@@ -104,6 +104,7 @@
    cs = selectorList->getRef (selectorList->size () - 1);
 
    cs->notMatchingBefore = -1;
+   cs->combinator = CHILD;
    cs->selector = new CssSimpleSelector ();
 };
 
@@ -133,6 +134,7 @@
 
       switch (comb) {
          case CHILD:
+         case ADJACENT_SIBLING:
             if (!sel->match (node))
                return false;
             break;
@@ -156,7 +158,11 @@
       }
 
       comb = cs->combinator;
-      node = docTree->parent (node);
+
+      if (comb == ADJACENT_SIBLING)
+         node = docTree->sibling (node);
+      else 
+         node = docTree->parent (node);
    }
 
    return true;
@@ -199,6 +205,9 @@
                break;
             case DESCENDANT:
                fprintf (stderr, "\" \" ");
+               break;
+            case ADJACENT_SIBLING:
+               fprintf (stderr, "+ ");
                break;
             default:
                fprintf (stderr, "? ");
@@ -489,39 +498,21 @@
    }
 }
 
-CssStyleSheet *CssContext::userAgentStyle;
-CssStyleSheet *CssContext::userStyle;
-CssStyleSheet *CssContext::userImportantStyle;
-
 CssContext::CssContext () {
    pos = 0;
 
-   for (int o = CSS_PRIMARY_USER_AGENT; o < CSS_PRIMARY_LAST; o++)
-      sheet[o] = NULL;
-
-   if (userAgentStyle == NULL) {
-      userAgentStyle = new CssStyleSheet ();
-      userStyle = new CssStyleSheet ();
-      userImportantStyle = new CssStyleSheet ();
-
-      sheet[CSS_PRIMARY_USER_AGENT] = userAgentStyle;
-      sheet[CSS_PRIMARY_USER] = userStyle;
-      sheet[CSS_PRIMARY_USER_IMPORTANT] = userImportantStyle;
-
-      buildUserAgentStyle ();
-      buildUserStyle ();
-   }
-
-   sheet[CSS_PRIMARY_USER_AGENT] = userAgentStyle;
-   sheet[CSS_PRIMARY_USER] = userStyle;
-   sheet[CSS_PRIMARY_USER_IMPORTANT] = userImportantStyle;
+   memset (sheet, 0, sizeof(sheet));
+   sheet[CSS_PRIMARY_USER_AGENT] = new CssStyleSheet ();
+   sheet[CSS_PRIMARY_USER] = new CssStyleSheet ();
+   sheet[CSS_PRIMARY_USER_IMPORTANT] = new CssStyleSheet ();
+
+   buildUserAgentStyle ();
+   buildUserStyle ();
 }
 
 CssContext::~CssContext () {
    for (int o = CSS_PRIMARY_USER_AGENT; o < CSS_PRIMARY_LAST; o++)
-      if (sheet[o] != userAgentStyle && sheet[o] != userStyle &&
-          sheet[o] != userImportantStyle)
-         delete sheet[o];
+      delete sheet[o];
 }
 
 /**
diff --git a/src/css.hh b/src/css.hh
index 61c1d12..20935df 100644
--- a/src/css.hh
+++ b/src/css.hh
@@ -458,9 +458,6 @@
  */
 class CssContext {
    private:
-      static CssStyleSheet *userAgentStyle;
-      static CssStyleSheet *userStyle;
-      static CssStyleSheet *userImportantStyle;
       CssStyleSheet *sheet[CSS_PRIMARY_USER_IMPORTANT + 1];
       int pos;
 
diff --git a/src/cssparser.cc b/src/cssparser.cc
index 3d62b31..73b4331 100644
--- a/src/cssparser.cc
+++ b/src/cssparser.cc
@@ -1289,6 +1289,9 @@
       } else if (ttype == CSS_TK_CHAR && tval[0] == '>') {
          selector->addSimpleSelector (CssSelector::CHILD);
          nextToken();
+      } else if (ttype == CSS_TK_CHAR && tval[0] == '+') {
+         selector->addSimpleSelector (CssSelector::ADJACENT_SIBLING);
+         nextToken();
       } else if (ttype != CSS_TK_END && spaceSeparated) {
          selector->addSimpleSelector (CssSelector::DESCENDANT);
       } else {
diff --git a/src/dialog.cc b/src/dialog.cc
index 85121c6..15e5d7a 100644
--- a/src/dialog.cc
+++ b/src/dialog.cc
@@ -89,7 +89,6 @@
       if (e == FL_KEYBOARD &&
           (Fl::event_key() == FL_Enter || Fl::event_key() == FL_Down) &&
           (Fl::event_state() & (FL_SHIFT|FL_CTRL|FL_ALT|FL_META)) == 0) {
-         MSG("CustChoice: ENTER\n");
          return Fl_Choice::handle(FL_PUSH);
       }
       return Fl_Choice::handle(e);
@@ -164,7 +163,7 @@
        for (int i = 0, j = 0; i < n_it; i++) {
           char *label, *url, *source;
           source = (char *)dList_nth_data(prefs.search_urls, i);
-          if (a_Misc_parse_search_url(source, &label, &url) < 0)
+          if (!source || a_Misc_parse_search_url(source, &label, &url) < 0)
              continue;
           pm[j++].label(FL_NORMAL_LABEL, strdup(label));
        }
@@ -191,12 +190,10 @@
    window->show();
    while (window->shown())
       Fl::wait();
-   _MSG("a_Dialog_input answer = %d\n", input_answer);
    if (input_answer == 1) {
       /* we have a string, save it */
       dFree(input_str);
       input_str = dStrdup(c_inp->value());
-      MSG("a_Dialog_input value() = %d\n", ch->value());
       prefs.search_url_idx = ch->value();
    }
    delete window;
diff --git a/src/doctree.hh b/src/doctree.hh
index ef7faa7..92cf6f0 100644
--- a/src/doctree.hh
+++ b/src/doctree.hh
@@ -6,6 +6,8 @@
 class DoctreeNode {
    public:
       DoctreeNode *parent;
+      DoctreeNode *sibling;
+      DoctreeNode *lastChild;
       int num; // unique ascending id
       int element;
       lout::misc::SimpleVector<char*> *klass;
@@ -14,11 +16,27 @@
 
       DoctreeNode () {
          parent = NULL;
+         sibling = NULL;
+         lastChild = NULL;
          klass = NULL;
          pseudo = NULL;
          id = NULL;
          element = 0;
       };
+
+      ~DoctreeNode () {
+         dFree ((void*) id);
+         while (lastChild) {
+            DoctreeNode *n = lastChild;
+            lastChild = lastChild->sibling;
+            delete n;
+         }
+         if (klass) {
+            for (int i = 0; i < klass->size (); i++)
+               dFree (klass->get(i));
+            delete klass;
+         }
+      }
 };
 
 /**
@@ -26,46 +44,55 @@
  *
  * The Doctree class defines the interface to the parsed HTML document tree
  * as it is used for CSS selector matching.
- * Currently the Doctree can be represented as stack, however to support
- * CSS adjacent siblings or for future JavaScript support it may have to
- * be extended to a real tree.
  */
 class Doctree {
    private:
       DoctreeNode *topNode;
+      DoctreeNode *rootNode;
       int num;
 
    public:
       Doctree () {
-         topNode = NULL;
+         rootNode = new DoctreeNode;
+         topNode = rootNode;
          num = 0;
       };
-      ~Doctree () { while (top ()) pop (); };
+
+      ~Doctree () { 
+         delete rootNode;
+      };
+
       DoctreeNode *push () {
          DoctreeNode *dn = new DoctreeNode ();
          dn->parent = topNode;
+         dn->sibling = dn->parent->lastChild;
+         dn->parent->lastChild = dn;
          dn->num = num++;
          topNode = dn;
          return dn;
       };
+
       void pop () {
-         DoctreeNode *dn = topNode;
-         if (dn) {
-            dFree ((void*) dn->id);
-            if (dn->klass) {
-               for (int i = 0; i < dn->klass->size (); i++)
-                  dFree (dn->klass->get(i));
-               delete dn->klass;
-            }
-            topNode = dn->parent;
-            delete dn;
-         }
+         assert (topNode != rootNode); // never pop the root node
+         topNode = topNode->parent;
       };
+
       inline DoctreeNode *top () {
-         return topNode;
+         if (topNode != rootNode)
+            return topNode;
+         else
+            return NULL;
       };
+
       inline DoctreeNode *parent (const DoctreeNode *node) {
-         return node->parent;
+         if (node->parent != rootNode) 
+            return node->parent;
+         else
+            return NULL;
+      };
+
+      inline DoctreeNode *sibling (const DoctreeNode *node) {
+         return node->sibling;
       };
 };
 
diff --git a/src/findbar.cc b/src/findbar.cc
index 02f9545..dcb9db5 100644
--- a/src/findbar.cc
+++ b/src/findbar.cc
@@ -41,6 +41,17 @@
             // Let these keys get to the UI
             return 0;
          }
+      } else if (modifier == FL_CTRL) {
+         if (k == 'a' || k == 'e') {
+            position(k == 'a' ? 0 : size());
+            return 1;
+         } else if (k == 'k') {
+            cut(position(), size());
+            return 1;
+         } else if (k == 'd') {
+            cut(position(), position()+1);
+            return 1;
+         }
       } else if (k == FL_Escape && modifier == 0) {
          // Avoid clearing the text with Esc, just hide the findbar.
          return 0;
@@ -86,7 +97,7 @@
  */
 void Findbar::hide_cb(Fl_Widget *, void *vfb)
 {
-   ((Findbar *)vfb)->hide();
+   a_UIcmd_findbar_toggle(a_UIcmd_get_bw_by_widget(vfb), 0);
 }
 
 /*
@@ -164,19 +175,15 @@
  */
 int Findbar::handle(int event)
 {
-   int ret = 0;
    int k = Fl::event_key();
    unsigned modifier = Fl::event_state() & (FL_SHIFT| FL_CTRL| FL_ALT|FL_META);
 
    if (event == FL_KEYBOARD && modifier == 0 && k == FL_Escape) {
-      hide();
-      ret = 1;
-   }
-
-   if (ret == 0)
-      ret = Fl_Group::handle(event);
-
-   return ret;
+      /* let the UI handle it */
+      return 0;
+   }
+
+   return Fl_Group::handle(event);
 }
 
 /*
@@ -188,7 +195,6 @@
    dReturn_if (bw == NULL);
 
    // It takes more than just calling show() to do the trick
-   //a_UIcmd_findbar_toggle(bw, 1);
    Fl_Group::show();
 
    /* select text even if already focused */
@@ -196,18 +202,3 @@
    i->position(i->size(), 0);
 }
 
-/*
- * Hide the findbar and reset the search state
- */
-void Findbar::hide()
-{
-   BrowserWindow *bw = a_UIcmd_get_bw_by_widget(this);
-   dReturn_if (bw == NULL);
-
-   // It takes more than just calling hide() to do the trick
-   Fl_Group::hide();
-   a_UIcmd_findbar_toggle(bw, 0);
-
-   a_UIcmd_findtext_reset(bw);
-   a_UIcmd_focus_main_area(bw);
-}
diff --git a/src/findbar.hh b/src/findbar.hh
index 1198640..72d24c4 100644
--- a/src/findbar.hh
+++ b/src/findbar.hh
@@ -27,7 +27,6 @@
    ~Findbar();
    int handle(int event);
    void show();
-   void hide();
 };
 
 #endif // __FINDBAR_HH__
diff --git a/src/gif.c b/src/gif.c
index 4b5c817..6911bc8 100644
--- a/src/gif.c
+++ b/src/gif.c
@@ -677,7 +677,7 @@
             case 2:         /* End code... consume remaining data chunks..? */
                goto error;  /* Could clean up better? */
             default:
-               printf("dillo_gif_decode: error!\n");
+               MSG("Gif_decode: error!\n");
                goto error;
             }
          }
diff --git a/src/html.cc b/src/html.cc
index 1bdbd8f..4cbcef1 100644
--- a/src/html.cc
+++ b/src/html.cc
@@ -647,7 +647,7 @@
  */
 void DilloHtml::loadImages (const DilloUrl *pattern)
 {
-   dReturn_if_fail (bw->nav_expecting == FALSE);
+   dReturn_if (a_Bw_expecting(bw));
 
    /* If the user asked for a specific URL, the user (NULL) is the requester,
     * but if the user just asked for all URLs, use the page URL as the
@@ -688,12 +688,10 @@
    if (link == -1) {
       _MSG(" Link  LEAVE  notify...\n");
       a_UIcmd_set_msg(bw, "");
-      a_UIcmd_set_pointer_on_link(bw, FALSE);
    } else {
       _MSG(" Link  ENTER  notify...\n");
       Html_set_link_coordinates(html, link, x, y);
       a_UIcmd_set_msg(bw, "%s", URL_STR(html->links->get(link)));
-      a_UIcmd_set_pointer_on_link(bw, TRUE);
    }
    return true;
 }
diff --git a/src/keys.cc b/src/keys.cc
index e5510ef..3605311 100644
--- a/src/keys.cc
+++ b/src/keys.cc
@@ -101,7 +101,8 @@
    { "open"         , KEYS_OPEN         , FL_CTRL   , 'o'             },
    { "new-window"   , KEYS_NEW_WINDOW   , FL_CTRL   , 'n'             },
    { "new-tab"      , KEYS_NEW_TAB      , FL_CTRL   , 't'             },
-   { "left-tab"     , KEYS_LEFT_TAB     , FL_SHIFT  , FL_Tab          },
+   { "left-tab"     , KEYS_LEFT_TAB     , FL_CTRL |
+                                          FL_SHIFT  , FL_Tab          },
    { "right-tab"    , KEYS_RIGHT_TAB    , FL_CTRL   , FL_Tab          },
    { "close-tab"    , KEYS_CLOSE_TAB    , FL_CTRL   , 'w'             },
    { "find"         , KEYS_FIND         , FL_CTRL   , 'f'             },
diff --git a/src/keysrc b/src/keysrc
index df658be..18bec52 100644
--- a/src/keysrc
+++ b/src/keysrc
@@ -6,6 +6,7 @@
 # The commented-out bindings below show the defaults built into Dillo.
 #
 # Modifiers recognized: "Shift", "Ctrl", "Alt", "Meta".
+# (OS X: Use "Meta" for Command)
 #
 # Key names recognized: "Backspace", "Delete", "Down", "End", "Esc",
 # "F1" through "F12", "Home", "Insert", "Left", "PageDown", "PageUp",
@@ -38,7 +39,7 @@
 #<ctrl>q = close-all
 
 # "left-tab" and "right-tab" switch to the left/right of the current tab.
-# <shift>tab = left-tab
+# <ctrl><shift>tab = left-tab
 # <ctrl>tab = right-tab
 
 # "back" and "forward" move back/forward through the browser history.
diff --git a/src/menu.cc b/src/menu.cc
index 090e2b5..f9babb0 100644
--- a/src/menu.cc
+++ b/src/menu.cc
@@ -631,8 +631,7 @@
       {"Panel size", 0, Menu_nop_cb, (void*)"Submenu1", FL_SUBMENU,0,0,0,0},
          {"tiny",  0,Menu_panel_change_cb,(void*)0,FL_MENU_RADIO,0,0,0,0},
          {"small", 0,Menu_panel_change_cb,(void*)1,FL_MENU_RADIO,0,0,0,0},
-         {"medium",0,Menu_panel_change_cb,(void*)2,FL_MENU_RADIO,0,0,0,0},
-         {"large", 0,Menu_panel_change_cb,(void*)3,
+         {"medium",0,Menu_panel_change_cb,(void*)2,
            FL_MENU_RADIO|FL_MENU_DIVIDER,0,0,0,0},
          {"small icons", 0,Menu_panel_change_cb,(void*)10,
            FL_MENU_TOGGLE,0,0,0,0},
@@ -651,7 +650,7 @@
    if (prefs.load_images)
       pm[2].set();
    pm[4+cur_panelsize].setonly();
-   cur_smallicons ? pm[8].set() : pm[8].clear();
+   cur_smallicons ? pm[7].set() : pm[7].clear();
 
    item = pm->popup(wid->x(), wid->y() + wid->h());
    if (item) {
diff --git a/src/misc.c b/src/misc.c
index ef64e87..2abfb98 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -411,6 +411,8 @@
       }
    }
    *label = buf;
+   if (ret == -1)
+      MSG("Invalid search_url: \"%s\"\n", source);
    return ret;
 }
 
diff --git a/src/nav.c b/src/nav.c
index 31f9e92..8dbb504 100644
--- a/src/nav.c
+++ b/src/nav.c
@@ -248,10 +248,8 @@
  */
 void a_Nav_cancel_expect(BrowserWindow *bw)
 {
-   if (bw->nav_expecting) {
-      a_Url_free(bw->nav_expect_url);
-      bw->nav_expect_url = NULL;
-      bw->nav_expecting = FALSE;
+   if (a_Bw_expecting(bw)) {
+      a_Bw_cancel_expect(bw);
       a_UIcmd_set_buttons_sens(bw);
    }
    if (bw->meta_refresh_status > 0)
@@ -263,7 +261,7 @@
  */
 void a_Nav_cancel_expect_if_eq(BrowserWindow *bw, const DilloUrl *url)
 {
-   if (bw->nav_expecting && a_Url_cmp(url, bw->nav_expect_url) == 0)
+   if (a_Url_cmp(url, a_Bw_expected_url(bw)) == 0)
       a_Nav_cancel_expect(bw);
 }
 
@@ -281,8 +279,8 @@
 
    dReturn_if_fail(bw != NULL);
 
-   if (bw->nav_expecting) {
-      url = bw->nav_expect_url;
+   if (a_Bw_expecting(bw)) {
+      url = a_Url_dup(a_Bw_expected_url(bw));
       reload = (URL_FLAGS(url) & URL_ReloadPage);
       repush = (URL_FLAGS(url) & URL_ReloadFromCache);
       e2equery = (URL_FLAGS(url) & URL_E2EQuery);
@@ -293,6 +291,7 @@
       m = URL_E2EQuery|URL_ReloadPage|URL_ReloadFromCache|URL_IgnoreScroll;
       a_Url_set_flags(url, URL_FLAGS(url) & ~m);
       url_idx = a_History_add_url(url);
+      a_Url_free(url);
 
       if (repush) {
          MSG("a_Nav_expect_done: repush!\n");
@@ -345,16 +344,17 @@
 void a_Nav_push(BrowserWindow *bw, const DilloUrl *url,
                                    const DilloUrl *requester)
 {
-   dReturn_if_fail (bw != NULL);
-
-   if (bw->nav_expecting && !a_Url_cmp(bw->nav_expect_url, url) &&
-       !strcmp(URL_FRAGMENT(bw->nav_expect_url),URL_FRAGMENT(url))) {
+   const DilloUrl *e_url;
+   dReturn_if_fail (bw != NULL);
+
+   e_url = a_Bw_expected_url(bw);
+   if (e_url && !a_Url_cmp(e_url, url) &&
+       !strcmp(URL_FRAGMENT(e_url),URL_FRAGMENT(url))) {
       /* we're already expecting that url (most probably a double-click) */
       return;
    }
    a_Nav_cancel_expect(bw);
-   bw->nav_expect_url = a_Url_dup(url);
-   bw->nav_expecting = TRUE;
+   a_Bw_expect(bw, url);
    Nav_open_url(bw, url, requester, 0);
 }
 
@@ -370,8 +370,7 @@
       url = a_Url_dup(a_History_get_url(NAV_TOP_UIDX(bw)));
       /* Let's make reload be from Cache */
       a_Url_set_flags(url, URL_FLAGS(url) | URL_ReloadFromCache);
-      bw->nav_expect_url = a_Url_dup(url);
-      bw->nav_expecting = TRUE;
+      a_Bw_expect(bw, url);
       Nav_open_url(bw, url, NULL, 0);
       a_Url_free(url);
    }
@@ -501,9 +500,9 @@
          a_Url_set_flags(r_url, URL_FLAGS(r_url) | URL_E2EQuery);
          /* This is an explicit reload, so clear the SpamSafe flag */
          a_Url_set_flags(r_url, URL_FLAGS(r_url) & ~URL_SpamSafe);
-         bw->nav_expect_url = r_url;
-         bw->nav_expecting = TRUE;
+         a_Bw_expect(bw, r_url);
          Nav_open_url(bw, r_url, NULL, 0);
+         a_Url_free(r_url);
       }
    }
 }
diff --git a/src/prefs.c b/src/prefs.c
index cbd1f5d..58ac5c3 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -18,7 +18,7 @@
 #define PREFS_FONT_CURSIVE    "URW Chancery L"
 #define PREFS_FONT_FANTASY    "DejaVu Sans" /* TODO: find good default */
 #define PREFS_FONT_MONOSPACE  "DejaVu Sans Mono"
-#define PREFS_SEARCH_URL "http://www.google.com/search?ie=UTF-8&oe=UTF-8&q=%s"
+#define PREFS_SEARCH_URL      "http://duckduckgo.com/lite/?kp=-1&q=%s"
 #define PREFS_NO_PROXY        "localhost 127.0.0.1"
 #define PREFS_SAVE_DIR        "/tmp/"
 #define PREFS_HTTP_REFERER    "host"
diff --git a/src/prefs.h b/src/prefs.h
index 19e3890..e81bda1 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -24,7 +24,7 @@
 #define PREFS_GEOMETRY_DEFAULT_YPOS  -9999
 
 /* Panel sizes */
-enum { P_tiny = 0, P_small, P_medium, P_large };
+enum { P_tiny = 0, P_small, P_medium };
 
 enum {PREFS_FILTER_ALLOW_ALL,
       PREFS_FILTER_SAME_DOMAIN};
diff --git a/src/prefsparser.cc b/src/prefsparser.cc
index bf97322..3f8e4a9 100644
--- a/src/prefsparser.cc
+++ b/src/prefsparser.cc
@@ -176,8 +176,6 @@
          prefs.panel_size = P_tiny;
       else if (!dStrcasecmp(value, "small"))
          prefs.panel_size = P_small;
-      else if (!dStrcasecmp(value, "large"))
-         prefs.panel_size = P_large;
       else /* default to "medium" */
          prefs.panel_size = P_medium;
       break;
diff --git a/src/ui.cc b/src/ui.cc
index 434dca1..3302244 100644
--- a/src/ui.cc
+++ b/src/ui.cc
@@ -154,33 +154,6 @@
 //----------------------------------------------------------------------------
 
 /*
- * A button that highlights on mouse over
- */
-class CustLightButton : public Fl_Button {
-   Fl_Color norm_color;
-public:
-   CustLightButton(int x, int y, int w, int h, const char *l=0) :
-      Fl_Button(x,y,w,h,l) { norm_color = color(); };
-   virtual int handle(int e);
-};
-
-int CustLightButton::handle(int e)
-{
-   if (active()) {
-      if (e == FL_ENTER) {
-         color(51); // {17,26,51}
-         redraw();
-      } else if (e == FL_LEAVE || e == FL_RELEASE) {
-         color(norm_color);
-         redraw();
-      }
-   }
-   return Fl_Button::handle(e);
-}
-
-//----------------------------------------------------------------------------
-
-/*
  * Used to handle "paste" within the toolbar's Clear button.
  */
 class CustPasteButton : public CustLightButton {
@@ -221,8 +194,6 @@
          padding = w > 2 ? w/2 : 1;
       }
       copy_label(lbl);
-      //measure_label(w,h);
-      //size(w+padding,this->h());
    }
 };
 
@@ -303,16 +274,6 @@
 }
 
 /*
- * Change the color of the location bar.
- *
-static void color_change_cb(Fl_Widget *wid, void *data)
-{
-   ((UI*)data)->color_change_cb_i();
-}
- */
-
-
-/*
  * Send the browser to the new URL in the location.
  */
 static void location_cb(Fl_Widget *wid, void *data)
@@ -323,9 +284,8 @@
    _MSG("location_cb()\n");
    a_UIcmd_open_urlstr(a_UIcmd_get_bw_by_widget(i), i->value());
 
-   if (ui->get_panelmode() == UI_TEMPORARILY_SHOW_PANELS) {
-      ui->set_panelmode(UI_HIDDEN);
-   }
+   if (ui->temporaryPanels())
+      ui->panels_toggle();
 }
 
 
@@ -537,11 +497,11 @@
    padding = w;
    btn->copy_label(PanelSize == P_tiny ? "&F" : "&File");
    btn->measure_label(w,h);
-   h = (PanelSize == P_large) ? mh : (PanelSize == P_tiny) ? bh : lh;
+   h = (PanelSize == P_tiny) ? bh : lh;
    btn->size(w+padding, h);
    p_xpos += btn->w();
    _MSG("UI::make_filemenu_button w=%d h=%d padding=%d\n", w, h, padding);
-   btn->box(PanelSize == P_large ? FL_THIN_UP_BOX : FL_THIN_UP_BOX);
+   btn->box(FL_THIN_UP_BOX);
    btn->callback(filemenu_cb, this);
    if (prefs.show_tooltip)
       btn->tooltip("File menu");
@@ -581,11 +541,6 @@
          bw = 42, bh = 36, mh = 0, lh = 22, lbl = 1;
       else
          bw = 45, bh = 45, mh = 0, lh = 28, lbl = 1;
-   } else {   // P_large
-      if (Small_Icons)
-         bw = 42, bh = 36, mh = 22, lh = 22, lbl = 1;
-      else
-         bw = 45, bh = 45, mh = 24, lh = 28, lbl = 1;
    }
    nh = bh, fh = 28; sh = 20;
 
@@ -604,36 +559,17 @@
       NavBar->rearrange();
       TopGroup->insert(*NavBar,0);
    } else {
-       if (PanelSize == P_large) {
-          MenuBar = new CustGroupHorizontal(0,0,ww,mh);
-          MenuBar->begin();
-           MenuBar->box(FL_THIN_UP_BOX);
-           Fl_Widget *bn = make_filemenu_button();
-           MenuBar->add_resizable(*new Fl_Box(bn->w(),0,ww - bn->w(),mh));
-          MenuBar->end();
-          MenuBar->rearrange();
-          TopGroup->insert(*MenuBar,0);
-
-          p_xpos = 0;
-          LocBar = new CustGroupHorizontal(0,0,ww,lh);
-          LocBar->begin();
-           make_location(ww);
-           LocBar->resizable(Location);
-          LocBar->end();
-          LocBar->rearrange();
-          TopGroup->insert(*LocBar,1);
-       } else {
-          LocBar = new CustGroupHorizontal(0,0,ww,lh);
-          LocBar->box(FL_NO_BOX);
-          LocBar->begin();
-           p_xpos = 0;
-           make_filemenu_button();
-           make_location(ww);
-           LocBar->resizable(Location);
-          LocBar->end();
-          LocBar->rearrange();
-          TopGroup->insert(*LocBar,0);
-       }
+       // Location
+       LocBar = new CustGroupHorizontal(0,0,ww,lh);
+       LocBar->box(FL_NO_BOX);
+       LocBar->begin();
+        p_xpos = 0;
+        make_filemenu_button();
+        make_location(ww);
+        LocBar->resizable(Location);
+       LocBar->end();
+       LocBar->rearrange();
+       TopGroup->insert(*LocBar,0);
 
        // Toolbar
        p_ypos = 0;
@@ -652,7 +588,7 @@
         }
        NavBar->end();
        NavBar->rearrange();
-       TopGroup->insert(*NavBar,(MenuBar ? 2 : 1));
+       TopGroup->insert(*NavBar,1);
    }
 }
 
@@ -694,9 +630,7 @@
 UI::UI(int x, int y, int ui_w, int ui_h, const char* label, const UI *cur_ui) :
   CustGroupVertical(x, y, ui_w, ui_h, label)
 {
-   PointerOnLink = FALSE;
-
-   MenuBar = LocBar = NavBar = StatusBar = NULL;
+   LocBar = NavBar = StatusBar = NULL;
 
    Tabs = NULL;
    TabTooltip = NULL;
@@ -704,18 +638,14 @@
    TopGroup->box(FL_NO_BOX);
    clear_flag(SHORTCUT_LABEL);
 
+   PanelTemporary = false;
    if (cur_ui) {
       PanelSize = cur_ui->PanelSize;
       CuteColor = cur_ui->CuteColor;
       Small_Icons = cur_ui->Small_Icons;
-      if (cur_ui->Panelmode == UI_HIDDEN ||
-          cur_ui->Panelmode == UI_TEMPORARILY_SHOW_PANELS)
-         Panelmode = UI_HIDDEN;
-      else
-         Panelmode = UI_NORMAL;
+      Panelmode = cur_ui->Panelmode;
    } else {
      // Set some default values
-     //PanelSize = P_tiny, CuteColor = 26, Small_Icons = 0;
      PanelSize = prefs.panel_size;
      Small_Icons = prefs.small_icons;
      CuteColor = 206;
@@ -740,7 +670,6 @@
     MainIdx = TopGroup->find(Main);
 
     // Find text bar
-    FindBarSpace = 1;
     FindBar = new Findbar(ui_w, fh);
     TopGroup->add(FindBar);
 
@@ -750,13 +679,6 @@
    TopGroup->end();
    TopGroup->rearrange();
 
-   // Make the full screen button (to be attached to the viewport later)
-   // TODO: attach to the viewport
-   //FullScreen = new Fl_Button(0,0,15,15);
-   //FullScreen->image(ImgFullScreenOn);
-   //FullScreen->tooltip("Hide Controls");
-   //FullScreen->callback(fullscreen_cb, this);
-
    customize(0);
 
    if (Panelmode == UI_HIDDEN) {
@@ -771,9 +693,6 @@
 {
    _MSG("UI::~UI()\n");
    dFree(TabTooltip);
-
-   if (!FindBarSpace)
-      delete FindBar;
 }
 
 /*
@@ -788,10 +707,11 @@
       /* WORKAROUND: remove the Panel's fltk-tooltip.
        * Although the expose event is delivered, it has an offset. This
        * extra call avoids the lingering tooltip. */
-      if (Fl::event_inside(NavBar) ||
-          (LocBar && Fl::event_inside(LocBar)) ||
-          (MenuBar && Fl::event_inside(MenuBar)) ||
-          (StatusBar && Fl::event_inside(StatusBar)))
+      if (!Fl::event_inside(Main) &&
+          (Fl::event_inside((Fl_Widget*)tabs()) ||
+           Fl::event_inside(NavBar) ||
+           (LocBar && Fl::event_inside(LocBar)) ||
+           (StatusBar && Fl::event_inside(StatusBar))))
          window()->damage(FL_DAMAGE_EXPOSE,0,0,1,1);
 
       return 0; // Receive as shortcut
@@ -821,14 +741,17 @@
          a_UIcmd_search_dialog(a_UIcmd_get_bw_by_widget(this));
          ret = 1;
       } else if (cmd == KEYS_GOTO) {
+         if (Panelmode == UI_HIDDEN) {
+            panels_toggle();
+            temporaryPanels(true);
+         }
          focus_location();
          ret = 1;
       } else if (cmd == KEYS_HIDE_PANELS) {
          /* Hide findbar if present, hide panels if not */
-         (FindBarSpace) ? findbar_toggle(0) : panels_toggle();
-         ret = 1;
-         //if (get_panelmode() == UI_TEMPORARILY_SHOW_PANELS)
-         //   set_panelmode(UI_HIDDEN);
+         (FindBar->visible()) ? findbar_toggle(0) : panels_toggle();
+         temporaryPanels(false);
+         ret = 1;
       } else if (cmd == KEYS_OPEN) {
          a_UIcmd_open_file(a_UIcmd_get_bw_by_widget(this));
          ret = 1;
@@ -898,10 +821,6 @@
  */
 void UI::focus_location()
 {
-   if (get_panelmode() == UI_HIDDEN) {
-      // Temporary panel handling is disabled now.
-      //set_panelmode(UI_TEMPORARILY_SHOW_PANELS);
-   }
    Location->take_focus();
    // Make text selected when already focused.
    Location->position(Location->size(), 0);
@@ -1038,13 +957,11 @@
 {
    // Remove current panel's bars
    init_sizes();
-   TopGroup->remove(MenuBar);
-   Fl::delete_widget(MenuBar);
    TopGroup->remove(LocBar);
    Fl::delete_widget(LocBar);
    TopGroup->remove(NavBar);
    Fl::delete_widget(NavBar);
-   MenuBar = LocBar = NavBar = NULL;
+   LocBar = NavBar = NULL;
 
    // Set internal vars for panel size
    PanelSize = new_size;
@@ -1075,39 +992,6 @@
 }
 
 /*
- * Set or remove the Panelmode flag and update the UI accordingly
- */
-void UI::set_panelmode(UIPanelmode mode)
-{
-   if (mode == UI_HIDDEN) {
-      //Panel->hide();
-      StatusBar->hide();
-   } else {
-      /* UI_NORMAL or UI_TEMPORARILY_SHOW_PANELS */
-      //Panel->show();
-      StatusBar->show();
-   }
-   Panelmode = mode;
-   TopGroup->rearrange();
-}
-
-/*
- * Get the value of the panelmode flag
- */
-UIPanelmode UI::get_panelmode()
-{
-   return Panelmode;
-}
-
-/*
- * Toggle the Control Panel out of the way
- */
-void UI::panelmode_cb_i()
-{
-   set_panelmode((UIPanelmode) !Panelmode);
-}
-
-/*
  * Set 'nw' as the main render area widget
  */
 void UI::set_render_layout(Fl_Group *nw)
@@ -1130,15 +1014,12 @@
    switch (btn) {
    case UI_BACK:
       (sens) ? Back->activate() : Back->deactivate();
-//    Back->redraw(DAMAGE_HIGHLIGHT);
       break;
    case UI_FORW:
       (sens) ? Forw->activate() : Forw->deactivate();
-//    Forw->redraw(DAMAGE_HIGHLIGHT);
       break;
    case UI_STOP:
       (sens) ? Stop->activate() : Stop->deactivate();
-//    Stop->redraw(DAMAGE_HIGHLIGHT);
       break;
    default:
       break;
@@ -1160,27 +1041,23 @@
 {
    /* WORKAROUND:
     * This is tricky: As fltk-1.3 resizes hidden widgets (which it
-    * doesn't resize when visible!). We need to go through hoops to
+    * doesn't resize when visible!). We need to set the size to (0,0) to
     * get the desired behaviour.
     * (STR#2639 in FLTK bug tracker).
     */
 
    if (add) {
-      if (!FindBarSpace) {
-         // show
-         Main->size(Main->w(), Main->h()-FindBar->h());
-         insert(*FindBar, StatusBar);
-         FindBar->show();
-         FindBarSpace = 1;
-      } else {
-         // select text
-         FindBar->show();
-      }
-   } else if (!add && FindBarSpace) {
+      if (!FindBar->visible())
+         FindBar->size(w(), fh);
+      FindBar->show();
+   } else {
       // hide
-      Main->size(Main->w(), Main->h()+FindBar->h());
-      remove(FindBar);
-      FindBarSpace = 0;
+      FindBar->size(0,0);
+      FindBar->hide();
+      // reset state
+      a_UIcmd_findtext_reset(a_UIcmd_get_bw_by_widget(this));
+      // focus main area
+      focus_main();
    }
    TopGroup->rearrange();
 }
@@ -1197,10 +1074,6 @@
 
    // hide/show panels
    init_sizes();
-   if (MenuBar) {
-      hide ? MenuBar->size(0,0) : MenuBar->size(w(),mh);
-      hide ? MenuBar->hide() : MenuBar->show();
-   }
    if (LocBar) {
       hide ? LocBar->size(0,0) : LocBar->size(w(),lh);
       hide ? LocBar->hide() : LocBar->show();
@@ -1216,4 +1089,5 @@
    }
 
    TopGroup->rearrange();
-}
+   Panelmode = (hide) ? UI_HIDDEN : UI_NORMAL;
+}
diff --git a/src/ui.hh b/src/ui.hh
index beb202a..775a35e 100644
--- a/src/ui.hh
+++ b/src/ui.hh
@@ -28,22 +28,27 @@
 
 typedef enum {
    UI_NORMAL = 0,     /* make sure it's compatible with bool */
-   UI_HIDDEN = 1,
-   UI_TEMPORARILY_SHOW_PANELS
+   UI_HIDDEN = 1
 } UIPanelmode;
+
+
+// Min size to fit the full UI
+#define UI_MIN_W 600
+#define UI_MIN_H 200
 
 // Private classes
 class CustProgressBox;
 class CustTabs;
 
 
-// Class definition ----------------------------------------------------------
+// Class definitions ---------------------------------------------------------
 /*
  * Used to reposition group's widgets when some of them are hidden.
  * All children get the height of the group but retain their original width.
  * The resizable child get's the remaining space.
  */
 class CustGroupHorizontal : public Fl_Group {
+   Fl_Widget *rsz;
 public:
   CustGroupHorizontal(int x,int y,int w ,int h,const char *l = 0) :
     Fl_Group(x,y,w,h,l) { };
@@ -53,13 +58,24 @@
      int sum = 0, _x = x();
      int children_ = children();
 
+     if (resizable())
+        rsz = resizable();
+
      for (int i=0; i < children_; i++)
         if (a[i] != resizable() && a[i]->visible())
            sum += a[i]->w();
 
      for (int i=0; i < children_; i++) {
-        if (a[i] == resizable()) {
-           a[i]->resize(_x, y(), w() - sum, h());
+        if (a[i] == rsz) {
+           if (w() > sum) {
+              a[i]->resize(_x, y(), w()-sum, h());
+              if (!resizable())
+                 resizable(rsz);
+           } else {
+              /* widgets overflow width */
+              a[i]->resize(_x, y(), 0, h());
+              resizable(NULL);
+           }
         } else {
            a[i]->resize(_x, y(), a[i]->w(), h());
         }
@@ -99,6 +115,32 @@
   }
 };
 
+/*
+ * A button that highlights on mouse over
+ */
+class CustLightButton : public Fl_Button {
+   Fl_Color norm_color, light_color;
+public:
+   CustLightButton(int x, int y, int w, int h, const char *l=0) :
+      Fl_Button(x,y,w,h,l) { norm_color = color(); light_color = 51; };
+   virtual int handle(int e)
+   {
+      if (active()) {
+         if (e == FL_ENTER) {
+            color(light_color); // {17,26,51}
+            redraw();
+         } else if (e == FL_LEAVE || e == FL_RELEASE || e == FL_HIDE) {
+            color(norm_color);
+            redraw();
+         }
+      } else if (e == FL_DEACTIVATE && color() != norm_color) {
+         color(norm_color);
+         redraw();
+      }
+      return Fl_Button::handle(e);
+   }
+   void hl_color(Fl_Color col) { light_color = col; };
+};
 
 //
 // UI class definition -------------------------------------------------------
@@ -109,21 +151,21 @@
 
    CustGroupVertical *TopGroup;
    Fl_Button *Back, *Forw, *Home, *Reload, *Save, *Stop, *Bookmarks, *Tools,
-          *Clear, *Search, *Help, *FullScreen, *BugMeter, *FileButton;
-   CustGroupHorizontal *MenuBar, *LocBar, *NavBar, *StatusBar;
+          *Clear, *Search, *Help, *BugMeter, *FileButton;
+   CustGroupHorizontal *LocBar, *NavBar, *StatusBar;
    Fl_Input  *Location;
    CustProgressBox *PProg, *IProg;
    Fl_Group *Panel, *Main;
    Fl_Output *StatusOutput;
    Findbar *FindBar;
 
-   int FindBarSpace, MainIdx;
+   int MainIdx;
    // Panel customization variables
    int PanelSize, CuteColor, Small_Icons;
    int p_xpos, p_ypos, bw, bh, mh, lh, nh, fh, sh, pw, lbl;
+   bool PanelTemporary;
 
    UIPanelmode Panelmode;
-   int PointerOnLink;
    Fl_Button *make_button(const char *label, Fl_Image *img,
                           Fl_Image*deimg, int b_n, int start = 0);
    void make_toolbar(int tw, int th);
@@ -154,8 +196,6 @@
    void customize(int flags);
    void button_set_sens(UIButton btn, int sens);
    void paste_url();
-   void set_panelmode(UIPanelmode mode);
-   UIPanelmode get_panelmode();
    int get_panelsize() { return PanelSize; }
    int get_smallicons() { return Small_Icons; }
    void change_panel(int new_size, int small_icons);
@@ -164,13 +204,12 @@
 
    CustTabs *tabs() { return Tabs; }
    void tabs(CustTabs *tabs) { Tabs = tabs; }
-   int pointerOnLink() { return PointerOnLink; }
-   void pointerOnLink(int flag) { PointerOnLink = flag; }
+   bool temporaryPanels() { return PanelTemporary; }
+   void temporaryPanels(bool val) { PanelTemporary = val; }
 
    // Hooks to method callbacks
    void color_change_cb_i();
    void toggle_cb_i();
-   void panelmode_cb_i();
 };
 
 #endif // __UI_HH__
diff --git a/src/uicmd.cc b/src/uicmd.cc
index 43dee78..715dcbe 100644
--- a/src/uicmd.cc
+++ b/src/uicmd.cc
@@ -1,7 +1,7 @@
 /*
  * File: uicmd.cc
  *
- * Copyright (C) 2005-2007 Jorge Arellano Cid <jcid@dillo.org>
+ * Copyright (C) 2005-2011 Jorge Arellano Cid <jcid@dillo.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,8 @@
 #include <FL/Fl_Double_Window.H>
 #include <FL/Fl_Wizard.H>
 #include <FL/Fl_Box.H>
+#include <FL/Fl_Pack.H>
+#include <FL/Fl_Scroll.H>
 #include <FL/names.h>
 
 #include "paths.hh"
@@ -42,7 +44,8 @@
 
 #include "nav.h"
 
-#define DEFAULT_TAB_LABEL "Dillo"
+//#define DEFAULT_TAB_LABEL "-.untitled.-"
+#define DEFAULT_TAB_LABEL "-.new.-"
 
 // Handy macro
 #define BW2UI(bw) ((UI*)((bw)->ui))
@@ -62,6 +65,7 @@
  * Forward declarations
  */
 static BrowserWindow *UIcmd_tab_new(CustTabs *tabs, UI *old_ui, int focus);
+static void close_tab_btn_cb (Fl_Widget *w, void *cb_data);
 
 //----------------------------------------------------------------------------
 
@@ -84,17 +88,52 @@
 /*
  * Allows fine control of the tabbed interface
  */
-class CustTabs : public CustGroupHorizontal {
-   int tab_w, tab_h, ctab_h, tab_n;
+class CustTabs : public Fl_Group {
+   int tab_w, tab_h, ctab_h, btn_w, ctl_w;
    Fl_Wizard *Wizard;
-   int tabcolor_inactive, tabcolor_active, curtab_idx;
+   Fl_Scroll *Scroll;
+   Fl_Pack *Pack;
+   Fl_Group *Control;
+   CustLightButton *CloseBtn;
+   int tabcolor_inactive, tabcolor_active;
+
+   void update_pack_offset(void);
+   void resize(int x, int y, int w, int h)
+      { Fl_Group::resize(x,y,w,h); update_pack_offset(); }
+   int get_btn_idx(UI *ui);
+
 public:
    CustTabs (int ww, int wh, int th, const char *lbl=0) :
-      CustGroupHorizontal(0,0,ww,th,lbl) {
-      tab_w = 80, tab_h = th, ctab_h = 1, tab_n = 0, curtab_idx = -1;
+      Fl_Group(0,0,ww,th,lbl) {
+      Pack = NULL;
+      tab_w = 50, tab_h = th, ctab_h = 1, btn_w = 20, ctl_w = 1*btn_w+2;
       tabcolor_active = FL_DARK_CYAN; tabcolor_inactive = 206;
       resize(0,0,ww,ctab_h);
-      resizable(NULL);
+      /* tab buttons go inside a pack within a scroll */
+      Scroll = new Fl_Scroll(0,0,ww-ctl_w,ctab_h);
+      Scroll->type(0); /* no scrollbars */
+      Scroll->box(FL_NO_BOX);
+       Pack = new Fl_Pack(0,0,ww-ctl_w,tab_h);
+       Pack->type(Fl_Pack::HORIZONTAL);
+       Pack->box(FL_NO_BOX); //FL_THIN_DOWN_FRAME
+       Pack->end();
+      Scroll->end();
+      resizable(Scroll);
+
+      /* control buttons go inside a group */
+      Control = new Fl_Group(ww-ctl_w,0,ctl_w,ctab_h);
+       CloseBtn = new CustLightButton(ww-ctl_w+2,0,btn_w,ctab_h, "X");
+       CloseBtn->box(FL_PLASTIC_ROUND_UP_BOX);
+       CloseBtn->labelcolor(0x00641000);
+       CloseBtn->hl_color(FL_WHITE);
+       CloseBtn->clear_visible_focus();
+       CloseBtn->tooltip(prefs.right_click_closes_tab ?
+          "Close current tab.\nor Right-click tab label to close." :
+          "Close current tab.\nor Middle-click tab label to close.");
+       CloseBtn->callback(close_tab_btn_cb, this);
+       CloseBtn->hide();
+      Control->end();
+
       box(FL_FLAT_BOX);
       end();
 
@@ -106,12 +145,10 @@
    UI *add_new_tab(UI *old_ui, int focus);
    void remove_tab(UI *ui);
    Fl_Wizard *wizard(void) { return Wizard; }
-   int get_btn_idx(UI *ui);
-   int num_tabs() { return children(); }
+   int num_tabs() { return (Pack ? Pack->children() : 0); }
    void switch_tab(CustTabButton *cbtn);
    void prev_tab(void);
    void next_tab(void);
-
    void set_tab_label(UI *ui, const char *title);
 };
 
@@ -130,6 +167,19 @@
               (b == FL_MIDDLE_MOUSE && !prefs.right_click_closes_tab)) {
       // TODO: just an example, not necessarily final
       a_UIcmd_close_bw(a_UIcmd_get_bw_by_widget(btn->ui()));
+   }
+}
+
+/*
+ * Callback for the close-tab button
+ */
+static void close_tab_btn_cb (Fl_Widget *, void *cb_data)
+{
+   CustTabs *tabs = (CustTabs*) cb_data;
+   int b = Fl::event_button();
+
+   if (b == FL_LEFT_MOUSE) {
+      a_UIcmd_close_bw(a_UIcmd_get_bw_by_widget(tabs->wizard()->value()));
    }
 }
 
@@ -144,11 +194,7 @@
       UI *ui = (UI*)wizard()->value();
       BrowserWindow *bw = a_UIcmd_get_bw_by_widget(ui);
       KeysCommand_t cmd = Keys::getKeyCmd();
-      if (Fl::event_key() == FL_Escape) {
-         // Hide findbar if present
-         ui->findbar_toggle(0);
-         ret = 1;
-      } else if (cmd == KEYS_NOP) {
+      if (cmd == KEYS_NOP) {
          // Do nothing
          _MSG("CustTabs::handle KEYS_NOP\n");
       } else if (cmd == KEYS_NEW_TAB) {
@@ -172,7 +218,7 @@
       }
    }
 
-   return (ret) ? ret : CustGroupHorizontal::handle(e);
+   return (ret) ? ret : Fl_Group::handle(e);
 }
 
 /*
@@ -180,33 +226,37 @@
  */
 UI *CustTabs::add_new_tab(UI *old_ui, int focus)
 {
-   char tab_label[64];
-
    if (num_tabs() == 1) {
       // Show tabbar
       ctab_h = tab_h;
       Wizard->resize(0,ctab_h,Wizard->w(),window()->h()-ctab_h);
       resize(0,0,window()->w(),ctab_h);    // tabbar
-      child(0)->show(); // first tab button
+      CloseBtn->show();
+      {int w = 0, h; Pack->child(0)->measure_label(w, h);
+       Pack->child(0)->size(w+14,ctab_h);}
+      Pack->child(0)->show(); // first tab button
       window()->init_sizes();
    }
 
+   /* The UI is constructed in a comfortable fitting size, and then resized
+    * so FLTK doesn't get confused later with even smaller dimensions! */
    current(0);
-   UI *new_ui = new UI(0,ctab_h,Wizard->w(),Wizard->h(),0,old_ui);
+   UI *new_ui = new UI(0,0,UI_MIN_W,UI_MIN_H,"Dillo:",old_ui);
+   new_ui->resize(0,ctab_h,Wizard->w(),Wizard->h());
    new_ui->tabs(this);
    Wizard->add(new_ui);
    new_ui->show();
 
-   snprintf(tab_label, 64,"ctab%d", ++tab_n);
    CustTabButton *btn = new CustTabButton(num_tabs()*tab_w,0,tab_w,ctab_h);
-   btn->align(FL_ALIGN_INSIDE|FL_ALIGN_CLIP);
-   btn->copy_label(tab_label);
+   btn->align(FL_ALIGN_INSIDE);
+   btn->labelsize(btn->labelsize()-2);
+   btn->copy_label(DEFAULT_TAB_LABEL);
    btn->clear_visible_focus();
    btn->box(FL_PLASTIC_ROUND_UP_BOX);
    btn->color(focus ? tabcolor_active : tabcolor_inactive);
    btn->ui(new_ui);
-   add(btn);
    btn->callback(tab_btn_cb, this);
+   Pack->add(btn); // append
 
    if (focus) {
       switch_tab(btn);
@@ -216,7 +266,7 @@
    }
    if (num_tabs() == 1)
       btn->hide();
-   rearrange();
+   update_pack_offset();
 
    return new_ui;
 }
@@ -232,28 +282,25 @@
    int act_idx = get_btn_idx((UI*)Wizard->value());
    // get to-be-removed tab idx
    int rm_idx = get_btn_idx(ui);
-   btn = (CustTabButton*)child(rm_idx);
+   btn = (CustTabButton*)Pack->child(rm_idx);
 
    if (act_idx == rm_idx) {
       // Active tab is being closed, switch to another one
       rm_idx > 0 ? prev_tab() : next_tab();
    }
-   remove(rm_idx);
+   Pack->remove(rm_idx);
+   update_pack_offset();
    delete btn;
-   rearrange();
 
    Wizard->remove(ui);
    delete(ui);
 
-   if (num_tabs() == 0) {
-      window()->hide();
-      // TODO: free memory
-      //delete window();
-
-   } else if (num_tabs() == 1) {
+   if (num_tabs() == 1) {
       // hide tabbar
       ctab_h = 1;
-      child(0)->hide(); // first tab button
+      CloseBtn->hide();
+      Pack->child(0)->size(0,0);
+      Pack->child(0)->hide(); // first tab button
       resize(0,0,window()->w(),ctab_h);    // tabbar
       Wizard->resize(0,ctab_h,Wizard->w(),window()->h()-ctab_h);
       window()->init_sizes();
@@ -264,11 +311,44 @@
 int CustTabs::get_btn_idx(UI *ui)
 {
    for (int i = 0; i < num_tabs(); ++i) {
-      CustTabButton *btn = (CustTabButton*)child(i);
+      CustTabButton *btn = (CustTabButton*)Pack->child(i);
       if (btn->ui() == ui)
          return i;
    }
    return -1;
+}
+
+/*
+ * Keep active tab visible
+ * (Pack children have unusable x() coordinate)
+ */
+void CustTabs::update_pack_offset()
+{
+   dReturn_if (num_tabs() == 0);
+
+   // get active tab button
+   int act_idx = get_btn_idx((UI*)Wizard->value());
+   CustTabButton *cbtn = (CustTabButton*)Pack->child(act_idx);
+
+   // calculate tab button's x() coordinates
+   int x_i = 0, x_f;
+   for (int j=0; j < act_idx; ++j)
+      x_i += Pack->child(j)->w();
+   x_f = x_i + cbtn->w();
+
+   int scr_x = Scroll->xposition(), scr_y = Scroll->yposition();
+   int px_i = x_i - scr_x;
+   int px_f = px_i + cbtn->w();
+   int pw = Scroll->window()->w() - ctl_w;
+   _MSG("  scr_x=%d btn_x=%d px_i=%d btn_w=%d px_f=%d pw=%d",
+       Scroll->xposition(),cbtn->x(),px_i,cbtn->w(),px_f,pw);
+   if (px_i < 0) {
+      Scroll->scroll_to(x_i, scr_y);
+   } else if (px_i > pw || (px_i > 0 && px_f > pw)) {
+      Scroll->scroll_to(MIN(x_i, x_f-pw), scr_y);
+   }
+   Scroll->redraw();
+   _MSG(" >>scr_x=%d btn0_x=%d\n", scr_x, Pack->child(0)->x());
 }
 
 /*
@@ -284,13 +364,14 @@
    if (cbtn->ui() != old_ui) {
       // Set old tab label to normal color
       if ((idx = get_btn_idx(old_ui)) != -1) {
-         btn = (CustTabButton*)child(idx);
+         btn = (CustTabButton*)Pack->child(idx);
          btn->color(tabcolor_inactive);
          btn->redraw();
       }
       Wizard->value(cbtn->ui());
       cbtn->color(tabcolor_active);
       cbtn->redraw();
+      update_pack_offset();
 
       // Update window title
       if ((bw = a_UIcmd_get_bw_by_widget(cbtn->ui()))) {
@@ -305,7 +386,7 @@
    int idx;
 
    if ((idx = get_btn_idx((UI*)Wizard->value())) != -1)
-      switch_tab( (CustTabButton*)child(idx > 0 ? idx-1 : num_tabs()-1) );
+      switch_tab((CustTabButton*)Pack->child(idx>0 ? idx-1 : num_tabs()-1));
 }
 
 void CustTabs::next_tab()
@@ -313,7 +394,7 @@
    int idx;
 
    if ((idx = get_btn_idx((UI*)Wizard->value())) != -1)
-      switch_tab( (CustTabButton*)child((idx+1 < num_tabs()) ? idx+1 : 0) );
+      switch_tab((CustTabButton*)Pack->child((idx+1<num_tabs()) ? idx+1 : 0));
 }
 
 /*
@@ -326,7 +407,7 @@
 
    if (idx != -1) {
       // Make a label for this tab
-      size_t tab_chars = 7, label_len = strlen(label);
+      size_t tab_chars = 15, label_len = strlen(label);
 
       if (label_len > tab_chars)
          tab_chars = a_Utf8_end_of_char(label, tab_chars - 1) + 1;
@@ -335,8 +416,12 @@
          snprintf(title + tab_chars, 4, "...");
 
       // Avoid unnecessary redraws
-      if (strcmp(child(idx)->label(), title)) {
-         child(idx)->copy_label(title);
+      if (strcmp(Pack->child(idx)->label(), title)) {
+         int w = 0, h;
+         Pack->child(idx)->copy_label(title);
+         Pack->child(idx)->measure_label(w, h);
+         Pack->child(idx)->size(w+14,ctab_h);
+         update_pack_offset();
       }
    }
 }
@@ -345,14 +430,14 @@
 //----------------------------------------------------------------------------
 
 static void win_cb (Fl_Widget *w, void *cb_data) {
-   int choice = 1;
    CustTabs *tabs = (CustTabs*) cb_data;
-
-   if (tabs->num_tabs() > 1)
+   int choice = 1, ntabs = tabs->num_tabs();
+
+   if (ntabs > 1)
       choice = a_Dialog_choice5("Window contains more than one tab.",
                                 "Close", "Cancel", NULL, NULL, NULL);
    if (choice == 1)
-      while (tabs->num_tabs())
+      while (ntabs-- > 0)
          a_UIcmd_close_bw(a_UIcmd_get_bw_by_widget(tabs->wizard()->value()));
 }
 
@@ -402,7 +487,7 @@
 
    int focus = 1;
    new_bw = UIcmd_tab_new(DilloTabs, old_ui, focus);
-   win->resizable(BW2UI(new_bw));
+   win->resizable(DilloTabs->wizard());
    win->show();
 
    if (old_bw == NULL && prefs.xpos >= 0 && prefs.ypos >= 0) {
@@ -449,6 +534,10 @@
    // Copy the layout pointer into the bw data
    new_bw->render_layout = (void*)layout;
 
+   // Clear the window title
+   if (focus)
+      new_ui->window()->copy_label(new_ui->label());
+
    // WORKAROUND: see findbar_toggle()
    new_ui->findbar_toggle(0);
 
@@ -462,13 +551,16 @@
 {
    BrowserWindow *bw = (BrowserWindow *)vbw;
    UI *ui = BW2UI(bw);
+   CustTabs *tabs = ui->tabs();
    Layout *layout = (Layout*)bw->render_layout;
 
-   MSG("a_UIcmd_close_bw\n");
+   _MSG("a_UIcmd_close_bw\n");
    a_Bw_stop_clients(bw, BW_Root + BW_Img + BW_Force);
    delete(layout);
-   if (ui->tabs()) {
-      ui->tabs()->remove_tab(ui);
+   if (tabs) {
+      tabs->remove_tab(ui);
+      if (tabs->num_tabs() == 0)
+         delete tabs->window();
    }
    a_Bw_free(bw);
 }
@@ -536,16 +628,12 @@
 {
    if (url) {
       a_Nav_push(bw, url, NULL);
+      BW2UI(bw)->focus_main();
    } else {
       // Used to start a bw with a blank screen
       BW2UI(bw)->focus_location();
       a_UIcmd_set_buttons_sens(bw);
    }
-#if 0
-   if (BW2UI(bw)->get_panelmode() == UI_TEMPORARILY_SHOW_PANELS)
-      BW2UI(bw)->set_panelmode(UI_HIDDEN);
-   a_UIcmd_focus_main_area(bw);
-#endif
 }
 
 static void UIcmd_open_url_nbw(BrowserWindow *new_bw, const DilloUrl *url)
@@ -786,22 +874,22 @@
    Dstr *ds = dStr_sized_new(128);
 
    /* parse search_url into label and url */
-   a_Misc_parse_search_url(src, &l, &u);
-
-   for (c = u; *c; c++) {
-      if (*c == '%')
-         switch(*++c) {
-         case 's':
-            dStr_append(ds, keys); break;;
-         case '%':
-            dStr_append_c(ds, '%'); break;;
-         case 0:
-            MSG_WARN("search_url ends with '%%'\n"); c--; break;;
-         default:
-            MSG_WARN("illegal specifier '%%%c' in search_url\n", *c);
-         }
-      else
-         dStr_append_c(ds, *c);
+   if (a_Misc_parse_search_url(src, &l, &u) == 0) {
+      for (c = u; *c; c++) {
+         if (*c == '%')
+            switch(*++c) {
+            case 's':
+               dStr_append(ds, keys); break;;
+            case '%':
+               dStr_append_c(ds, '%'); break;;
+            case 0:
+               MSG_WARN("search_url ends with '%%'\n"); c--; break;;
+            default:
+               MSG_WARN("illegal specifier '%%%c' in search_url\n", *c);
+            }
+         else
+            dStr_append_c(ds, *c);
+      }
    }
    dFree(keys);
 
@@ -847,13 +935,11 @@
    a_UIcmd_set_save_dir(prefs.save_dir);
 
    SuggestedName = UIcmd_make_save_filename(URL_STR(url));
-   name = a_Dialog_save_file("Save Link as File", NULL, SuggestedName);
-   MSG("a_UIcmd_save_link: %s\n", name);
+   if ((name = a_Dialog_save_file("Save Link as File", NULL, SuggestedName))) {
+      MSG("a_UIcmd_save_link: %s\n", name);
+      a_Nav_save_url(bw, url, name);
+   }
    dFree(SuggestedName);
-
-   if (name) {
-      a_Nav_save_url(bw, url, name);
-   }
 }
 
 /*
@@ -1146,7 +1232,7 @@
 }
 
 /*
- * Set the page title in the window titlebar and tab label.
+ * Set the page title in the tab label and window titlebar.
  * (Update window titlebar for the current tab only)
  */
 void a_UIcmd_set_page_title(BrowserWindow *bw, const char *label)
@@ -1154,16 +1240,17 @@
    const int size = 128;
    char title[size];
 
+   if (snprintf(title, size, "Dillo: %s", label ? label : "") >= size) {
+      uint_t i = MIN(size - 4, 1 + a_Utf8_end_of_char(title, size - 8));
+      snprintf(title + i, 4, "...");
+   }
+   BW2UI(bw)->copy_label(title);
+   BW2UI(bw)->tabs()->set_tab_label(BW2UI(bw), label ? label : "");
+
    if (a_UIcmd_get_bw_by_widget(BW2UI(bw)->tabs()->wizard()->value()) == bw) {
       // This is the focused bw, set window title
-      if (snprintf(title, size, "Dillo: %s", label) >= size) {
-         uint_t i = MIN(size - 4, 1 + a_Utf8_end_of_char(title, size - 8));
-         snprintf(title + i, 4, "...");
-      }
-      BW2UI(bw)->copy_label(title);
       BW2UI(bw)->window()->copy_label(title);
    }
-   BW2UI(bw)->tabs()->set_tab_label(BW2UI(bw), label);
 }
 
 /*
@@ -1197,24 +1284,8 @@
    BW2UI(bw)->button_set_sens(UI_BACK, sens);
    // Forward
    sens = (a_Nav_stack_ptr(bw) < a_Nav_stack_size(bw) - 1 &&
-           !bw->nav_expecting);
+           !a_Bw_expecting(bw));
    BW2UI(bw)->button_set_sens(UI_FORW, sens);
-}
-
-/*
- * Keep track of mouse pointer over a link.
- */
-void a_UIcmd_set_pointer_on_link(BrowserWindow *bw, int flag)
-{
-   BW2UI(bw)->pointerOnLink(flag);
-}
-
-/*
- * Is the mouse pointer over a link?
- */
-int a_UIcmd_pointer_on_link(BrowserWindow *bw)
-{
-   return BW2UI(bw)->pointerOnLink();
 }
 
 /*
diff --git a/src/uicmd.hh b/src/uicmd.hh
index dc7294a..22c5b11 100644
--- a/src/uicmd.hh
+++ b/src/uicmd.hh
@@ -78,8 +78,6 @@
 void a_UIcmd_set_page_title(BrowserWindow *bw, const char *label);
 void a_UIcmd_set_msg(BrowserWindow *bw, const char *format, ...);
 void a_UIcmd_set_buttons_sens(BrowserWindow *bw);
-void a_UIcmd_set_pointer_on_link(BrowserWindow *bw, int flag);
-int a_UIcmd_pointer_on_link(BrowserWindow *bw);
 
 #ifdef __cplusplus
 }
diff --git a/src/url.c b/src/url.c
index ae1f131..faee044 100644
--- a/src/url.c
+++ b/src/url.c
@@ -233,6 +233,8 @@
       dStr_append(SolvedUrl, BaseStr);
       if ((p = strchr(SolvedUrl->str, '#')))
          dStr_truncate(SolvedUrl, p - SolvedUrl->str);
+      if (!BaseUrl->path)
+         dStr_append_c(SolvedUrl, '/');
 
       if (RelUrl->query) {                        /* query */
          if (BaseUrl->query)
diff --git a/src/url.h b/src/url.h
index 5688287..5590c04 100644
--- a/src/url.h
+++ b/src/url.h
@@ -47,21 +47,21 @@
  * (non '_'-ended macros MUST use these for initialization sake)
  */
 /* these MAY return NULL: */
-#define URL_SCHEME_(u)              u->scheme
-#define URL_AUTHORITY_(u)           u->authority
-#define URL_PATH_(u)                u->path
-#define URL_QUERY_(u)               u->query
-#define URL_FRAGMENT_(u)            u->fragment
+#define URL_SCHEME_(u)              (u)->scheme
+#define URL_AUTHORITY_(u)           (u)->authority
+#define URL_PATH_(u)                (u)->path
+#define URL_QUERY_(u)               (u)->query
+#define URL_FRAGMENT_(u)            (u)->fragment
 #define URL_HOST_(u)                a_Url_hostname(u)
-#define URL_ALT_(u)                 u->alt
+#define URL_ALT_(u)                 (u)->alt
 #define URL_STR_(u)                 a_Url_str(u)
 /* this returns a Dstr* */
-#define URL_DATA_(u)                u->data
+#define URL_DATA_(u)                (u)->data
 /* these return an integer */
-#define URL_PORT_(u)                (URL_HOST(u), u->port)
-#define URL_FLAGS_(u)               u->flags
-#define URL_ILLEGAL_CHARS_(u)       url->illegal_chars
-#define URL_ILLEGAL_CHARS_SPC_(u)   url->illegal_chars_spc
+#define URL_PORT_(u)                (URL_HOST(u), (u)->port)
+#define URL_FLAGS_(u)               (u)->flags
+#define URL_ILLEGAL_CHARS_(u)       (u)->illegal_chars
+#define URL_ILLEGAL_CHARS_SPC_(u)   (u)->illegal_chars_spc
 
 /*
  * Access methods that never return NULL.
diff --git a/test/dw_images_scaled2.cc b/test/dw_images_scaled2.cc
index b436ec9..2adb177 100644
--- a/test/dw_images_scaled2.cc
+++ b/test/dw_images_scaled2.cc
@@ -115,8 +115,8 @@
    styleAttrs.setBorderStyle (BORDER_SOLID);
    styleAttrs.padding.setVal (1);
    styleAttrs.backgroundColor = NULL;
-   styleAttrs.width = createPerLength (0.5);
-   styleAttrs.height = createPerLength (0.5);
+   styleAttrs.width = createPerLength (0.25);
+   styleAttrs.height = createPerLength (0.25);
 
    Style *imageStyle1 = Style::create (layout, &styleAttrs);
    image1 = new dw::Image ("A longer ALT Text to demonstrate clipping.");