[Alli-1953] fixed translations and semantics, minor layout upgrades