layout issues solved