Cleaning up the UI