moved view and entity overrides to the appropriate place
refactored content helpers
report update