Update
 - Create animation flag
 - Bug fix in change selected index