Refactor menu stuff of the new ThreadWatcher.