[OE-3381] Updated view files with refactored markup