Improve UI, replay stop detection