more gridset refactoring