New grid and key functionality implemented