Simplified containers
moved some markup around