Animations working and small improvements