Add margins, Restore lost identifiers, Update tested devices