Changed some ID names to better reflect the drop-down behavior