AJ-2263,AJ-2268 Fix overlapping titles and rubric level hover, improve s...