improves menubar
merge conflict