More UI cleanup