[OE-2589] layout tweaks