Improve rubric look and feel