Fix bug and add animation on change page