[OE-3684] Admin layout fixes
[OE-3684] Admin markup fixes
Fixed conflits