Fix the layout issues