grid and slight layout refinements