Re-arranged code to support new isWatched display

Changed some of the code around to support an improved isWatched display.