[OE-3658] Styling fixes