Added highlighting and titles