City’s budget takes shape