fixing layout issues