Portland City Council approves changes to new City Hall structure