Added text-metrics for better text-sizing
Better text position on wrapping