Fixed styling
Swapped Locale/Street updates
Increased tx timeout
Fixed data parsing issue for location