Containers relayout 2

Fixes issue #1525