Adding i18n and fixing z-index of model-dialog