Replace the unit page with the container page

STUD-1754
There is already an implementation of this higher up in the page. Can't we make do with just one?