Grid pages fix