reorganized product selector