Zip UI cleanup before pull request