Containers and GUI fixes, not done yet.