Added animation and fixed js conflicts