Move wait and retry options to settings.