feat(content view) - address review comments. SD-555