More tweaks, shift and drag