fix selection and add animation