Language & Text display fixes