Bit of cleanup on the container page