#203 Reformat layout.