Improve badge selection and update badge form design