Cleaning up some of the UI to make it easier to use and more aesthetically pleasing