Improved animation and transition