[OE-2684] layout bugfix