Merge pull request #2322 from raydavis/raywip

CLC-3520 Fix Units column header for future classes
CLC-3520 Fix Units column alignment for future classes