Cleaning up the UI a little