fix ui issues with grid