Layout Grid improvements