Beginning to clean up the layout.