Add pretty urls to Watcher
Fix watcher button