Fixed layout issues caused by introduction of child wrapper element.