minor board and grid refactoring