Added layout container helpers
Fixed layout processing expanding containers