fixxed wildcard for watcher
redesign for menu opener
update style
Merged 'dev'.