Restore word counts in toms, various bug fixes and CSS reorganization