refactor of the adoptee view to match adopter view
Merge remote-tracking branch 'origin/adoptee-refactor'