fix the layout issues