Fixed issue with expanding containers in layout