added missing strings in strings.xml, repositioned some entries