Add count option for translations
Big test upgrades and view changes