Refactor setup dropdown list