Fixed gaps, new bstack layout.