Refactored 6x6 grid

=]