Minor UI cleanup