City council passes mayor's proposed budget with changes