Modify transition speed
Optimized animations and refactoring