Fix up the layout