Clean up the UI a bit