MenuBar Rework