[OE-2609] layout tweaks