clean up the menu issue #18