Better rendering of container list
Fix container shutdown