more cleaning up, added Watching menu button action