Add check for stops already in scenario and prevent adding them

Also fix saving already setup messages