bug fix & add push animation