Cleaning up some UI