fixing layout issues with layout diff