Fixed a few i18n issues and removed the "id" attribute

Change-Id: Ib9609095f7250e8243fde49d6372cb9fc0947af5