Nice job.
We almost are back to TabGroup (still missing the tab panel).
Another thing missing is the assignment of a complete domain to a container;
The assignment seems to be done site-wise only.