Various changes for Analytics table.

Various changes.