UI cleanup, continued.