Improved diagram performance / dragging