[OE-3658] Styling and JS fixes