Fix broken Grid