Menu Bar Rework