Fixed transitions and refactored texts