Grid mode improvements.