- More UI cleanup