improve some dips and layout (nw)