diff --git a/dwm b/dwm
index 54e625f..0fe83e1 100755
Binary files a/dwm and b/dwm differ
diff --git a/dwm.c b/dwm.c
index 8a9e779..3f0167b 100644
--- a/dwm.c
+++ b/dwm.c
@@ -133,10 +133,10 @@ struct Monitor {
 	int nmaster;
 	int num;
 	int by;               /* bar geometry */
-	int eby;               /* bar geometry */
+	int eby;              /* bar geometry */
 	int mx, my, mw, mh;   /* screen size */
 	int wx, wy, ww, wh;   /* window area  */
-    int gappx;
+	int gappx;
 	unsigned int seltags;
 	unsigned int sellt;
 	unsigned int tagset[2];
diff --git a/dwm.o b/dwm.o
index bd37b13..3a7a43d 100644
Binary files a/dwm.o and b/dwm.o differ
diff --git a/layouts.c b/layouts.c
index 06fc554..6eee93b 100644
--- a/layouts.c
+++ b/layouts.c
@@ -13,15 +13,15 @@ grid(Monitor *m) {
 	cols = (rows && (rows - 1) * rows >= n) ? rows - 1 : rows;
 
 	/* window geoms (cell height/width) */
-	ch = m->wh / (rows ? rows : 1);
-	cw = m->ww / (cols ? cols : 1);
+	ch = (m->wh - m->gappx) / (rows ? rows : 1);
+	cw = (m->ww - m->gappx) / (cols ? cols : 1);
 	for(i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next)) {
 		cx = m->wx + (i / rows) * cw;
 		cy = m->wy + (i % rows) * ch;
 		/* adjust height/width of last row/column's windows */
-		ah = ((i + 1) % rows == 0) ? m->wh - ch * rows : 0;
-		aw = (i >= rows * (cols - 1)) ? m->ww - cw * cols : 0;
-		resize(c, cx, cy, cw - 2 * c->bw + aw, ch - 2 * c->bw + ah, False);
+		ah = ((i + 1) % rows == 0) ? m->wh - m->gappx * (rows + 1) - ch * rows : 0;
+		aw = (i >= rows * (cols - 1)) ? m->ww - m->gappx * (cols + 1) - cw * cols : 0;
+		resize(c, cx + m->gappx * (i / rows + 1), cy + m->gappx * (i % rows + 1), cw - 2 * c->bw + aw, ch - 2 * c->bw + ah, False);
 		i++;
 	}
 }