WIP container ui rewrite