i18n support added
UI improvements and i18n support