[OE-3643] JS and layout fixes
Fixed conflicts
Fixed conflicts