Improve menubar buttons