Improved rendering for initial and final states.