the city page (for the time being) and the neightborhoods page is now working
fixed merge conflicts