Fix width issues