Container UI rewrite
Merge remote-tracking branch 'scrawl/containerui'