Cleaning up some of the layout