Add I18n and some fix