Fixed issues with grid page