reportcard updates from Erik

Change-Id: I7138bbb5d55ecaaee742a83a417e470dc34200b4
manual changes required because of bar graph bug

Change-Id: Iff6dc162285afb9c12095654196bed80b1cbec83