Fix layer names not displaying correctly