Cleaning up the layout and config