UI improvements and i18n support