further modifications on settings window handling