Update #60

Use Pop() for all drop-downs.