Merge "Fix French, English UK, Swiss german layout issues." into main