Refactored Grid Draw