Greatly improved section highlighting