Further grid layout changes