Update logic for drop-down list Refactor the logic for the drop-down lists into new module files See merge request !23
