Cleaning up some of the UI