Cleanups in Interface, More play-control transition