Update shape selection and peak picking