Grid tile fixes
merge fix