[OE-3847] Fixing select dropdown fixes and form row margins