changed ids to keep them unique
added missing gettext