Merge pull request #1234 from dorkster/menus

Drag & drop tweaks