relayout the containers page, fixes issue #1395

Fixes #1395