Feat grid

Included toggle feature