Added 'watching' state, and eddited views