Remove container wrapper to fix adding layouts to areas that don't require wrapping.

fixes #1359