[OE-3945] Removed wrapper boilerplate from element views