Fix the layout