StopStart updated for next gen UI