Fix up some of the state changes
Add keys to dropdown items