added grid tracks and modified key input