diff --git a/src/barwin.c b/src/barwin.c
index f726b80..f5fe6ba 100644
--- a/src/barwin.c
+++ b/src/barwin.c
@@ -266,7 +266,7 @@ barwin_refresh_color(BarWindow *bw)
      if(bw->stipple)
      {
           XSetForeground(dpy, gc_stipple, getcolor(bw->fg));
-          XFillRectangle(dpy, bw->dr, gc_stipple, 3, 2, bw->geo.width - 6, bw->geo.height - 4);
+          XFillRectangle(dpy, bw->dr, gc_stipple, 3, 2, bw->geo.width - 6, bw->geo.height - 6);
      }
 
      if(bw->bord)
diff --git a/src/frame.c b/src/frame.c
index 7b14605..486489d 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -72,7 +72,7 @@ frame_create(Client *c)
      if(TBARH)
           c->titlebar = barwin_create(c->frame, 0, 0,
                                       c->frame_geo.width ,
-                                      TBARH + (c->geo.x - c->frame_geo.x),
+                                      TBARH + BORDH * 2,
                                       c->colors.frame,
                                       c->colors.fg,
                                       True, conf.titlebar.stipple, False);
@@ -144,7 +144,7 @@ frame_moveresize(Client *c, XRectangle geo)
 
      /* Titlebar */
      if(TBARH)
-          barwin_resize(c->titlebar, c->frame_geo.width, TBARH + BORDH);
+          barwin_resize(c->titlebar, c->frame_geo.width, TBARH + BORDH * 2);
 
      /* Resize area */
      XMoveWindow(dpy, c->resize, c->frame_geo.width - RESHW, c->frame_geo.height - RESHW);
diff --git a/src/init.c b/src/init.c
index d2aa0a8..602d6d9 100644
--- a/src/init.c
+++ b/src/init.c
@@ -101,7 +101,7 @@ init_cursor(void)
 {
      cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
      cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
-     cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
+     cursor[CurMove]   = XCreateFontCursor(dpy, XC_fleur);
 
      return;
 }
diff --git a/src/menu.c b/src/menu.c
index ef6b59d..831830a 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -120,7 +120,7 @@ menu_manage_event(XEvent *ev, Menu *menu, BarWindow *winitem[])
 
      switch(ev->type)
      {
-     /* Mouse Buttons */
+          /* Mouse Buttons */
      case ButtonPress:
           /* Execute the function linked with the item */
           for(i = 0; i < menu->nitem; ++i)
@@ -128,10 +128,10 @@ menu_manage_event(XEvent *ev, Menu *menu, BarWindow *winitem[])
                   && (ev->xbutton.button == Button1 || ev->xbutton.button == Button2))
                     if(menu->item[i].func)
                          menu->item[i].func(menu->item[i].cmd);
-               quit = True;
+          quit = True;
           break;
 
-     /* Keys */
+          /* Keys */
      case KeyPress:
           XLookupString(&ev->xkey, NULL, 0, &ks, 0);
           switch(ks)
@@ -153,7 +153,7 @@ menu_manage_event(XEvent *ev, Menu *menu, BarWindow *winitem[])
           }
           break;
 
-     /* Focus (with mouse) management */
+          /* Focus (with mouse) management */
      case EnterNotify:
           /* For focus an item with the mouse */
           for(i = 0; i < menu->nitem; ++i)
diff --git a/wmfsrc b/wmfsrc
index d8eb227..6012878 100644
--- a/wmfsrc
+++ b/wmfsrc
@@ -7,7 +7,7 @@ alias
 
 misc
 {
-        font        = "dejavu-9"
+        font        = "dejavu-10"
         raisefocus  = false
         raiseswitch = true
 }
@@ -32,15 +32,15 @@ layouts
         system = "menu"
 
         # Tiling layouts
-        layout { type = "tile_right"   symbol = "RIGHT" }
-        layout { type = "tile_left"    symbol = "LEFT" }
-        layout { type = "tile_top"     symbol = "TOP" }
-        layout { type = "tile_bottom"  symbol = "BOTTOM" }
-        layout { type = "tile_grid"    symbol = "GRID" }
+        layout { type = "tile_right"  symbol = "RIGHT" }
+        layout { type = "tile_left"   symbol = "LEFT" }
+        layout { type = "tile_top"    symbol = "TOP" }
+        layout { type = "tile_bottom" symbol = "BOTTOM" }
+        layout { type = "tile_grid"   symbol = "GRID" }
 
         # Other
-        layout { type = "max"          symbol = "MAX"  }
-        layout { type = "free"         symbol = "FREE" }
+        layout { type = "max"         symbol = "MAX"  }
+        layout { type = "free"        symbol = "FREE" }
 }
 
 tags
@@ -89,8 +89,10 @@ client
         mouse { button = "3" func = "client_raise" }
         mouse { button = "3" func = "mouse_resize" }
 
+        # Remove this section for delete the titlebar
         titlebar
         {
+                stipple    = false
                 height     = 11
                 fg_normal  = "#7E89A2"
                 fg_focus   = "#9F9AB3"
@@ -103,8 +105,10 @@ client
         }
 }
 
+
 menu
 {
+        # Default menu, binded on the root window.
         set_menu
         {
                 name = "rootmenu"
@@ -112,12 +116,16 @@ menu
                 # place_at_mouse = false
                 # x = 40 y = 50
 
-                fg_focus  = "#000000" bg_focus  = "#ffffff"
-                fg_normal = "#ffffff" bg_normal = "#000000"
+                fg_focus  = "#191919" bg_focus  = "#7E89A2"
+                fg_normal = "#D4D4D4" bg_normal = "#191919"
 
-                item { name = "Terminal" func = "spawn" cmd = term }
-                item { name = "Next tag" func = "tag_next" }
-                item { name = "Previous tag" func = "tag_prev" }
+                item { name = "Terminal"        func = "spawn" cmd = term }
+                item { name = "Next tag"        func = "tag_next" }
+                item { name = "Previous tag"    func = "tag_prev" }
+                item { name = "Next layout"     func = "layout_next" }
+                item { name = "Previous layout" func = "layout_prev" }
+                item { name = "Toggle infobar"  func = "toggle_infobar_position" }
+                item { name = "Quit WMFS"       func = "quit" }
         }
 }
 
@@ -139,8 +147,6 @@ launcher
 
 keys
 {
-# general keybind
-
         # Reload the configuration of wmfs
         key { mod = {"Alt", "Control"} key = "r" func = "reload" }
 
@@ -156,7 +162,6 @@ keys
         # Toggle maximum the selected client
         key { mod = {"Alt"} key = "m" func = "toggle_max" }
 
-
         # Toggle free the selected client
         key { mod = {"Alt"} key = "f" func = "toggle_free" }
 
@@ -167,7 +172,7 @@ keys
         key { mod = {"Alt"} key = "Tab" func = "client_next" }
 
         # Select the previous client
-        key { mod = {"Alt","Shift"} key = "Tab" func = "client_prev" }#
+        key { mod = {"Alt","Shift"} key = "Tab" func = "client_prev" }
 
         # Select the next tag
         key { mod = {"Control"} key = "Right" func = "tag_next" }
@@ -197,8 +202,6 @@ keys
         key { mod = { "Alt" } key = "p" func = "launcher" cmd = "launcher_exec" }
         key { mod = { "Alt", "Shift" } key = "p" func = "launcher" cmd = "launcher_ssh" }
 
-# tag manipulation keybind
-
         # Set the tag x
         key { mod = {"Alt"} key = "F1" func = "tag" cmd = "1" }
         key { mod = {"Alt"} key = "F2" func = "tag" cmd = "2" }