AJ-1573 Several style, UI changes, bug fixes for rubric design.
AJ-1573 More style design rubrics style changes.