Fixed time zone problem
Add location provider selection