Adding some UI cleanup.