Add better toggler for animations to the command area.

This also did a small amount of cleanup on existing code. It should
probably have been two commits.