Add extended layout in two languages, fix a bham issue