Adding Animation and bug fixes