fixed some container structure issues