Changes on Menu and I18n