refactoring use EntryView interface if possible.
doc updates
doc updates
Merge pull request #2544 from ahmetmircik/refactorEntryView

(master) Refactor EntryView usage (Follow up #2538).