Fix content container scope