add rules, chanfe button, add menubar
Merge remote-tracking branch 'origin/master'