Reformat layouts.

This mainly properly indents the code, making it easier to understand the layout.