[OE-3514] layout tweaks