Replace the unit page with the container page

STUD-1754
Remove TODO.