Some changes in SettingsFrame logic