LPS-35653 Implementing UX improvements for localization
LPS-35653 SF