use new heart components and add more transitions