Minor refacotring to remove the duplicated code
Change to use selects rather than radio buttons
Some refactoring, clean up, added remove option