Fix menu item bug and code cleanup