Fixed label position and scale issues