Some minor code-layout tweaks, and fixes for a couple of z-index issues relating to dragging visibility and click-to-move captures