Move animation control from interface to Display