more UI cleanup