Fixed gui and watcher