[OE-3654] Minor layout adjustments