Menu cleanup and major item drop bug fix.