Layout grid and scrolling improve