Improve animation a bit