Feature/city modal

Not sure whether this should still be here