City Council approves new district map after push back