Improvements to animation mode