Refactor qml and scoring animations