addressed layout issues