Fixing MenuBar (broke with last refactor)