Moved insitution stats into a table
Refactored task counts to be more consistent