Option window restart needed information message, refactoring