Reorganize menubar, even more