Refactoring content-grid