Further fixing the button animations