Fix #189,#190 for localization and SettingsFlyout