Some UI changes along with I18N modification