Improve of templates - highlight actual sections.