Move the country field under the location group. Didnt seem to happen from the last commit.