some UI cleanup