[OE-3381] Updated core views with refactored markup