Animating transition
Grid fix