improved layouts for both languages