Fixed grid refactoring