Added Watcher and disable buttons