fixing a slight bug with watch/unwatch. The icon watch/unwatch was dependent on the...