Container spacing pr fixes - follow up with #5422

Fixes a few things introduced in #5422 

/cc @phamann 

![ ](http://media.giphy.com/media/AvMJCeu1EMmhG/giphy.gif)