Fixed a few things with how watchers are counted and improved some styling