Reformat the layout to look consistent