fixxed wildcard for watcher
redesign for menu opener