Grid layout changes to support breaking rows