Merge "Fix UK layout" into main