CC-4734: French - UI breaks in several places

-fixed