diff --git a/config.c b/config.c
index 696a2cf..7265c67 100644
--- a/config.c
+++ b/config.c
@@ -117,9 +117,9 @@ init_conf(void) {
 
           CFG_STR("text", "", CFGF_NONE),
           CFG_STR("func", "", CFGF_NONE),
-          CFG_STR("cmd", NULL, CFGF_NONE),
+          CFG_STR("cmd",  "", CFGF_NONE),
           CFG_INT("fg_color", 0x000000, CFGF_NONE),
-          CFG_INT("bg_color",   0xFFFFFF, CFGF_NONE),
+          CFG_INT("bg_color", 0xFFFFFF, CFGF_NONE),
           CFG_END()
      };
 
diff --git a/local.h b/local.h
index 62ea173..213b2b4 100644
--- a/local.h
+++ b/local.h
@@ -76,6 +76,8 @@ typedef struct {
      char *cmd;
      int fg_color;
      int bg_color;
+     unsigned int x;
+     unsigned int button;
 } BarButton;
 
 typedef struct {
@@ -160,7 +162,7 @@ void togglemax(char *cmd);
 void unhide(Client *c);
 void unmanage(Client *c);
 void updatebar(void);
-void updatebutton(void);
+void updatebutton(Bool c);
 void updatelayout(void);
 void unmapclient(Client *c);
 void updateall(void);
diff --git a/wmfs.c b/wmfs.c
index 4109b30..90aeeda 100644
--- a/wmfs.c
+++ b/wmfs.c
@@ -112,7 +112,8 @@ buttonpress(XEvent *event) {
      for(i=0; i<conf.nbutton ; ++i) {
           if(ev->window == conf.barbutton[i].win
              && ev->button == Button1) {
-               conf.barbutton[i].func(conf.barbutton[i].cmd);
+               if(conf.barbutton[i].func)
+                    conf.barbutton[i].func(conf.barbutton[i].cmd);
           }
      }
 }
@@ -510,7 +511,7 @@ init(void) {
      XMapRaised(dpy, bar);
      strncpy(bartext, "WMFS-devel", strlen("WMFS-devel"));
      updatebar();
-     updatebutton();
+     updatebutton(0);
 
      /* INIT STUFF */
      XSetErrorHandler(errorhandler);
@@ -1069,7 +1070,7 @@ updateall(void) {
 
 void
 updatebar(void) {
-     int  i ,j, x;
+     int  i ,j;
      char buf[conf.ntag][100];
      char p[3];
 
@@ -1092,15 +1093,7 @@ updatebar(void) {
           XDrawString(dpy, bar, gc, taglen[i], fonth, buf[i], strlen(buf[i]));
      }
 
-     j = taglen[conf.ntag] + ((strlen(getlayoutsym(layout[seltag]))*fonty) + 10);
-     for(i=0; i<conf.nbutton; ++i) {
-          x = (!i) ? j : j + strlen(conf.barbutton[i-1].text)*fonty + 10;
-          if(conf.barbutton[i].win) {
-               XMoveWindow(dpy, conf.barbutton[i].win, x, 0);
-               XSetForeground(dpy, gc, conf.barbutton[i].fg_color);
-               XDrawString(dpy, conf.barbutton[i].win, gc, 2, fonth, conf.barbutton[i].text, strlen(conf.barbutton[i].text));
-          }
-     }
+     updatebutton(1);
 
      /* Draw layout symbol */
      XSetForeground(dpy, gc, conf.colors.tagselfg);
@@ -1119,9 +1112,11 @@ updatebar(void) {
      return;
 }
 
+/* if c is 0, you can execute this function for the first time
+ * else the button is just updated */
 void
-updatebutton(void) {
-     int i, j, p, x;
+updatebutton(Bool c) {
+     int i, j, p, x, pm = 0;
      XSetWindowAttributes at;
 
      at.override_redirect = 1;
@@ -1132,16 +1127,28 @@ updatebutton(void) {
 
      for(i = 0; i < conf.nbutton; ++i) {
           p = strlen(conf.barbutton[i].text);
-          x = (!i) ? j :  j + strlen(conf.barbutton[i-1].text)*fonty + 10;
-          conf.barbutton[i].win = XCreateWindow(dpy, root, x, 0, p*fonty+4, barheight,
-                                                0, DefaultDepth(dpy, screen),
-                                                CopyFromParent, DefaultVisual(dpy, screen),
-                                                CWOverrideRedirect | CWBackPixmap | CWEventMask, &at);
 
-          XSetWindowBackground(dpy, conf.barbutton[i].win, conf.barbutton[i].bg_color);
-          XMapRaised(dpy, conf.barbutton[i].win);
-          XSetForeground(dpy, gc, conf.barbutton[i].fg_color);
-          XDrawString(dpy, conf.barbutton[i].win, gc, 2, fonth, conf.barbutton[i].text, p);
+          if(i)
+               pm += strlen(conf.barbutton[i-1].text) * fonty;
+          x = (!i) ? j : j + pm;
+
+          if(!c) {
+               conf.barbutton[i].win = XCreateWindow(dpy, root, x, 0, p*fonty+2, barheight,
+                                                     0, DefaultDepth(dpy, screen),
+                                                     CopyFromParent, DefaultVisual(dpy, screen),
+                                                     CWOverrideRedirect | CWBackPixmap | CWEventMask, &at);
+               XSetWindowBackground(dpy, conf.barbutton[i].win, conf.barbutton[i].bg_color);
+               XMapRaised(dpy, conf.barbutton[i].win);
+               XSetForeground(dpy, gc, conf.barbutton[i].fg_color);
+               XDrawString(dpy, conf.barbutton[i].win, gc, 1, fonth, conf.barbutton[i].text, p);
+          } else {
+               if(!conf.barbutton[i].win)
+                    return;
+               XSetForeground(dpy, gc, conf.barbutton[i].fg_color);
+               XMoveWindow(dpy, conf.barbutton[i].win, x, 0);
+               XDrawString(dpy, conf.barbutton[i].win, gc, 1, fonth,
+                           conf.barbutton[i].text, strlen(conf.barbutton[i].text));
+          }
      }
 
      return;