Merge "Fix UI issues in localization" into main