Chore: Update markup for i18n
Chore: Add flags