updated layout issues