Fixing grid issue