Some UI cleanup.