Fixed top-level behaviour issue. Fixed container render isue
0.20.1