[OE-4448] layout tweaks