Refactor grid column classes