Adding Country and State Drop downs, other fixes