Cleaning up the UI a bit.