Update from SFO

Counts UI updated, now moving over to master branch