Fixed the edge case where if geocoder can't find a city/country, it would just crash. Now it skips that question
Some light styling work
Merged (conflict over comments)