resolved layout issues