Feature/city modal