Added drop down, fixes to selection and progress