Ref #6: Refactor grid layout classes