Cleaning up the layout