Pick Cleanup Ribbon overhaul