fixed issues with grid