Use delegates instead of closures, update menu bar button