further swap animation improvements