improved grid layouts and base grid