More UI cleanup...