Drag support for main nav, and other small tweaks