Implement edit of container, plus more improvements