Re-factored MenuBar handling