Fixing text space issue and dx/dy positionning.