Adds stop button and improves start/stop.