WHOO HOOO MENU BUG FIXES AGAIN