Refactored grid system to static