France has unveiled plans to improve education and tackle job discrimination , as part of new measures to expand opportunities following three weeks of riots in largely ethnic North African-inhabited areas .