Improvements to Pin editing