Dragging is fixed, colors & scaling tweaked